diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 05:42:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 05:42:56 +0400 |
commit | ec5499d8bac82007bfc966fb1a7b8233375723cf (patch) | |
tree | be754102ba76fd022b9d30463f06a4131177412b /libavcodec/mpeg4videodec.c | |
parent | b239f3f69d1c10a7d12354a9038c5b109661324e (diff) | |
parent | e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb (diff) |
Merge commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb'
* commit 'e2ceb17642f374a7df8f1f5d3d2b2446525bc7fb':
mpeg4videodec: move mpeg4-specific post-frame-decode code from h264dec to mpeg4videodec
Conflicts:
libavcodec/h263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
-rw-r--r-- | libavcodec/mpeg4videodec.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 1155163c1e..def22f5a89 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2624,6 +2624,48 @@ av_cold void ff_mpeg4videodec_static_init(void) { } } +int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size) +{ + Mpeg4DecContext *ctx = avctx->priv_data; + MpegEncContext *s = &ctx->m; + + /* divx 5.01+ bitstream reorder stuff */ + /* Since this clobbers the input buffer and hwaccel codecs still need the + * data during hwaccel->end_frame we should not do this any earlier */ + if (s->divx_packed) { + int current_pos = s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb) >> 3); + int startcode_found = 0; + + if (buf_size - current_pos > 7) { + + int i; + for (i = current_pos; i < buf_size - 4; i++) + + if (buf[i] == 0 && + buf[i + 1] == 0 && + buf[i + 2] == 1 && + buf[i + 3] == 0xB6) { + startcode_found = !(buf[i + 4] & 0x40); + break; + } + } + + if (startcode_found) { + av_fast_malloc(&s->bitstream_buffer, + &s->allocated_bitstream_buffer_size, + buf_size - current_pos + + FF_INPUT_BUFFER_PADDING_SIZE); + if (!s->bitstream_buffer) + return AVERROR(ENOMEM); + memcpy(s->bitstream_buffer, buf + current_pos, + buf_size - current_pos); + s->bitstream_buffer_size = buf_size - current_pos; + } + } + + return 0; +} + static int mpeg4_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { |