October 2013 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 10:54:46 2013 +0100| [fa6fa2162b730336fc1d6ee0d547dcc81f4afbad] | committer: Michael Niedermayer avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0 Fixes overreads in HEVC Fixes Ticket3070 Also fixed remaining issues from Ticket3075 and Ticket3076 Some lines of code taken from 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h and 0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa6fa2162b730336f… --- libavcodec/cabac_functions.h | 10 ++++++++-- libavcodec/x86/cabac.h | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index b84258b..7e22064 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -49,7 +49,10 @@ static void refill(CABACContext *c){ c->low+= c->bytestream[0]<<1; #endif c->low -= CABAC_MASK; - c->bytestream += CABAC_BITS / 8; +#if !UNCHECKED_BITSTREAM_READER + if (c->bytestream < c->bytestream_end) +#endif + c->bytestream += CABAC_BITS / 8; } static inline void renorm_cabac_decoder_once(CABACContext *c){ @@ -76,7 +79,10 @@ static void refill2(CABACContext *c){ #endif c->low += x<<i; - c->bytestream += CABAC_BITS/8; +#if !UNCHECKED_BITSTREAM_READER + if (c->bytestream < c->bytestream_end) +#endif + c->bytestream += CABAC_BITS/8; } static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 7d431e5..558d287 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -36,6 +36,18 @@ #if HAVE_INLINE_ASM +#ifndef UNCHECKED_BITSTREAM_READER +#define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER +#endif + +#if UNCHECKED_BITSTREAM_READER +#define END_CHECK(end) "" +#else +#define END_CHECK(end) \ + "cmp "end" , %%"REG_c" \n\t"\ + "jge 1f \n\t" +#endif + #ifdef BROKEN_RELOCATIONS #define TABLES_ARG , "r"(tables) @@ -80,7 +92,9 @@ "test "lowword" , "lowword" \n\t"\ "jnz 2f \n\t"\ "mov "byte" , %%"REG_c" \n\t"\ + END_CHECK(end)\ "add"OPSIZE" $2 , "byte" \n\t"\ + "1: \n\t"\ "movzwl (%%"REG_c") , "tmp" \n\t"\ "lea -1("low") , %%ecx \n\t"\ "xor "low" , %%ecx \n\t"\ @@ -139,7 +153,9 @@ "test "lowword" , "lowword" \n\t"\ " jnz 2f \n\t"\ "mov "byte" , %%"REG_c" \n\t"\ + END_CHECK(end)\ "add"OPSIZE" $2 , "byte" \n\t"\ + "1: \n\t"\ "movzwl (%%"REG_c") , "tmp" \n\t"\ "lea -1("low") , %%ecx \n\t"\ "xor "low" , %%ecx \n\t"\ @@ -214,9 +230,16 @@ static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) "movzwl (%1), %%edx \n\t" "bswap %%edx \n\t" "shrl $15, %%edx \n\t" +#if UNCHECKED_BITSTREAM_READER "add $2, %1 \n\t" "addl %%edx, %%eax \n\t" "mov %1, %c4(%2) \n\t" +#else + "addl %%edx, %%eax \n\t" + "cmp %c5(%2), %1 \n\t" + "jge 1f \n\t" + "add"OPSIZE" $2, %c4(%2) \n\t" +#endif "1: \n\t" "movl %%eax, %c3(%2) \n\t"

1 0

hevc: add partial support for interlaced( cherry picked from commit 44b592ae6d323445c076ef3ec966ebf9daa8bccf)
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Mickaël Raulet <mraulet(a)insa-rennes.fr> | Wed Oct 30 12:28:19 2013 +0100| [7c8b65f688ea75496e278b7c042f2eda746f3eac] | committer: Michael Niedermayer hevc: add partial support for interlaced(cherry picked from commit 44b592ae6d323445c076ef3ec966ebf9daa8bccf) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c8b65f688ea75496… --- libavcodec/hevc.c | 1 + libavcodec/hevc.h | 3 ++ libavcodec/hevc_parser.c | 2 ++ libavcodec/hevc_refs.c | 2 ++ libavcodec/hevc_sei.c | 74 ++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 73 insertions(+), 9 deletions(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index aaf319f..9528323 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2834,6 +2834,7 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) return ret; s->enable_parallel_tiles = 0; + s->picture_struct = 0; if(avctx->active_thread_type & FF_THREAD_SLICE) s->threads_number = avctx->thread_count; diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 4b45323..df80475 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -869,9 +869,12 @@ typedef struct HEVCContext { ///< as a format defined in 14496-15 int strict_def_disp_win; + int active_seq_parameter_set_id; + int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) int nuh_layer_id; + int picture_struct; } HEVCContext; int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps, diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 642f975..aacf343 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -165,6 +165,8 @@ static inline int parse_nal_units(AVCodecParserContext *s, case NAL_IDR_N_LP: case NAL_CRA_NUT: sh->first_slice_in_pic_flag = get_bits1(gb); + s->picture_structure = h->picture_struct; + s->field_order = h->picture_struct; if (h->nal_unit_type >= 16 && h->nal_unit_type <= 23) { s->key_frame = 1; diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 6bdd37e..bf3d953 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -106,6 +106,8 @@ static HEVCFrame *alloc_frame(HEVCContext *s) for (j = 0; j < frame->ctb_count; j++) frame->rpl_tab[j] = (RefPicListTab*)frame->rpl_buf->data; + frame->frame->top_field_first = s->picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD; + frame->frame->interlaced_frame = (s->picture_struct == AV_PICTURE_STRUCTURE_TOP_FIELD) || (s->picture_struct == AV_PICTURE_STRUCTURE_BOTTOM_FIELD); return frame; fail: ff_hevc_unref_frame(s, frame, ~0); diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 1a96447..5c404a3 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -51,9 +51,9 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s, int payload_size } } -static void decode_nal_sei_frame_packing_arrangement(HEVCLocalContext *lc) +static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { - GetBitContext *gb = &lc->gb; + GetBitContext *gb = &s->HEVClc->gb; int cancel, type, quincunx; get_ue_golomb(gb); // frame_packing_arrangement_id @@ -77,6 +77,46 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCLocalContext *lc) skip_bits1(gb); // upsampled_aspect_ratio_flag } +static int decode_pic_timing(HEVCContext *s) +{ + GetBitContext *gb = &s->HEVClc->gb; + HEVCSPS *sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data; + + if (!sps) + return(AVERROR(ENOMEM)); + + if (sps->vui.frame_field_info_present_flag) { + int pic_struct = get_bits(gb, 4); + s->picture_struct = AV_PICTURE_STRUCTURE_UNKNOWN; + if (pic_struct == 2) { + av_log(s->avctx, AV_LOG_DEBUG, "BOTTOM Field\n"); + s->picture_struct = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; + } else if (pic_struct == 1) { + av_log(s->avctx, AV_LOG_DEBUG, "TOP Field\n"); + s->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD; + } + get_bits(gb, 2); // source_scan_type + get_bits(gb, 1); // duplicate_flag + } + return 1; +} + +static void active_parameter_sets(HEVCContext *s) { + GetBitContext *gb = &s->HEVClc->gb; + int num_sps_ids_minus1; + int i; + + get_bits(gb, 4); // active_video_parameter_set_id + get_bits(gb, 1); // self_contained_cvs_flag + get_bits(gb, 1); // num_sps_ids_minus1 + num_sps_ids_minus1 = get_ue_golomb_long(gb); // num_sps_ids_minus1 + + s->active_seq_parameter_set_id = get_ue_golomb_long(gb); + + for (i = 1; i <= num_sps_ids_minus1; i++) + get_ue_golomb_long(gb); // active_seq_parameter_set_id[i] +} + static int decode_nal_sei_message(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; @@ -96,13 +136,25 @@ static int decode_nal_sei_message(HEVCContext *s) payload_size += byte; } if (s->nal_unit_type == NAL_SEI_PREFIX) { - if (payload_type == 256 /*&& s->decode_checksum_sei*/) + if (payload_type == 256 /*&& s->decode_checksum_sei*/) { decode_nal_sei_decoded_picture_hash(s, payload_size); - else if (payload_type == 45) - decode_nal_sei_frame_packing_arrangement(s->HEVClc); - else { + return 1; + } else if (payload_type == 45) { + decode_nal_sei_frame_packing_arrangement(s); + return 1; + } else if (payload_type == 1){ + int ret = decode_pic_timing(s); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); skip_bits(gb, 8*payload_size); + return ret; + } else if (payload_type == 129){ + active_parameter_sets(s); + av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); + return 1; + } else { + av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); + skip_bits(gb, 8*payload_size); + return 1; } } else { /* nal_unit_type == NAL_SEI_SUFFIX */ if (payload_type == 132 /* && s->decode_checksum_sei */) @@ -111,8 +163,8 @@ static int decode_nal_sei_message(HEVCContext *s) av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type); skip_bits(gb, 8*payload_size); } + return 1; } - return 0; } static int more_rbsp_data(GetBitContext *gb) @@ -122,8 +174,12 @@ static int more_rbsp_data(GetBitContext *gb) int ff_hevc_decode_nal_sei(HEVCContext *s) { + int ret; + do { - decode_nal_sei_message(s); + ret = decode_nal_sei_message(s); + if (ret < 0) + return(AVERROR(ENOMEM)); } while (more_rbsp_data(&s->HEVClc->gb)); - return 0; + return 1; }

1 0

avformat/thp: force moving forward
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 02:26:07 2013 +0100| [6c4b87d3d6ae08a6da16b4616626b4d2a726afbf] | committer: Michael Niedermayer avformat/thp: force moving forward Fixes infinite loop Fixes Ticket3098 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c4b87d3d6ae08a6d… --- libavformat/thp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/thp.c b/libavformat/thp.c index 09979ac..568807d 100644 --- a/libavformat/thp.c +++ b/libavformat/thp.c @@ -158,7 +158,7 @@ static int thp_read_packet(AVFormatContext *s, avio_seek(pb, thp->next_frame, SEEK_SET); /* Locate the next frame and read out its size. */ - thp->next_frame += thp->next_framesz; + thp->next_frame += FFMAX(thp->next_framesz, 1); thp->next_framesz = avio_rb32(pb); avio_rb32(pb); /* Previous total size. */

1 0

avformat/thp: fix variable types to avoid overflows
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 02:19:40 2013 +0100| [2b1056e4e27b046af3777e8bd65a5145abff878f] | committer: Michael Niedermayer avformat/thp: fix variable types to avoid overflows Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b1056e4e27b046af… --- libavformat/thp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/thp.c b/libavformat/thp.c index 3717b8f..09979ac 100644 --- a/libavformat/thp.c +++ b/libavformat/thp.c @@ -26,15 +26,15 @@ typedef struct ThpDemuxContext { int version; - int first_frame; - int first_framesz; - int last_frame; + unsigned first_frame; + unsigned first_framesz; + unsigned last_frame; int compoff; - int framecnt; + unsigned framecnt; AVRational fps; - int frame; - int next_frame; - int next_framesz; + unsigned frame; + int64_t next_frame; + unsigned next_framesz; int video_stream_index; int audio_stream_index; int compcount;

1 0

avformat/http: fix cookies
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 01:42:13 2013 +0100| [d8be5bda1b96e9cf3e14f7940105c954543ca905] | committer: Carl Eugen Hoyos avformat/http: fix cookies Fixes Ticket3096 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8be5bda1b96e9cf3… --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index c5b5c53..9be1181 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -95,7 +95,7 @@ static const AVOption options[] = { {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E }, {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, -{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, +{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D }, {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },

1 0

avformat/http: fix cookies
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Oct 31 01:42:13 2013 +0100| [b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198] | committer: Michael Niedermayer avformat/http: fix cookies Fixes Ticket3096 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b73900b8a6c0a23e6… --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index c5b5c53..9be1181 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -95,7 +95,7 @@ static const AVOption options[] = { {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E }, {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, -{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, +{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D }, {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },

1 0

avcodec/bink: fix seeking to frame 0
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 23:56:52 2013 +0100| [1cd5797f8ec814a4ef8945a455837bcee0e29a62] | committer: Carl Eugen Hoyos avcodec/bink: fix seeking to frame 0 Fixes Ticket3088 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cd5797f8ec814a4e… --- libavcodec/bink.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 8878694..8f8a036 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -120,6 +120,7 @@ typedef struct BinkContext { int version; ///< internal Bink file version int has_alpha; int swap_planes; + unsigned frame_num; Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types Tree col_high[16]; ///< trees for decoding high nibble in "colours" data type @@ -1206,6 +1207,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (c->version >= 'i') skip_bits_long(&gb, 32); + c->frame_num++; + for (plane = 0; plane < 3; plane++) { plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3); @@ -1214,7 +1217,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return ret; } else { if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx, - !avctx->frame_number, !!plane)) < 0) + c->frame_num == 1, !!plane)) < 0) return ret; } if (get_bits_count(&gb) >= bits_count) @@ -1332,6 +1335,13 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } +static void flush(AVCodecContext *avctx) +{ + BinkContext * const c = avctx->priv_data; + + c->frame_num = 0; +} + AVCodec ff_bink_decoder = { .name = "binkvideo", .long_name = NULL_IF_CONFIG_SMALL("Bink video"), @@ -1341,5 +1351,6 @@ AVCodec ff_bink_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, + .flush = flush, .capabilities = CODEC_CAP_DR1, };

1 0

avcodec/bink: fix seeking to frame 0
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 23:56:52 2013 +0100| [beb28bc55dc73ae18e6a51e6f8f06ea0399da3e7] | committer: Carl Eugen Hoyos avcodec/bink: fix seeking to frame 0 Fixes Ticket3088 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e) Conflicts: libavcodec/bink.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=beb28bc55dc73ae18… --- libavcodec/bink.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index ce8dcb0..dd53a1d 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -120,6 +120,7 @@ typedef struct BinkContext { int version; ///< internal Bink file version int has_alpha; int swap_planes; + unsigned frame_num; Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types Tree col_high[16]; ///< trees for decoding high nibble in "colours" data type @@ -1206,6 +1207,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (c->version >= 'i') skip_bits_long(&gb, 32); + c->frame_num++; + for (plane = 0; plane < 3; plane++) { plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3); @@ -1214,7 +1217,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return ret; } else { if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx, - !avctx->frame_number, !!plane)) < 0) + c->frame_num == 1, !!plane)) < 0) return ret; } if (get_bits_count(&gb) >= bits_count) @@ -1332,6 +1335,13 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } +static void flush(AVCodecContext *avctx) +{ + BinkContext * const c = avctx->priv_data; + + c->frame_num = 0; +} + AVCodec ff_bink_decoder = { .name = "binkvideo", .type = AVMEDIA_TYPE_VIDEO, @@ -1341,5 +1351,6 @@ AVCodec ff_bink_decoder = { .close = decode_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Bink video"), + .flush = flush, .capabilities = CODEC_CAP_DR1, };

1 0

avcodec/bink: fix seeking to frame 0
by git＠videolan.org 31 Oct '13

31 Oct '13

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 23:56:52 2013 +0100| [fd8af75109913d09fb6673f4aa189b4bf49bede9] | committer: Carl Eugen Hoyos avcodec/bink: fix seeking to frame 0 Fixes Ticket3088 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e) Conflicts: libavcodec/bink.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd8af75109913d09f… --- libavcodec/bink.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 5d000a8..fcaa863 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -117,6 +117,7 @@ typedef struct BinkContext { int version; ///< internal Bink file version int has_alpha; int swap_planes; + unsigned frame_num; Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types Tree col_high[16]; ///< trees for decoding high nibble in "colours" data type @@ -1207,6 +1208,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (c->version >= 'i') skip_bits_long(&gb, 32); + c->frame_num++; + for (plane = 0; plane < 3; plane++) { plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3); @@ -1215,7 +1218,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return ret; } else { if ((ret = binkb_decode_plane(c, &gb, plane_idx, - !avctx->frame_number, !!plane)) < 0) + c->frame_num == 1, !!plane)) < 0) return ret; } if (get_bits_count(&gb) >= bits_count) @@ -1339,6 +1342,13 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } +static void flush(AVCodecContext *avctx) +{ + BinkContext * const c = avctx->priv_data; + + c->frame_num = 0; +} + AVCodec ff_bink_decoder = { .name = "binkvideo", .type = AVMEDIA_TYPE_VIDEO, @@ -1348,5 +1358,6 @@ AVCodec ff_bink_decoder = { .close = decode_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Bink video"), + .flush = flush, .capabilities = CODEC_CAP_DR1, };

1 0

avcodec/bink: fix seeking to frame 0
by git＠videolan.org 30 Oct '13

30 Oct '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 30 23:56:52 2013 +0100| [cb52d6da0a9c88c584a38a9a7a94825565854b7e] | committer: Michael Niedermayer avcodec/bink: fix seeking to frame 0 Fixes Ticket3088 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb52d6da0a9c88c58… --- libavcodec/bink.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 8878694..8f8a036 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -120,6 +120,7 @@ typedef struct BinkContext { int version; ///< internal Bink file version int has_alpha; int swap_planes; + unsigned frame_num; Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types Tree col_high[16]; ///< trees for decoding high nibble in "colours" data type @@ -1206,6 +1207,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (c->version >= 'i') skip_bits_long(&gb, 32); + c->frame_num++; + for (plane = 0; plane < 3; plane++) { plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3); @@ -1214,7 +1217,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return ret; } else { if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx, - !avctx->frame_number, !!plane)) < 0) + c->frame_num == 1, !!plane)) < 0) return ret; } if (get_bits_count(&gb) >= bits_count) @@ -1332,6 +1335,13 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } +static void flush(AVCodecContext *avctx) +{ + BinkContext * const c = avctx->priv_data; + + c->frame_num = 0; +} + AVCodec ff_bink_decoder = { .name = "binkvideo", .long_name = NULL_IF_CONFIG_SMALL("Bink video"), @@ -1341,5 +1351,6 @@ AVCodec ff_bink_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, + .flush = flush, .capabilities = CODEC_CAP_DR1, };

1 0