diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-04-23 11:53:57 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2017-04-25 00:29:37 +0200 |
| commit | da693f8daa62cb76a2aa05021d6c8d53a1b816b2 (patch) | |
| tree | ebf110929e029b6f83f4f68155bdc83044a9955c | |
| parent | ed2ed4ac0f05c4139a3149cb59bf1717c797a620 (diff) | |
| download | ffmpeg-da693f8daa62cb76a2aa05021d6c8d53a1b816b2.tar.gz | |
avcodec/dnxhd_parser: fix parsing interlaced video, simplify code
There appears to be no need to treat interlaced videos differently,
also that code is flawed, as for at least one input cur_field would
be always 0.
Fixes ticket #6344.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit ac30754a148df58822a272555d1f6f860e42037e)
| -rw-r--r-- | libavcodec/dnxhd_parser.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 4f9bbceeeb..a1f632a620 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -29,8 +29,6 @@ typedef struct { ParseContext pc; - int interlaced; - int cur_field; /* first field is 0, second is 1 */ int cur_byte; int remaining; int w, h; @@ -56,8 +54,6 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, uint64_t state = pc->state64; int pic_found = pc->frame_start_found; int i = 0; - int interlaced = dctx->interlaced; - int cur_field = dctx->cur_field; if (!pic_found) { for (i = 0; i < buf_size; i++) { @@ -65,8 +61,6 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (ff_dnxhd_check_header_prefix(state & 0xffffffffff00LL) != 0) { i++; pic_found = 1; - interlaced = (state&2)>>1; /* byte following the 5-byte header prefix */ - cur_field = state&1; dctx->cur_byte = 0; dctx->remaining = 0; break; @@ -97,13 +91,11 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (dctx->remaining <= 0) return dctx->remaining; } - if (buf_size - i >= dctx->remaining && (!dctx->interlaced || dctx->cur_field)) { + if (buf_size - i + 47 >= dctx->remaining) { int remaining = dctx->remaining; pc->frame_start_found = 0; pc->state64 = -1; - dctx->interlaced = interlaced; - dctx->cur_field = 0; dctx->cur_byte = 0; dctx->remaining = 0; return remaining; @@ -120,8 +112,6 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, pc->frame_start_found = 0; pc->state64 = -1; - dctx->interlaced = interlaced; - dctx->cur_field = 0; dctx->cur_byte = 0; dctx->remaining = 0; return remaining; @@ -129,8 +119,6 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, } pc->frame_start_found = pic_found; pc->state64 = state; - dctx->interlaced = interlaced; - dctx->cur_field = cur_field; return END_NOT_FOUND; } |