Mercurial > mplayer.hg
view sub/av_sub.c @ 36920:40ad45360c8a
Replace old item 'potmeter' by new item 'pimage'.
Recent versions of the X11/GTK GUI didn't allow to control a potmeter,
because that didn't seem to make any sense.
In order to get rid of the confusing potmeter that doesn't distinguish
from a hpotmeter and in order to allow the more useful behaviour recent
versions of the X11/GTK GUI have been utilized (and because we're still
supporting item 'potmeter' for reasons of compatibility with old skins),
introduce new item 'pimage' that reuses most of the current potmeter
code.
Additionally, remove remaining code and documentation of 'potmeter'.
author | ib |
---|---|
date | Mon, 17 Mar 2014 12:29:46 +0000 |
parents | 9b88b87f5921 |
children | 6d654ac9201e |
line wrap: on
line source
/* * 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 "libmpdemux/stheader.h" #include "mp_msg.h" #include "sub.h" #include "spudec.h" #include "av_helpers.h" #include "av_sub.h" void reset_avsub(struct sh_sub *sh) { if (sh->context) { AVCodecContext *ctx = sh->context; ctx->extradata = NULL; ctx->extradata_size = 0; 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 *endpts) { AVCodecContext *ctx = sh->context; enum AVCodecID cid = AV_CODEC_ID_NONE; int new_type = 0; int res; int got_sub; AVSubtitle sub; AVPacket pkt; switch (sh->type) { case 'b': cid = AV_CODEC_ID_DVB_SUBTITLE; break; case 'p': cid = AV_CODEC_ID_HDMV_PGS_SUBTITLE; break; case 'x': cid = AV_CODEC_ID_XSUB; break; } av_init_packet(&pkt); pkt.data = *data; pkt.size = *size; pkt.pts = *pts * 1000; if (*pts != MP_NOPTS_VALUE && *endpts != MP_NOPTS_VALUE) pkt.convergence_duration = (*endpts - *pts) * 1000; if (!ctx) { AVCodec *sub_codec; init_avcodec(); ctx = avcodec_alloc_context3(NULL); if (!ctx) { mp_msg(MSGT_SUBREADER, MSGL_FATAL, "Could not allocate subtitle decoder context\n"); return -1; } ctx->extradata_size = sh->extradata_len; ctx->extradata = sh->extradata; sub_codec = avcodec_find_decoder(cid); if (!sub_codec || avcodec_open2(ctx, sub_codec, NULL) < 0) { 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) *endpts = *pts + sub.end_display_time / 1000.0; *pts += sub.start_display_time / 1000.0; } 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; case SUBTITLE_TEXT: *data = strdup(sub.rects[0]->text); *size = strlen(*data); new_type = 't'; break; case SUBTITLE_ASS: *data = strdup(sub.rects[0]->ass); *size = strlen(*data); new_type = 'a'; break; } } if (got_sub) avsubtitle_free(&sub); return new_type; }