virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

lavc/dvdsubenc: accept palette from options

Browse Source 
Previously, the default palette would always be used.
Now, we can accept a custom palette, just like dvdsubdec does.

Signed-off-by: Michael Kuron <michael.kuron@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Kuron 2020-02-03 20:42:31 +01:00 committed by Michael Niedermayer
parent bf070a9171
commit d4440c7e91
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/encoders.texi
View File

@ -3211,6 +3211,14 @@ and they can also be used in Matroska files.
@subsection Options @subsection Options
@table @option @table @option
@item palette
Specify the global palette used by the bitmaps.
The format for this option is a string containing 16 24-bits hexadecimal
numbers (without 0x prefix) separated by commas, for example @code{0d00ee,
ee450d, 101010, eaeaea, 0ce60b, ec14ed, ebff0b, 0d617a, 7b7b7b, d1d1d1,
7b2a0e, 0d950c, 0f007b, cf0dec, cfa80c, 7c127b}.
@item even_rows_fix @item even_rows_fix
When set to 1, enable a work-around that makes the number of pixel rows When set to 1, enable a work-around that makes the number of pixel rows
even in all subtitles. This fixes a problem with some players that even in all subtitles. This fixes a problem with some players that

1
libavcodec/Makefile
View File

@ -285,6 +285,7 @@ OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o
OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsub.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsub.o
OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsub.o
OBJS-$(CONFIG_DVAUDIO_DECODER) += dvaudiodec.o OBJS-$(CONFIG_DVAUDIO_DECODER) += dvaudiodec.o
OBJS-$(CONFIG_DVVIDEO_DECODER) += dvdec.o dv.o dvdata.o OBJS-$(CONFIG_DVVIDEO_DECODER) += dvdec.o dv.o dvdata.o
OBJS-$(CONFIG_DVVIDEO_ENCODER) += dvenc.o dv.o dvdata.o OBJS-$(CONFIG_DVVIDEO_ENCODER) += dvenc.o dv.o dvdata.o

8
libavcodec/dvdsubenc.c
View File

@ -29,6 +29,7 @@
typedef struct { typedef struct {
AVClass *class; AVClass *class;
uint32_t global_palette[16]; uint32_t global_palette[16];
char *palette_str;
int even_rows_fix; int even_rows_fix;
} DVDSubtitleContext; } DVDSubtitleContext;
@ -436,7 +437,11 @@ static int dvdsub_init(AVCodecContext *avctx)
int i, ret; int i, ret;
av_assert0(sizeof(dvdc->global_palette) == sizeof(default_palette)); av_assert0(sizeof(dvdc->global_palette) == sizeof(default_palette));
memcpy(dvdc->global_palette, default_palette, sizeof(dvdc->global_palette)); if (dvdc->palette_str) {
ff_dvdsub_parse_palette(dvdc->global_palette, dvdc->palette_str);
} else {
memcpy(dvdc->global_palette, default_palette, sizeof(dvdc->global_palette));
}
av_bprint_init(&extradata, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(&extradata, 0, AV_BPRINT_SIZE_AUTOMATIC);
if (avctx->width && avctx->height) if (avctx->width && avctx->height)
@ -467,6 +472,7 @@ static int dvdsub_encode(AVCodecContext *avctx,
#define OFFSET(x) offsetof(DVDSubtitleContext, x) #define OFFSET(x) offsetof(DVDSubtitleContext, x)
#define SE AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define SE AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{"palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SE },
{"even_rows_fix", "Make number of rows even (workaround for some players)", OFFSET(even_rows_fix), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SE}, {"even_rows_fix", "Make number of rows even (workaround for some players)", OFFSET(even_rows_fix), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SE},
{ NULL }, { NULL },
}; };