September 2018 - ffmpeg-cvslog

avcodec/scpr: Skip frames which change nothing
by Michael Niedermayer 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Sep 25 02:36:35 2018 +0200| [d702769213487923c0fb0abe4b61f4d9ebddb88b] | committer: Michael Niedermayer avcodec/scpr: Skip frames which change nothing Fixes: Timeout Fixes: 10292/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5687943864254464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d702769213487923c… --- libavcodec/scpr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 81597aa4dc..e41fbbec13 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -516,7 +516,7 @@ static int decompress_p(AVCodecContext *avctx, int backstep = linesize - avctx->width; if (bytestream2_get_byte(gb) == 0) - return 0; + return 1; bytestream2_skip(gb, 1); init_rangecoder(&s->rc, gb); @@ -813,6 +813,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->current_frame->linesize[0] / 4, (uint32_t *)s->last_frame->data[0], s->last_frame->linesize[0] / 4); + if (ret == 1) + return avpkt->size; } else { return AVERROR_PATCHWELCOME; }

1 0

avcodec/wcmv: Fix integer overflows
by Michael Niedermayer 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Sep 25 02:01:58 2018 +0200| [a8a98ba9eeedc0c4b5d95e3b61840174cd254bca] | committer: Michael Niedermayer avcodec/wcmv: Fix integer overflows Fixes: signed integer overflow: 262140 * 65535 cannot be represented in type 'int' Fixes: 10090/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5691269368512512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8a98ba9eeedc0c4b… --- libavcodec/wcmv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c index 384ceecd32..ebd5ef66f4 100644 --- a/libavcodec/wcmv.c +++ b/libavcodec/wcmv.c @@ -113,6 +113,8 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_skip(&bgb, 4); w = bytestream2_get_le16(&bgb); h = bytestream2_get_le16(&bgb); + if (x + bpp * (int64_t)w * h > INT_MAX) + return AVERROR_INVALIDDATA; x += bpp * w * h; } @@ -140,6 +142,8 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_skip(&gb, 4); w = bytestream2_get_le16(&gb); h = bytestream2_get_le16(&gb); + if (x + bpp * (int64_t)w * h > INT_MAX) + return AVERROR_INVALIDDATA; x += bpp * w * h; }

1 0

