virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/dvbsubdec: Add option to select when to computer clut (always/never/"if needed")

Browse Source 
Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-26 18:38:18 +02:00
parent dcc540db6e
commit d41dceb14e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dvbsubdec.c
View File

@ -237,6 +237,7 @@ typedef struct DVBSubContext {
int time_out; int time_out;
int compute_edt; /**< if 1 end display time calculated using pts int compute_edt; /**< if 1 end display time calculated using pts
if 0 (Default) calculated using time out */ if 0 (Default) calculated using time out */
int compute_clut;
int64_t prev_start; int64_t prev_start;
DVBSubRegion *region_list; DVBSubRegion *region_list;
DVBSubCLUT *clut_list; DVBSubCLUT *clut_list;
@ -912,7 +913,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
memcpy(rect->pict.data[0], region->pbuf, region->buf_size); memcpy(rect->pict.data[0], region->pbuf, region->buf_size);
if (clut == &default_clut) if ((clut == &default_clut && ctx->compute_clut == -1) || ctx->compute_clut == 1)
compute_default_clut(&rect->pict, rect->w, rect->h); compute_default_clut(&rect->pict, rect->w, rect->h);
i++; i++;
@ -1706,6 +1707,7 @@ end:
#define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM #define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{"compute_edt", "compute end of time using pts or timeout", offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS}, {"compute_edt", "compute end of time using pts or timeout", offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS},
{"compute_clut", "compute clut when not available(-1) or always(1) or never(0)", offsetof(DVBSubContext, compute_clut), FF_OPT_TYPE_INT, {.i64 = -1}, -1, 1, DS},
{NULL} {NULL}
}; };
static const AVClass dvbsubdec_class = { static const AVClass dvbsubdec_class = {