Module: libav Branch: release/9 Commit: 5bd767d7ad45598673a768df5447fac38679aaf7
Author: Anton Khirnov <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Sat Feb 2 15:18:00 2013 +0100 h264: simplify calls to ff_er_add_slice(). partitioned_frame is never set for h264 (as easily seen from git grep). (cherry picked from commit 68f930d2188aba5b32624887dcbf688c23482834) Signed-off-by: Jean-Yves Avenard <[email protected]> Signed-off-by: Diego Biurrun <[email protected]> --- libavcodec/h264.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index fab23a5..a9d484d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3656,8 +3656,6 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) { H264Context *h = *(void **)arg; MpegEncContext *const s = &h->s; - const int part_mask = s->partitioned_frame ? (ER_AC_END | ER_AC_ERROR) - : 0x7F; int lf_x_start = s->mb_x; s->mb_skip_run = -1; @@ -3702,7 +3700,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if ((s->workaround_bugs & FF_BUG_TRUNCATED) && h->cabac.bytestream > h->cabac.bytestream_end + 2) { ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, - s->mb_y, ER_MB_END & part_mask); + s->mb_y, ER_MB_END); if (s->mb_x >= lf_x_start) loop_filter(h, lf_x_start, s->mb_x + 1); return 0; @@ -3713,7 +3711,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, - s->mb_y, ER_MB_ERROR & part_mask); + s->mb_y, ER_MB_ERROR); return -1; } @@ -3733,7 +3731,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, - s->mb_y, ER_MB_END & part_mask); + s->mb_y, ER_MB_END); if (s->mb_x > lf_x_start) loop_filter(h, lf_x_start, s->mb_x); return 0; @@ -3760,7 +3758,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, - s->mb_y, ER_MB_ERROR & part_mask); + s->mb_y, ER_MB_ERROR); return -1; } @@ -3781,13 +3779,13 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (get_bits_left(&s->gb) == 0) { ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, s->mb_y, - ER_MB_END & part_mask); + ER_MB_END); return 0; } else { ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, s->mb_y, - ER_MB_END & part_mask); + ER_MB_END); return -1; } @@ -3800,14 +3798,14 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (get_bits_left(&s->gb) == 0) { ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x - 1, s->mb_y, - ER_MB_END & part_mask); + ER_MB_END); if (s->mb_x > lf_x_start) loop_filter(h, lf_x_start, s->mb_x); return 0; } else { ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, - s->mb_y, ER_MB_ERROR & part_mask); + s->mb_y, ER_MB_ERROR); return -1; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
