diff options
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 173 |
1 files changed, 120 insertions, 53 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index cdd5544..31ec642 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -3,20 +3,20 @@ * Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,6 +25,8 @@ * H.263 decoder. */ +#define UNCHECKED_BITSTREAM_READER 1 + #include "libavutil/cpu.h" #include "avcodec.h" #include "error_resilience.h" @@ -38,6 +40,7 @@ #include "mpegvideo.h" #include "msmpeg4.h" #include "qpeldsp.h" +#include "vdpau_internal.h" #include "thread.h" av_cold int ff_h263_decode_init(AVCodecContext *avctx) @@ -65,6 +68,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) /* select sub codec */ switch (avctx->codec->id) { case AV_CODEC_ID_H263: + case AV_CODEC_ID_H263P: s->unrestricted_mv = 0; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; break; @@ -111,8 +115,12 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) } s->codec_id = avctx->codec->id; + if (avctx->stream_codec_tag == AV_RL32("l263") && avctx->extradata_size == 56 && avctx->extradata[0] == 1) + s->ehc_mode = 1; + /* for h263, we allocate the images after having read the header */ if (avctx->codec->id != AV_CODEC_ID_H263 && + avctx->codec->id != AV_CODEC_ID_H263P && avctx->codec->id != AV_CODEC_ID_MPEG4) if ((ret = ff_MPV_common_init(s)) < 0) return ret; @@ -165,7 +173,7 @@ static int decode_slice(MpegEncContext *s) { const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR) : 0x7F; - const int mb_size = 16; + const int mb_size = 16 >> s->avctx->lowres; int ret; s->last_resync_gb = s->gb; @@ -177,10 +185,10 @@ static int decode_slice(MpegEncContext *s) if (s->avctx->hwaccel) { const uint8_t *start = s->gb.buffer + get_bits_count(&s->gb) / 8; - const uint8_t *end = ff_h263_find_resync_marker(start + 1, - s->gb.buffer_end); - skip_bits_long(&s->gb, 8 * (end - start)); - return s->avctx->hwaccel->decode_slice(s->avctx, start, end - start); + ret = s->avctx->hwaccel->decode_slice(s->avctx, start, s->gb.buffer_end - start); + // ensure we exit decode loop + s->mb_y = s->mb_height; + return ret; } if (s->partitioned_frame) { @@ -229,6 +237,8 @@ static int decode_slice(MpegEncContext *s) s->mv_type = MV_TYPE_16X16; av_dlog(s, "%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24)); + + tprintf(NULL, "Decoding MB at %dx%d\n", s->mb_x, s->mb_y); ret = s->decode_mb(s, s->block); if (s->pict_type != AV_PICTURE_TYPE_B) @@ -265,6 +275,8 @@ static int decode_slice(MpegEncContext *s) ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR & part_mask); + if (s->err_recognition & AV_EF_IGNORE_ERR) + continue; return AVERROR_INVALIDDATA; } @@ -279,7 +291,7 @@ static int decode_slice(MpegEncContext *s) s->mb_x = 0; } - assert(s->mb_x == 0 && s->mb_y == s->mb_height); + av_assert1(s->mb_x == 0 && s->mb_y == s->mb_height); if (s->codec_id == AV_CODEC_ID_MPEG4 && (s->workaround_bugs & FF_BUG_AUTODETECT) && @@ -292,7 +304,7 @@ static int decode_slice(MpegEncContext *s) if (s->codec_id == AV_CODEC_ID_MPEG4 && (s->workaround_bugs & FF_BUG_AUTODETECT) && get_bits_left(&s->gb) >= 0 && - get_bits_left(&s->gb) < 48 && + get_bits_left(&s->gb) < 137 && !s->data_partitioning) { const int bits_count = get_bits_count(&s->gb); const int bits_left = s->gb.size_in_bits - bits_count; @@ -313,6 +325,17 @@ static int decode_slice(MpegEncContext *s) } } + if (s->codec_id == AV_CODEC_ID_H263 && + (s->workaround_bugs & FF_BUG_AUTODETECT) && + get_bits_left(&s->gb) >= 8 && + get_bits_left(&s->gb) < 300 && + s->pict_type == AV_PICTURE_TYPE_I && + show_bits(&s->gb, 8) == 0 && + !s->data_partitioning) { + + s->padding_bug_score += 32; + } + if (s->workaround_bugs & FF_BUG_AUTODETECT) { if (s->padding_bug_score > -2 && !s->data_partitioning) s->workaround_bugs |= FF_BUG_NO_PADDING; @@ -332,7 +355,7 @@ static int decode_slice(MpegEncContext *s) /* buggy padding but the frame should still end approximately at * the bitstream end */ if ((s->workaround_bugs & FF_BUG_NO_PADDING) && - (s->err_recognition & AV_EF_BUFFER)) + (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) max_extra += 48; else if ((s->workaround_bugs & FF_BUG_NO_PADDING)) max_extra += 256 * 256 * 256 * 64; @@ -367,6 +390,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int buf_size = avpkt->size; MpegEncContext *s = avctx->priv_data; int ret; + int slice_ret = 0; AVFrame *pict = data; s->flags = avctx->flags; @@ -393,6 +417,8 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, next = ff_mpeg4_find_frame_end(&s->parse_context, buf, buf_size); } else if (CONFIG_H263_DECODER && s->codec_id == AV_CODEC_ID_H263) { next = ff_h263_find_frame_end(&s->parse_context, buf, buf_size); + } else if (CONFIG_H263P_DECODER && s->codec_id == AV_CODEC_ID_H263P) { + next = ff_h263_find_frame_end(&s->parse_context, buf, buf_size); } else { av_log(s->avctx, AV_LOG_ERROR, "this codec does not support truncated bitstreams\n"); @@ -404,13 +430,27 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return buf_size; } +retry: + if (s->divx_packed && s->bitstream_buffer_size) { + int i; + for(i=0; i < buf_size-3; i++) { + if (buf[i]==0 && buf[i+1]==0 && buf[i+2]==1) { + if (buf[i+3]==0xB0) { + av_log(s->avctx, AV_LOG_WARNING, "Discarding excessive bitstream in packed xvid\n"); + s->bitstream_buffer_size = 0; + } + break; + } + } + } + if (s->bitstream_buffer_size && (s->divx_packed || buf_size < 20)) // divx 5.01+/xvid frame reorder ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); else ret = init_get_bits8(&s->gb, buf, buf_size); - s->bitstream_buffer_size = 0; + s->bitstream_buffer_size = 0; if (ret < 0) return ret; @@ -437,11 +477,8 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (s->avctx->extradata_size && s->picture_number == 0) { GetBitContext gb; - ret = init_get_bits8(&gb, s->avctx->extradata, - s->avctx->extradata_size); - if (ret < 0) - return ret; - ff_mpeg4_decode_picture_header(avctx->priv_data, &gb); + if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) + ff_mpeg4_decode_picture_header(avctx->priv_data, &gb); } ret = ff_mpeg4_decode_picture_header(avctx->priv_data, &s->gb); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { @@ -452,6 +489,14 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ret = ff_h263_decode_picture_header(s); } + if (ret < 0 || ret == FRAME_SKIPPED) { + if ( s->width != avctx->coded_width + || s->height != avctx->coded_height) { + av_log(s->avctx, AV_LOG_WARNING, "Reverting picture dimensions change due to header decoding failure\n"); + s->width = avctx->coded_width; + s->height= avctx->coded_height; + } + } if (ret == FRAME_SKIPPED) return get_consumed_bytes(s, buf_size); @@ -463,25 +508,9 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, avctx->has_b_frames = !s->low_delay; -#define SET_QPEL_FUNC(postfix1, postfix2) \ - s->qdsp.put_ ## postfix1 = ff_put_ ## postfix2; \ - s->qdsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2; \ - s->qdsp.avg_ ## postfix1 = ff_avg_ ## postfix2; - - if (s->workaround_bugs & FF_BUG_STD_QPEL) { - SET_QPEL_FUNC(qpel_pixels_tab[0][5], qpel16_mc11_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[0][7], qpel16_mc31_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[0][9], qpel16_mc12_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c) - - SET_QPEL_FUNC(qpel_pixels_tab[1][5], qpel8_mc11_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[1][7], qpel8_mc31_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[1][9], qpel8_mc12_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c) - SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c) + if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { + if (ff_mpeg4_workaround_bugs(avctx) == 1) + goto retry; } /* After H263 & mpeg4 header decode we have the height, width, @@ -545,6 +574,11 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (!s->divx_packed && !avctx->hwaccel) ff_thread_finish_setup(avctx); + if (CONFIG_MPEG4_VDPAU_DECODER && (s->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)) { + ff_vdpau_mpeg4_decode_picture(avctx->priv_data, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); + goto frame_end; + } + if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); @@ -562,14 +596,14 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (ret < 0) return ret; if (ret == 1) - goto intrax8_decoded; + goto frame_end; } /* decode each macroblock */ s->mb_x = 0; s->mb_y = 0; - ret = decode_slice(s); + slice_ret = decode_slice(s); while (s->mb_y < s->mb_height) { if (s->msmpeg4_version) { if (s->slice_height == 0 || s->mb_x != 0 || @@ -587,7 +621,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ff_mpeg4_clean_buffers(s); if (decode_slice(s) < 0) - ret = AVERROR_INVALIDDATA; + slice_ret = AVERROR_INVALIDDATA; } if (s->msmpeg4_version && s->msmpeg4_version < 4 && @@ -596,12 +630,8 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ff_msmpeg4_decode_ext_header(s, buf_size) < 0) s->er.error_status_table[s->mb_num - 1] = ER_MB_ERROR; - assert(s->bitstream_buffer_size == 0); - - if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) - ff_mpeg4_frame_end(avctx, buf, buf_size); - -intrax8_decoded: + av_assert1(s->bitstream_buffer_size == 0); +frame_end: ff_er_frame_end(&s->er); if (avctx->hwaccel) { @@ -612,26 +642,46 @@ intrax8_decoded: ff_MPV_frame_end(s); + if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) + ff_mpeg4_frame_end(avctx, buf, buf_size); + if (!s->divx_packed && avctx->hwaccel) ff_thread_finish_setup(avctx); - assert(s->current_picture.f->pict_type == - s->current_picture_ptr->f->pict_type); - assert(s->current_picture.f->pict_type == s->pict_type); + av_assert1(s->current_picture.f->pict_type == s->current_picture_ptr->f->pict_type); + av_assert1(s->current_picture.f->pict_type == s->pict_type); if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; - ff_print_debug_info(s, s->current_picture_ptr); + ff_print_debug_info(s, s->current_picture_ptr, pict); + ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); } else if (s->last_picture_ptr != NULL) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; - ff_print_debug_info(s, s->last_picture_ptr); + ff_print_debug_info(s, s->last_picture_ptr, pict); + ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1); } - if (s->last_picture_ptr || s->low_delay) + if (s->last_picture_ptr || s->low_delay) { + if ( pict->format == AV_PIX_FMT_YUV420P + && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) { + int x, y, p; + av_frame_make_writable(pict); + for (p=0; p<3; p++) { + int w = FF_CEIL_RSHIFT(pict-> width, !!p); + int h = FF_CEIL_RSHIFT(pict->height, !!p); + int linesize = pict->linesize[p]; + for (y=0; y<(h>>1); y++) + for (x=0; x<w; x++) + FFSWAP(int, + pict->data[p][x + y*linesize], + pict->data[p][x + (h-1-y)*linesize]); + } + } *got_frame = 1; + } - if (ret && (avctx->err_recognition & AV_EF_EXPLODE)) + if (slice_ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; else return get_consumed_bytes(s, buf_size); @@ -660,5 +710,22 @@ AVCodec ff_h263_decoder = { .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, + .max_lowres = 3, + .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, +}; + +AVCodec ff_h263p_decoder = { + .name = "h263p", + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_H263P, + .priv_data_size = sizeof(MpegEncContext), + .init = ff_h263_decode_init, + .close = ff_h263_decode_end, + .decode = ff_h263_decode_frame, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, + .flush = ff_mpeg_flush, + .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, }; |