avcodec/gdv: Remove unused variable
by Michael Niedermayer 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Sep 30 21:50:30 2018 +0200| [2076e11839b35c62e28642dcf71c95304af9222f] | committer: Michael Niedermayer avcodec/gdv: Remove unused variable Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2076e11839b35c62e… --- libavcodec/gdv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index b54f7373d1..538bc38e3e 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -74,7 +74,7 @@ static av_cold int gdv_decode_init(AVCodecContext *avctx) static void rescale(GDVContext *gdv, uint8_t *dst, int w, int h, int scale_v, int scale_h) { - int i, j, y, x; + int j, y, x; if ((gdv->scale_v == scale_v) && (gdv->scale_h == scale_h)) { return;

1 0

ffmpeg: break loop when dts_heuristic check done
by xiaofeng 30 Sep '18

30 Sep '18

ffmpeg | branch: master | xiaofeng <wasphin(a)gmail.com> | Sun Sep 30 20:16:22 2018 +0800| [e78016b04a719e7f7554fab6318ee93351f2f27d] | committer: Michael Niedermayer ffmpeg: break loop when dts_heuristic check done Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e78016b04a719e7f7… --- fftools/ffmpeg_opt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c44ed63730..d4851a2cd8 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1149,8 +1149,10 @@ static int open_input_file(OptionsContext *o, const char *filename) int dts_heuristic = 0; for (i=0; i<ic->nb_streams; i++) { const AVCodecParameters *par = ic->streams[i]->codecpar; - if (par->video_delay) + if (par->video_delay) { dts_heuristic = 1; + break; + } } if (dts_heuristic) { seek_timestamp -= 3*AV_TIME_BASE / 23;

1 0

avdevice/decklink_dec: add option to align capture start time
by Karthick Jeyapal 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Karthick Jeyapal <kjeyapal(a)akamai.com> | Fri Sep 28 13:13:54 2018 +0530| [c0ee4e0ac2c46bb4904ceec12b7dfa480517e7bf] | committer: Marton Balint avdevice/decklink_dec: add option to align capture start time This option is useful for maintaining input synchronization across N different hardware devices deployed for 'N-way' redundancy. The system time of different hardware devices should be synchronized with protocols such as NTP or PTP, before using this option. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0ee4e0ac2c46bb49… --- doc/indevs.texi | 14 ++++++++++++++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_dec.cpp | 10 ++++++++++ libavdevice/decklink_dec_c.c | 1 + libavdevice/version.h | 2 +- 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index ed2784be9f..9a9cb697d3 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -371,6 +371,20 @@ If set to @option{true}, timestamps are forwarded as they are without removing the initial offset. Defaults to @option{false}. +@item timestamp_align +Capture start time alignment in seconds. If set to nonzero, input frames are +dropped till the system timestamp aligns with configured value. +Alignment difference of upto one frame duration is tolerated. +This is useful for maintaining input synchronization across N different +hardware devices deployed for 'N-way' redundancy. The system time of different +hardware devices should be synchronized with protocols such as NTP or PTP, +before using this option. +Note that this method is not foolproof. In some border cases input +synchronization may not happen due to thread scheduling jitters in the OS. +Either sync could go wrong by 1 frame or in a rarer case +@option{timestamp_align} seconds. +Defaults to @samp{0}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 32a5d70ee1..8e3bbeb7df 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -56,6 +56,7 @@ struct decklink_cctx { int raw_format; int64_t queue_size; int copyts; + int64_t timestamp_align; }; #endif /* AVDEVICE_DECKLINK_COMMON_C_H */ diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 7fabef231c..deb8f787ee 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -703,6 +703,16 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( return S_OK; } + // Drop the frames till system's timestamp aligns with the configured value. + if (0 == ctx->frameCount && cctx->timestamp_align) { + AVRational remainder = av_make_q(av_gettime() % cctx->timestamp_align, 1000000); + AVRational frame_duration = av_inv_q(ctx->video_st->r_frame_rate); + if (av_cmp_q(remainder, frame_duration) > 0) { + ++ctx->dropped; + return S_OK; + } + } + ctx->frameCount++; if (ctx->audio_pts_source == PTS_SRC_WALLCLOCK || ctx->video_pts_source == PTS_SRC_WALLCLOCK) wallclock = av_gettime_relative(); diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index 6ab3819375..91d2839c57 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -84,6 +84,7 @@ static const AVOption options[] = { { "queue_size", "input queue buffer size", OFFSET(queue_size), AV_OPT_TYPE_INT64, { .i64 = (1024 * 1024 * 1024)}, 0, INT64_MAX, DEC }, { "audio_depth", "audio bitdepth (16 or 32)", OFFSET(audio_depth), AV_OPT_TYPE_INT, { .i64 = 16}, 16, 32, DEC }, { "decklink_copyts", "copy timestamps, do not remove the initial offset", OFFSET(copyts), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC }, + { "timestamp_align", "capture start time alignment (in seconds)", OFFSET(timestamp_align), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, DEC }, { NULL }, }; diff --git a/libavdevice/version.h b/libavdevice/version.h index 8c96e606c2..e6ee009cc4 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 58 #define LIBAVDEVICE_VERSION_MINOR 4 -#define LIBAVDEVICE_VERSION_MICRO 104 +#define LIBAVDEVICE_VERSION_MICRO 105 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \

1 0

avcodec/hevc_parser: very minor simplification in hevc_parse()
by Michael Niedermayer 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Sep 30 02:29:44 2018 +0200| [449b1dcd7d52b33b148fae95de176b7344bf959d] | committer: Michael Niedermayer avcodec/hevc_parser: very minor simplification in hevc_parse() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=449b1dcd7d52b33b1… --- libavcodec/hevc_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 01418b276d..369d1338d0 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -315,7 +315,7 @@ static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } - is_dummy_buf = (is_dummy_buf && (dummy_buf == buf)); + is_dummy_buf &= (dummy_buf == buf); if (!is_dummy_buf) parse_nal_units(s, buf, buf_size, avctx);

1 0

lavc/hevc: Don't parse NAL unit for a dummy buffer
by Haihao Xiang 30 Sep '18

30 Sep '18

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Fri Mar 30 10:42:32 2018 +0800| [4c14a25281bb496092e2a6f930e4f1f9e900514f] | committer: Michael Niedermayer lavc/hevc: Don't parse NAL unit for a dummy buffer hevc parser mistakenly reports the following message if a dummy buffer is padded for EOF [hevc @ 0x559b63848610] missing picture in access unit Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> Reviewed-by: Steven Liu <lq(a)chinaffmpeg.org> Reviewed-by: "Li, Zhong" <zhong.li(a)intel.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c14a25281bb49609… --- libavcodec/hevc_parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index a468682ed3..01418b276d 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -294,6 +294,8 @@ static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, int next; HEVCParserContext *ctx = s->priv_data; ParseContext *pc = &ctx->pc; + int is_dummy_buf = !buf_size; + const uint8_t *dummy_buf = buf; if (avctx->extradata && !ctx->parsed_extradata) { ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size, &ctx->ps, &ctx->sei, @@ -313,7 +315,10 @@ static int hevc_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } - parse_nal_units(s, buf, buf_size, avctx); + is_dummy_buf = (is_dummy_buf && (dummy_buf == buf)); + + if (!is_dummy_buf) + parse_nal_units(s, buf, buf_size, avctx); *poutbuf = buf; *poutbuf_size = buf_size;

1 0

avcodec/libzvbi-teletextdec: add formatted ass output
by Marton Balint 29 Sep '18

29 Sep '18

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun Apr 29 03:08:12 2018 +0200| [b577153231ee050b04e29f3bb2ea72eca2431c60] | committer: Marton Balint avcodec/libzvbi-teletextdec: add formatted ass output Inspired by the VideoLAN text decoder and its port to FFmpeg made by Aman Gupta. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b577153231ee050b0… --- doc/decoders.texi | 18 ++- libavcodec/libzvbi-teletextdec.c | 263 +++++++++++++++++++++++++++++++++++++-- libavcodec/version.h | 2 +- 3 files changed, 269 insertions(+), 14 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index 31e96fbc8d..25187e30f1 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -261,12 +261,18 @@ Default value is *. @item txt_chop_top Discards the top teletext line. Default value is 1. @item txt_format -Specifies the format of the decoded subtitles. The teletext decoder is capable -of decoding the teletext pages to bitmaps or to simple text, you should use -"bitmap" for teletext pages, because certain graphics and colors cannot be -expressed in simple text. You might use "text" for teletext based subtitles if -your application can handle simple text based subtitles. Default value is -bitmap. +Specifies the format of the decoded subtitles. +@table @option +@item bitmap +The default format, you should use this for teletext pages, because certain +graphics and colors cannot be expressed in simple text or even ASS. +@item text +Simple text based output without formatting. +@item ass +Formatted ASS output, subtitle pages and teletext pages are returned in +different styles, subtitle pages are stripped down to text, but an effort is +made to keep the text alignment and the formatting. +@end table @item txt_left X offset of generated bitmaps, default is 0. @item txt_top diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 809547545b..3515f33924 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -26,6 +26,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" +#include "libavutil/common.h" #include <libzvbi.h> @@ -56,7 +57,7 @@ typedef struct TeletextContext char *pgno; int x_offset; int y_offset; - int format_id; /* 0 = bitmap, 1 = text/ass */ + int format_id; /* 0 = bitmap, 1 = text/ass, 2 = ass */ int chop_top; int sub_duration; /* in msec */ int transparent_bg; @@ -76,8 +77,55 @@ typedef struct TeletextContext uint8_t subtitle_map[2048]; int last_pgno; int last_p5; + int last_ass_alignment; } TeletextContext; +static int my_ass_subtitle_header(AVCodecContext *avctx) +{ + int ret = ff_ass_subtitle_header_default(avctx); + char *new_header; + uint8_t *event_pos; + + if (ret < 0) + return ret; + + event_pos = strstr(avctx->subtitle_header, "\r\n[Events]\r\n"); + if (!event_pos) + return AVERROR_BUG; + + new_header = av_asprintf("%.*s%s%s", + (int)(event_pos - avctx->subtitle_header), avctx->subtitle_header, + "Style: " + "Teletext," /* Name */ + "Monospace,11," /* Font{name,size} */ + "&Hffffff,&Hffffff,&H0,&H0," /* {Primary,Secondary,Outline,Back}Colour */ + "0,0,0,0," /* Bold, Italic, Underline, StrikeOut */ + "160,100," /* Scale{X,Y} */ + "0,0," /* Spacing, Angle */ + "3,0.1,0," /* BorderStyle, Outline, Shadow */ + "5,1,1,1," /* Alignment, Margin[LRV] */ + "0\r\n" /* Encoding */ + "Style: " + "Subtitle," /* Name */ + "Monospace,16," /* Font{name,size} */ + "&Hffffff,&Hffffff,&H0,&H0," /* {Primary,Secondary,Outline,Back}Colour */ + "0,0,0,0," /* Bold, Italic, Underline, StrikeOut */ + "100,100," /* Scale{X,Y} */ + "0,0," /* Spacing, Angle */ + "1,1,1," /* BorderStyle, Outline, Shadow */ + "8,48,48,20," /* Alignment, Margin[LRV] */ + "0\r\n" /* Encoding */ + , event_pos); + + if (!new_header) + return AVERROR(ENOMEM); + + av_free(avctx->subtitle_header); + avctx->subtitle_header = new_header; + avctx->subtitle_header_size = strlen(new_header); + return 0; +} + static int chop_spaces_utf8(const unsigned char* t, int len) { t += len; @@ -181,6 +229,184 @@ static int gen_sub_text(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page return 0; } +static void bprint_color(const char *type, AVBPrint *buf, vbi_page *page, unsigned ci) +{ + int r = VBI_R(page->color_map[ci]); + int g = VBI_G(page->color_map[ci]); + int b = VBI_B(page->color_map[ci]); + av_bprintf(buf, "{\\%s&H%02X%02X%02X&}", type, b, g, r); +} + +#define IS_TXT_SPACE(ch) ((ch).unicode < 0x0020 || (ch).unicode >= 0xe000 || (ch).unicode == 0x00a0 ||\ + (ch).size > VBI_DOUBLE_SIZE || (ch).opacity == VBI_TRANSPARENT_SPACE) + +static void get_trim_info(vbi_page *page, vbi_char *row, int *leading, int *trailing, int *olen) +{ + int i, len = 0; + int char_seen = 0; + + *leading = 0; + + for (i = 0; i < page->columns; i++) { + uint16_t out = IS_TXT_SPACE(row[i]) ? 32 : row[i].unicode; + + if (out == 32 && !char_seen) + (*leading)++; + else if (out != 32) + char_seen = 1, len = i - (*leading) + 1; + } + + *olen = len; + *trailing = len > 0 ? page->columns - *leading - len : page->columns; +} + +static void decode_string(vbi_page *page, vbi_char *row, AVBPrint *buf, + int start, int end, vbi_color *cur_color, vbi_color *cur_back_color) +{ + int i; + + for (i = start; i < end; i++) { + uint16_t out = IS_TXT_SPACE(row[i]) ? 32 : row[i].unicode; + + if (*cur_color != row[i].foreground) { + bprint_color("c", buf, page, row[i].foreground); + *cur_color = row[i].foreground; + } + if (*cur_back_color != row[i].background) { + bprint_color("3c", buf, page, row[i].background); + *cur_back_color = row[i].background; + } + + if (out == 32) { + av_bprintf(buf, "\\h"); + } else if (out == '\\' || out == '{' || out == '}') { + av_bprintf(buf, "\\%c", (char)out); + } else { + char tmp; + /* convert to utf-8 */ + PUT_UTF8(out, tmp, av_bprint_chars(buf, tmp, 1);); + } + } +} + +/* Draw a page as ass formatted text */ +static int gen_sub_ass(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top) +{ + int i; + int leading, trailing, len; + int last_trailing = -1, last_leading = -1; + int min_trailing = page->columns, min_leading = page->columns; + int alignment = 2; + int vertical_align = -1; + int can_align_left = 1, can_align_right = 1, can_align_center = 1; + int is_subtitle_page = ctx->subtitle_map[page->pgno & 0x7ff]; + int empty_lines = 0; + vbi_color cur_color = VBI_WHITE; + vbi_color cur_back_color = VBI_BLACK; + AVBPrint buf; + + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); + + for (i = chop_top; i < page->rows; i++) { + vbi_char *row = page->text + i * page->columns; + + get_trim_info(page, row, &leading, &trailing, &len); + + if (len) { + if (last_leading != -1 && last_leading != leading || leading > 5) + can_align_left = 0; + if (last_trailing != -1 && last_trailing != trailing || trailing > 2) + can_align_right = 0; + if (last_trailing != -1 && (FFABS((trailing - leading) - (last_trailing - last_leading)) > 1) || trailing - leading > 4) + can_align_center = 0; + last_leading = leading; + last_trailing = trailing; + min_leading = FFMIN(leading, min_leading); + min_trailing = FFMIN(trailing, min_trailing); + } + } + + if (!can_align_right && can_align_left && !can_align_center) { + ctx->last_ass_alignment = alignment = 1; + } else if (!can_align_right && !can_align_left && can_align_center) { + ctx->last_ass_alignment = alignment = 2; + } else if (can_align_right && !can_align_left && !can_align_center) { + ctx->last_ass_alignment = alignment = 3; + } else { + if (ctx->last_ass_alignment == 1 && can_align_left || + ctx->last_ass_alignment == 2 && can_align_center || + ctx->last_ass_alignment == 3 && can_align_right) + alignment = ctx->last_ass_alignment; + } + + for (i = chop_top; i < page->rows; i++) { + int j; + vbi_char *row = page->text + i * page->columns; + int is_transparent_line; + + for (j = 0; j < page->columns; j++) + if (row[j].opacity != VBI_TRANSPARENT_SPACE) + break; + is_transparent_line = (j == page->columns); + + len = is_transparent_line ? 0 : page->columns; + leading = trailing = is_transparent_line ? page->columns : 0; + + if (is_subtitle_page) { + if (!is_transparent_line) + get_trim_info(page, row, &leading, &trailing, &len); + + if (vertical_align == -1 && len) { + vertical_align = (2 - (av_clip(i + 1, 0, 23) / 8)); + av_bprintf(&buf, "{\\an%d}", alignment + vertical_align * 3); + if (vertical_align != 2) + empty_lines = 0; + } + + if (len && empty_lines > 1) + for (empty_lines /= 2; empty_lines > 0; empty_lines--) + av_bprintf(&buf, " \\N"); + + if (alignment == 1 || alignment == 2 && !can_align_center) + leading = min_leading; + if (alignment == 3 || alignment == 2 && !can_align_center) + trailing = min_trailing; + } + + if (len || !is_subtitle_page) { + decode_string(page, row, &buf, leading, page->columns - trailing, &cur_color, &cur_back_color); + av_bprintf(&buf, " \\N"); + empty_lines = 0; + } else { + empty_lines++; + } + } + + if (vertical_align == 0) + for (empty_lines = (empty_lines - 1) / 2; empty_lines > 0; empty_lines--) + av_bprintf(&buf, " \\N"); + + if (!av_bprint_is_complete(&buf)) { + av_bprint_finalize(&buf, NULL); + return AVERROR(ENOMEM); + } + + if (buf.len) { + sub_rect->type = SUBTITLE_ASS; + sub_rect->ass = ff_ass_get_dialog(ctx->readorder++, 0, is_subtitle_page ? "Subtitle" : "Teletext", NULL, buf.str); + + if (!sub_rect->ass) { + av_bprint_finalize(&buf, NULL); + return AVERROR(ENOMEM); + } + av_log(ctx, AV_LOG_DEBUG, "subtext:%s:txetbus\n", sub_rect->ass); + } else { + sub_rect->type = SUBTITLE_NONE; + } + av_bprint_finalize(&buf, NULL); + return 0; +} + static void fix_transparency(TeletextContext *ctx, AVSubtitleRect *sub_rect, vbi_page *page, int chop_top, int resx, int resy) { @@ -318,9 +544,20 @@ static void handler(vbi_event *ev, void *user_data) cur_page->pgno = ev->ev.ttx_page.pgno; cur_page->subno = ev->ev.ttx_page.subno; if (cur_page->sub_rect) { - res = (ctx->format_id == 0) ? - gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top) : - gen_sub_text (ctx, cur_page->sub_rect, &page, chop_top); + switch (ctx->format_id) { + case 0: + res = gen_sub_bitmap(ctx, cur_page->sub_rect, &page, chop_top); + break; + case 1: + res = gen_sub_text(ctx, cur_page->sub_rect, &page, chop_top); + break; + case 2: + res = gen_sub_ass(ctx, cur_page->sub_rect, &page, chop_top); + break; + default: + res = AVERROR_BUG; + break; + } if (res < 0) { av_freep(&cur_page->sub_rect); ctx->handler_ret = res; @@ -448,7 +685,7 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_si // is there a subtitle to pass? if (ctx->nb_pages) { int i; - sub->format = ctx->format_id; + sub->format = !!ctx->format_id; sub->start_display_time = 0; sub->end_display_time = ctx->sub_duration; sub->num_rects = 0; @@ -508,12 +745,22 @@ static int teletext_init_decoder(AVCodecContext *avctx) ctx->vbi = NULL; ctx->pts = AV_NOPTS_VALUE; ctx->last_pgno = -1; + ctx->last_ass_alignment = 2; if (ctx->opacity == -1) ctx->opacity = ctx->transparent_bg ? 0 : 255; av_log(avctx, AV_LOG_VERBOSE, "page filter: %s\n", ctx->pgno); - return (ctx->format_id == 1) ? ff_ass_subtitle_header_default(avctx) : 0; + + switch (ctx->format_id) { + case 0: + return 0; + case 1: + return ff_ass_subtitle_header_default(avctx); + case 2: + return my_ass_subtitle_header(avctx); + } + return AVERROR_BUG; } static int teletext_close_decoder(AVCodecContext *avctx) @@ -529,6 +776,7 @@ static int teletext_close_decoder(AVCodecContext *avctx) ctx->vbi = NULL; ctx->pts = AV_NOPTS_VALUE; ctx->last_pgno = -1; + ctx->last_ass_alignment = 2; memset(ctx->subtitle_map, 0, sizeof(ctx->subtitle_map)); if (!(avctx->flags2 & AV_CODEC_FLAG2_RO_FLUSH_NOOP)) ctx->readorder = 0; @@ -545,9 +793,10 @@ static void teletext_flush(AVCodecContext *avctx) static const AVOption options[] = { {"txt_page", "page numbers to decode, subtitle for subtitles, * for all", OFFSET(pgno), AV_OPT_TYPE_STRING, {.str = "*"}, 0, 0, SD}, {"txt_chop_top", "discards the top teletext line", OFFSET(chop_top), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, - {"txt_format", "format of the subtitles (bitmap or text)", OFFSET(format_id), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, SD, "txt_format"}, + {"txt_format", "format of the subtitles (bitmap or text or ass)", OFFSET(format_id), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 2, SD, "txt_format"}, {"bitmap", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, SD, "txt_format"}, {"text", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, SD, "txt_format"}, + {"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, SD, "txt_format"}, {"txt_left", "x offset of generated bitmaps", OFFSET(x_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_top", "y offset of generated bitmaps", OFFSET(y_offset), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 65535, SD}, {"txt_chop_spaces", "chops leading and trailing spaces from text", OFFSET(chop_spaces), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, SD}, diff --git a/libavcodec/version.h b/libavcodec/version.h index fa3fd01025..7a9484b9a1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 31 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

avcodec/diracdec: check that GetBitContext has not ended in codeblock()
by Michael Niedermayer 28 Sep '18

28 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Sep 14 00:22:13 2018 +0200| [179ed2d2e08949662de2249c71f01ae388ca851e] | committer: Michael Niedermayer avcodec/diracdec: check that GetBitContext has not ended in codeblock() Fixes: Timeout (part 2 of 2) Fixes: 9774/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5748957085958144 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=179ed2d2e08949662… --- libavcodec/diracdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index cbd7fd1532..af561d1426 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -548,6 +548,8 @@ static inline int codeblock(DiracContext *s, SubBand *b, } } else { for (y = top; y < bottom; y++) { + if (get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; for (x = left; x < right; x++) { int val = coeff_unpack_golomb(gb, qfactor, qoffset); if (b->pshift) {

1 0

avcodec/diracdec: Propagate errors from codeblock()
by Michael Niedermayer 28 Sep '18

28 Sep '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Sep 14 00:22:13 2018 +0200| [7274d849cc44f9e4c5573d1b271d99f46ad7d583] | committer: Michael Niedermayer avcodec/diracdec: Propagate errors from codeblock() Consider a component to be damaged if more than 50% of its subbands are damaged Fixes: Timeout (part 1 of 2) Fixes: 9774/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5748957085958144 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7274d849cc44f9e4c… --- libavcodec/diracdec.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 9a417caec5..cbd7fd1532 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -488,7 +488,7 @@ UNPACK_ARITH(10, int32_t) * Decode the coeffs in the rectangle defined by left, right, top, bottom * [DIRAC_STD] 13.4.3.2 Codeblock unpacking loop. codeblock() */ -static inline void codeblock(DiracContext *s, SubBand *b, +static inline int codeblock(DiracContext *s, SubBand *b, GetBitContext *gb, DiracArith *c, int left, int right, int top, int bottom, int blockcnt_one, int is_arith) @@ -505,7 +505,7 @@ static inline void codeblock(DiracContext *s, SubBand *b, zero_block = get_bits1(gb); if (zero_block) - return; + return 0; } if (s->codeblock_mode && !(s->old_delta_quant && blockcnt_one)) { @@ -516,7 +516,7 @@ static inline void codeblock(DiracContext *s, SubBand *b, quant = dirac_get_se_golomb(gb); if (quant > INT_MAX - b->quant || b->quant + quant < 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid quant\n"); - return; + return AVERROR_INVALIDDATA; } b->quant += quant; } @@ -524,7 +524,7 @@ static inline void codeblock(DiracContext *s, SubBand *b, if (b->quant > (DIRAC_MAX_QUANT_INDEX - 1)) { av_log(s->avctx, AV_LOG_ERROR, "Unsupported quant %d\n", b->quant); b->quant = 0; - return; + return AVERROR_INVALIDDATA; } qfactor = ff_dirac_qscale_tab[b->quant]; @@ -559,6 +559,7 @@ static inline void codeblock(DiracContext *s, SubBand *b, buf += b->stride; } } + return 0; } /** @@ -593,7 +594,7 @@ INTRA_DC_PRED(10, uint32_t) * Dirac Specification -> * 13.4.2 Non-skipped subbands. subband_coeffs() */ -static av_always_inline void decode_subband_internal(DiracContext *s, SubBand *b, int is_arith) +static av_always_inline int decode_subband_internal(DiracContext *s, SubBand *b, int is_arith) { int cb_x, cb_y, left, right, top, bottom; DiracArith c; @@ -601,9 +602,10 @@ static av_always_inline void decode_subband_internal(DiracContext *s, SubBand *b int cb_width = s->codeblock[b->level + (b->orientation != subband_ll)].width; int cb_height = s->codeblock[b->level + (b->orientation != subband_ll)].height; int blockcnt_one = (cb_width + cb_height) == 2; + int ret; if (!b->length) - return; + return 0; init_get_bits8(&gb, b->coeff_data, b->length); @@ -616,7 +618,9 @@ static av_always_inline void decode_subband_internal(DiracContext *s, SubBand *b left = 0; for (cb_x = 0; cb_x < cb_width; cb_x++) { right = (b->width * (cb_x+1LL)) / cb_width; - codeblock(s, b, &gb, &c, left, right, top, bottom, blockcnt_one, is_arith); + ret = codeblock(s, b, &gb, &c, left, right, top, bottom, blockcnt_one, is_arith); + if (ret < 0) + return ret; left = right; } top = bottom; @@ -629,33 +633,35 @@ static av_always_inline void decode_subband_internal(DiracContext *s, SubBand *b intra_dc_prediction_8(b); } } + return 0; } static int decode_subband_arith(AVCodecContext *avctx, void *b) { DiracContext *s = avctx->priv_data; - decode_subband_internal(s, b, 1); - return 0; + return decode_subband_internal(s, b, 1); } static int decode_subband_golomb(AVCodecContext *avctx, void *arg) { DiracContext *s = avctx->priv_data; SubBand **b = arg; - decode_subband_internal(s, *b, 0); - return 0; + return decode_subband_internal(s, *b, 0); } /** * Dirac Specification -> * [DIRAC_STD] 13.4.1 core_transform_data() */ -static void decode_component(DiracContext *s, int comp) +static int decode_component(DiracContext *s, int comp) { AVCodecContext *avctx = s->avctx; SubBand *bands[3*MAX_DWT_LEVELS+1]; enum dirac_subband orientation; int level, num_bands = 0; + int ret[3*MAX_DWT_LEVELS+1]; + int i; + int damaged_count = 0; /* Unpack all subbands at all levels. */ for (level = 0; level < s->wavelet_depth; level++) { @@ -677,11 +683,20 @@ static void decode_component(DiracContext *s, int comp) /* arithmetic coding has inter-level dependencies, so we can only execute one level at a time */ if (s->is_arith) avctx->execute(avctx, decode_subband_arith, &s->plane[comp].band[level][!!level], - NULL, 4-!!level, sizeof(SubBand)); + ret + 3*level + !!level, 4-!!level, sizeof(SubBand)); } /* golomb coding has no inter-level dependencies, so we can execute all subbands in parallel */ if (!s->is_arith) - avctx->execute(avctx, decode_subband_golomb, bands, NULL, num_bands, sizeof(SubBand*)); + avctx->execute(avctx, decode_subband_golomb, bands, ret, num_bands, sizeof(SubBand*)); + + for (i = 0; i < s->wavelet_depth * 3 + 1; i++) { + if (ret[i] < 0) + damaged_count++; + } + if (damaged_count > (s->wavelet_depth * 3 + 1) /2) + return AVERROR_INVALIDDATA; + + return 0; } #define PARSE_VALUES(type, x, gb, ebits, buf1, buf2) \ @@ -1867,7 +1882,9 @@ static int dirac_decode_frame_internal(DiracContext *s) if (!s->zero_res && !s->low_delay) { memset(p->idwt.buf, 0, p->idwt.stride * p->idwt.height); - decode_component(s, comp); /* [DIRAC_STD] 13.4.1 core_transform_data() */ + ret = decode_component(s, comp); /* [DIRAC_STD] 13.4.1 core_transform_data() */ + if (ret < 0) + return ret; } ret = ff_spatial_idwt_init(&d, &p->idwt, s->wavelet_idx+2, s->wavelet_depth, s->bit_depth);

1 0