sd_lavc: use subtitle framework for former av_sub.c code

Change libavcodec subtitle decoding code (used for some bitmap
subtitle types) to use the same decoding framework as sd_ass. The
functionality that was previously in av_sub.c and was directly called
from mplayer.c is now in sd_lavc.c.

Conflicts:
	mplayer.c
	sub/av_sub.h
	sub/sd_lavc.c

Merged from mplayer2. The remaining use of is_av_sub() is replaced by
a check whether a subtitle decoder is active, which should give the
same results.

1 files changed, 0 insertions, 158 deletions

diff --git a/sub/av_sub.c b/sub/av_sub.c
deleted file mode 100644
index dbf349133f..0000000000
--- a/sub/av_sub.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <libavcodec/avcodec.h>
-
-#include "mp_msg.h"
-#include "libmpdemux/stheader.h"
-#include "sub.h"
-#include "spudec.h"
-#include "av_sub.h"
-
-bool is_av_sub(int type)
-{
-    return type == 'b' || type == 'p' || type == 'x';
-}
-
-void reset_avsub(struct sh_sub *sh)
-{
-    if (sh->context) {
-        avcodec_close(sh->context);
-        av_freep(&sh->context);
-    }
-}
-
-static void avsub_to_spudec(AVSubtitleRect **rects, int num_rects,
-                            double pts, double endpts)
-{
-    int i, xmin = INT_MAX, ymin = INT_MAX, xmax = INT_MIN, ymax = INT_MIN;
-    struct spu_packet_t *packet;
-
-    if (num_rects == 1) {
-        spudec_set_paletted(vo_spudec,
-                            rects[0]->pict.data[0],
-                            rects[0]->pict.linesize[0],
-                            rects[0]->pict.data[1],
-                            rects[0]->x,
-                            rects[0]->y,
-                            rects[0]->w,
-                            rects[0]->h,
-                            pts,
-                            endpts);
-        return;
-    }
-    for (i = 0; i < num_rects; i++) {
-        xmin = FFMIN(xmin, rects[i]->x);
-        ymin = FFMIN(ymin, rects[i]->y);
-        xmax = FFMAX(xmax, rects[i]->x + rects[i]->w);
-        ymax = FFMAX(ymax, rects[i]->y + rects[i]->h);
-    }
-    packet = spudec_packet_create(xmin, ymin, xmax - xmin, ymax - ymin);
-    if (!packet)
-        return;
-    spudec_packet_clear(packet);
-    for (i = 0; i < num_rects; i++)
-        spudec_packet_fill(packet,
-                           rects[i]->pict.data[0],
-                           rects[i]->pict.linesize[0],
-                           rects[i]->pict.data[1],
-                           rects[i]->x - xmin,
-                           rects[i]->y - ymin,
-                           rects[i]->w,
-                           rects[i]->h);
-    spudec_packet_send(vo_spudec, packet, pts, endpts);
-}
-
-/**
- * Decode a subtitle packet via libavcodec.
- * \return < 0 on error, > 0 if further processing is needed
- */
-int decode_avsub(struct sh_sub *sh, uint8_t *data, int size,
-                 double pts, double duration)
-{
-    AVCodecContext *ctx = sh->context;
-    enum CodecID cid = CODEC_ID_NONE;
-    int res;
-    int got_sub;
-    AVSubtitle sub;
-    AVPacket pkt;
-
-    switch (sh->type) {
-    case 'b':
-        cid = CODEC_ID_DVB_SUBTITLE; break;
-    case 'p':
-        cid = CODEC_ID_HDMV_PGS_SUBTITLE; break;
-    case 'x':
-        cid = CODEC_ID_XSUB; break;
-    }
-
-    av_init_packet(&pkt);
-    pkt.data = data;
-    pkt.size = size;
-    pkt.pts = pts * 1000;
-    if (duration >= 0)
-        pkt.convergence_duration = duration * 1000;
-    if (!ctx) {
-        AVCodec *sub_codec;
-        sub_codec = avcodec_find_decoder(cid);
-        if (!sub_codec)
-            goto error;
-        ctx = avcodec_alloc_context3(sub_codec);
-        if (!ctx)
-            goto error;
-        if (avcodec_open2(ctx, sub_codec, NULL) < 0) {
-         error:
-            mp_msg(MSGT_SUBREADER, MSGL_FATAL,
-                   "Could not open subtitle decoder\n");
-            av_freep(&ctx);
-            return -1;
-        }
-        sh->context = ctx;
-    }
-    res = avcodec_decode_subtitle2(ctx, &sub, &got_sub, &pkt);
-    if (res < 0)
-        return res;
-    if (pts != MP_NOPTS_VALUE) {
-        if (sub.end_display_time > sub.start_display_time)
-            duration = (sub.end_display_time - sub.start_display_time) / 1000.0;
-        pts += sub.start_display_time / 1000.0;
-    }
-    double endpts = MP_NOPTS_VALUE;
-    if (pts != MP_NOPTS_VALUE && duration >= 0)
-        endpts = pts + duration;
-    if (got_sub && vo_spudec && sub.num_rects == 0)
-        spudec_set_paletted(vo_spudec, NULL, 0, NULL, 0, 0, 0, 0, pts, endpts);
-    if (got_sub && sub.num_rects > 0) {
-        switch (sub.rects[0]->type) {
-        case SUBTITLE_BITMAP:
-            if (!vo_spudec)
-                vo_spudec = spudec_new_scaled(NULL, ctx->width, ctx->height, NULL, 0);
-            avsub_to_spudec(sub.rects, sub.num_rects, pts, endpts);
-            vo_osd_changed(OSDTYPE_SPU);
-            break;
-        default:
-            mp_msg(MSGT_SUBREADER, MSGL_ERR, "sd_avsub: unsupported subtitle "
-                   "type from libavcodec\n");
-            res = -1;
-            break;
-        }
-    }
-    if (got_sub)
-        avsubtitle_free(&sub);
-    return res;
-}