RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-07 07:13:20 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/bink: fix seeking to frame 0

Browse Source 
Fixes Ticket3088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-30 23:56:52 +01:00
parent cc0e47b550
commit cb52d6da0a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/bink.c
View File

@ -120,6 +120,7 @@ typedef struct BinkContext {
int version; ///< internal Bink file version int version; ///< internal Bink file version
int has_alpha; int has_alpha;
int swap_planes; int swap_planes;
unsigned frame_num;
Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types Bundle bundle[BINKB_NB_SRC]; ///< bundles for decoding all data types
Tree col_high[16]; ///< trees for decoding high nibble in "colours" data type 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') if (c->version >= 'i')
skip_bits_long(&gb, 32); skip_bits_long(&gb, 32);
c->frame_num++;
for (plane = 0; plane < 3; plane++) { for (plane = 0; plane < 3; plane++) {
plane_idx = (!plane || !c->swap_planes) ? plane : (plane ^ 3); 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; return ret;
} else { } else {
if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx, if ((ret = binkb_decode_plane(c, frame, &gb, plane_idx,
!avctx->frame_number, !!plane)) < 0) c->frame_num == 1, !!plane)) < 0)
return ret; return ret;
} }
if (get_bits_count(&gb) >= bits_count) if (get_bits_count(&gb) >= bits_count)
@ -1332,6 +1335,13 @@ static av_cold int decode_end(AVCodecContext *avctx)
return 0; return 0;
} }
static void flush(AVCodecContext *avctx)
{
BinkContext * const c = avctx->priv_data;
c->frame_num = 0;
}
AVCodec ff_bink_decoder = { AVCodec ff_bink_decoder = {
.name = "binkvideo", .name = "binkvideo",
.long_name = NULL_IF_CONFIG_SMALL("Bink video"), .long_name = NULL_IF_CONFIG_SMALL("Bink video"),
@ -1341,5 +1351,6 @@ AVCodec ff_bink_decoder = {
.init = decode_init, .init = decode_init,
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.flush = flush,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
}; };