har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dvbsubdec: Implement display definition segment fallback from ETSI EN 300 743 V1.3.1

Browse Source 
Fixes: subtitles.ts
Fixes: Ticket679

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-29 17:59:51 +02:00
parent f4ada6dc3f
commit 1fc20af6af
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dvbsubdec.c
View File

@ -1606,6 +1606,7 @@ static int dvbsub_decode(AVCodecContext *avctx,
int i; int i;
int ret = 0; int ret = 0;
int got_segment = 0; int got_segment = 0;
int got_dds = 0;
ff_dlog(avctx, "DVB sub packet:\n"); ff_dlog(avctx, "DVB sub packet:\n");
@ -1668,9 +1669,15 @@ static int dvbsub_decode(AVCodecContext *avctx,
case DVBSUB_DISPLAYDEFINITION_SEGMENT: case DVBSUB_DISPLAYDEFINITION_SEGMENT:
ret = dvbsub_parse_display_definition_segment(avctx, p, ret = dvbsub_parse_display_definition_segment(avctx, p,
segment_length); segment_length);
got_dds = 1;
break; break;
case DVBSUB_DISPLAY_SEGMENT: case DVBSUB_DISPLAY_SEGMENT:
ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, data_size); ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, data_size);
if (got_segment == 15 && !got_dds && !avctx->width && !avctx->height) {
// Default from ETSI EN 300 743 V1.3.1 (7.2.1)
avctx->width = 720;
avctx->height = 576;
}
got_segment |= 16; got_segment |= 16;
break; break;
default: default: