From a91d3658d9a73db120e49219c9c2b6a9470b1c9f Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 4 Feb 2014 13:57:54 +0000 Subject: mpeg: K&R formatting cosmetics Also adjust header #include order and some comments. Signed-off-by: Diego Biurrun Signed-off-by: Vittorio Giovara --- libavcodec/mpeg12dec.c | 801 ++++++++++++++++++++++++++++--------------------- 1 file changed, 456 insertions(+), 345 deletions(-) (limited to 'libavcodec/mpeg12dec.c') diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index f0e390d790..149d5f49ef 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -28,31 +28,32 @@ #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/stereo3d.h" -#include "internal.h" + #include "avcodec.h" +#include "bytestream.h" #include "dsputil.h" -#include "mpegvideo.h" #include "error_resilience.h" +#include "internal.h" #include "mpeg12.h" #include "mpeg12data.h" -#include "bytestream.h" -#include "xvmc_internal.h" +#include "mpegvideo.h" #include "thread.h" #include "version.h" +#include "xvmc_internal.h" typedef struct Mpeg1Context { MpegEncContext mpeg_enc_ctx; int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ - int repeat_field; /* true if we must repeat the field */ - AVPanScan pan_scan; /**< some temporary storage for the panscan */ + int repeat_field; /* true if we must repeat the field */ + AVPanScan pan_scan; /* some temporary storage for the panscan */ uint8_t *a53_caption; int a53_caption_size; int slice_count; int save_aspect_info; int save_width, save_height, save_progressive_seq; - AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator - int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame? - int closed_gop; ///< GOP is closed + AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ + int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ + int closed_gop; /* GOP is closed */ int first_slice; int extradata_decoded; } Mpeg1Context; @@ -84,10 +85,10 @@ static const uint32_t btype2mb_type[11] = { }; static const uint8_t non_linear_qscale[32] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8,10,12,14,16,18,20,22, - 24,28,32,36,40,44,48,52, - 56,64,72,80,88,96,104,112, + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 10, 12, 14, 16, 18, 20, 22, + 24, 28, 32, 36, 40, 44, 48, 52, + 56, 64, 72, 80, 88, 96, 104, 112, }; /* as H.263, but only 17 codes */ @@ -96,12 +97,10 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) int code, sign, val, shift; code = get_vlc2(&s->gb, ff_mv_vlc.table, MV_VLC_BITS, 2); - if (code == 0) { + if (code == 0) return pred; - } - if (code < 0) { + if (code < 0) return 0xffff; - } sign = get_bits1(&s->gb); shift = fcode - 1; @@ -119,21 +118,22 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) return sign_extend(val, 5 + shift); } -#define check_scantable_index(ctx, x) \ - do { \ - if ((x) > 63) { \ - av_log(ctx->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", \ - ctx->mb_x, ctx->mb_y); \ - return AVERROR_INVALIDDATA; \ - } \ - } while (0) \ - -static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n) +#define check_scantable_index(ctx, x) \ + do { \ + if ((x) > 63) { \ + av_log(ctx->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", \ + ctx->mb_x, ctx->mb_y); \ + return AVERROR_INVALIDDATA; \ + } \ + } while (0) + +static inline int mpeg1_decode_block_intra(MpegEncContext *s, + int16_t *block, int n) { int level, dc, diff, i, j, run; int component; - RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = s->intra_scantable.permutated; + RLTable *rl = &ff_rl_mpeg1; + uint8_t *const scantable = s->intra_scantable.permutated; const uint16_t *quant_matrix = s->intra_matrix; const int qscale = s->qscale; @@ -153,7 +153,8 @@ static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, in /* now quantify & encode AC coefficients */ for (;;) { UPDATE_CACHE(re, &s->gb); - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level == 127) { break; @@ -163,17 +164,22 @@ static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, in j = scantable[i]; level = (level * qscale * quant_matrix[j]) >> 4; level = (level - 1) | 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); + level = SHOW_SBITS(re, &s->gb, 8); + SKIP_BITS(re, &s->gb, 8); if (level == -128) { - level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8) - 256; + LAST_SKIP_BITS(re, &s->gb, 8); } else if (level == 0) { - level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8); + LAST_SKIP_BITS(re, &s->gb, 8); } i += run; check_scantable_index(s, i); @@ -194,7 +200,7 @@ static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, in CLOSE_READER(re, &s->gb); } s->block_last_index[n] = i; - return 0; + return 0; } int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n) @@ -202,11 +208,12 @@ int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n) return mpeg1_decode_block_intra(s, block, n); } -static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, int n) +static inline int mpeg1_decode_block_inter(MpegEncContext *s, + int16_t *block, int n) { int level, i, j, run; - RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = s->intra_scantable.permutated; + RLTable *rl = &ff_rl_mpeg1; + uint8_t *const scantable = s->intra_scantable.permutated; const uint16_t *quant_matrix = s->inter_matrix; const int qscale = s->qscale; @@ -215,7 +222,7 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, in i = -1; // special case for first coefficient, no need to add second VLC table UPDATE_CACHE(re, &s->gb); - if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { + if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { level = (3 * qscale * quant_matrix[0]) >> 5; level = (level - 1) | 1; if (GET_CACHE(re, &s->gb) & 0x40000000) @@ -223,12 +230,13 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, in block[0] = level; i++; SKIP_BITS(re, &s->gb, 2); - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) goto end; } /* now quantify & encode AC coefficients */ for (;;) { - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level != 0) { i += run; @@ -236,17 +244,22 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, in j = scantable[i]; level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5; level = (level - 1) | 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); + level = SHOW_SBITS(re, &s->gb, 8); + SKIP_BITS(re, &s->gb, 8); if (level == -128) { - level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8) - 256; + SKIP_BITS(re, &s->gb, 8); } else if (level == 0) { - level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8); + SKIP_BITS(re, &s->gb, 8); } i += run; check_scantable_index(s, i); @@ -263,7 +276,7 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t *block, in } block[j] = level; - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) break; UPDATE_CACHE(re, &s->gb); } @@ -275,19 +288,20 @@ end: return 0; } -static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, int16_t *block, int n) +static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, + int16_t *block, int n) { int level, i, j, run; - RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = s->intra_scantable.permutated; - const int qscale = s->qscale; + RLTable *rl = &ff_rl_mpeg1; + uint8_t *const scantable = s->intra_scantable.permutated; + const int qscale = s->qscale; { OPEN_READER(re, &s->gb); i = -1; - // special case for first coefficient, no need to add second VLC table + // Special case for first coefficient, no need to add second VLC table. UPDATE_CACHE(re, &s->gb); - if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { + if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { level = (3 * qscale) >> 1; level = (level - 1) | 1; if (GET_CACHE(re, &s->gb) & 0x40000000) @@ -295,13 +309,14 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, int16_t *bloc block[0] = level; i++; SKIP_BITS(re, &s->gb, 2); - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) goto end; } /* now quantify & encode AC coefficients */ for (;;) { - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level != 0) { i += run; @@ -309,17 +324,22 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, int16_t *bloc j = scantable[i]; level = ((level * 2 + 1) * qscale) >> 1; level = (level - 1) | 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8); + level = SHOW_SBITS(re, &s->gb, 8); + SKIP_BITS(re, &s->gb, 8); if (level == -128) { - level = SHOW_UBITS(re, &s->gb, 8) - 256; SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8) - 256; + SKIP_BITS(re, &s->gb, 8); } else if (level == 0) { - level = SHOW_UBITS(re, &s->gb, 8) ; SKIP_BITS(re, &s->gb, 8); + level = SHOW_UBITS(re, &s->gb, 8); + SKIP_BITS(re, &s->gb, 8); } i += run; check_scantable_index(s, i); @@ -336,7 +356,7 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, int16_t *bloc } block[j] = level; - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) break; UPDATE_CACHE(re, &s->gb); } @@ -348,12 +368,12 @@ end: return 0; } - -static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, int16_t *block, int n) +static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, + int16_t *block, int n) { int level, i, j, run; RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = s->intra_scantable.permutated; + uint8_t *const scantable = s->intra_scantable.permutated; const uint16_t *quant_matrix; const int qscale = s->qscale; int mismatch; @@ -368,36 +388,40 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, int16_t *block else quant_matrix = s->chroma_inter_matrix; - // special case for first coefficient, no need to add second VLC table + // Special case for first coefficient, no need to add second VLC table. UPDATE_CACHE(re, &s->gb); - if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { - level= (3 * qscale * quant_matrix[0]) >> 5; + if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { + level = (3 * qscale * quant_matrix[0]) >> 5; if (GET_CACHE(re, &s->gb) & 0x40000000) level = -level; block[0] = level; mismatch ^= level; i++; SKIP_BITS(re, &s->gb, 2); - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) goto end; } /* now quantify & encode AC coefficients */ for (;;) { - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level != 0) { i += run; check_scantable_index(s, i); j = scantable[i]; level = ((level * 2 + 1) * qscale * quant_matrix[j]) >> 5; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); + level = SHOW_SBITS(re, &s->gb, 12); + SKIP_BITS(re, &s->gb, 12); i += run; check_scantable_index(s, i); @@ -412,7 +436,7 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, int16_t *block mismatch ^= level; block[j] = level; - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) break; UPDATE_CACHE(re, &s->gb); } @@ -430,22 +454,22 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, int16_t *block, int n) { int level, i, j, run; - RLTable *rl = &ff_rl_mpeg1; - uint8_t * const scantable = s->intra_scantable.permutated; - const int qscale = s->qscale; + RLTable *rl = &ff_rl_mpeg1; + uint8_t *const scantable = s->intra_scantable.permutated; + const int qscale = s->qscale; OPEN_READER(re, &s->gb); i = -1; // special case for first coefficient, no need to add second VLC table UPDATE_CACHE(re, &s->gb); - if (((int32_t)GET_CACHE(re, &s->gb)) < 0) { + if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { level = (3 * qscale) >> 1; if (GET_CACHE(re, &s->gb) & 0x40000000) level = -level; block[0] = level; i++; SKIP_BITS(re, &s->gb, 2); - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) goto end; } @@ -456,19 +480,22 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, if (level != 0) { i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; level = ((level * 2 + 1) * qscale) >> 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); + level = SHOW_SBITS(re, &s->gb, 12); + SKIP_BITS(re, &s->gb, 12); i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; if (level < 0) { level = ((-level * 2 + 1) * qscale) >> 1; level = -level; @@ -478,7 +505,7 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, } block[j] = level; - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) break; UPDATE_CACHE(re, &s->gb); } @@ -489,13 +516,13 @@ end: return 0; } - -static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, int n) +static inline int mpeg2_decode_block_intra(MpegEncContext *s, + int16_t *block, int n) { int level, dc, diff, i, j, run; int component; RLTable *rl; - uint8_t * const scantable = s->intra_scantable.permutated; + uint8_t *const scantable = s->intra_scantable.permutated; const uint16_t *quant_matrix; const int qscale = s->qscale; int mismatch; @@ -503,10 +530,10 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, in /* DC coefficient */ if (n < 4) { quant_matrix = s->intra_matrix; - component = 0; + component = 0; } else { quant_matrix = s->chroma_intra_matrix; - component = (n & 1) + 1; + component = (n & 1) + 1; } diff = decode_dc(&s->gb, component); if (diff >= 0xffff) @@ -528,25 +555,29 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, in /* now quantify & encode AC coefficients */ for (;;) { UPDATE_CACHE(re, &s->gb); - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level == 127) { break; } else if (level != 0) { i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; level = (level * qscale * quant_matrix[j]) >> 4; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); + level = SHOW_SBITS(re, &s->gb, 12); + SKIP_BITS(re, &s->gb, 12); i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; if (level < 0) { level = (-level * qscale * quant_matrix[j]) >> 4; level = -level; @@ -566,22 +597,23 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, in return 0; } -static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, int16_t *block, int n) +static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, + int16_t *block, int n) { int level, dc, diff, i, j, run; int component; RLTable *rl; - uint8_t * const scantable = s->intra_scantable.permutated; + uint8_t *const scantable = s->intra_scantable.permutated; const uint16_t *quant_matrix; const int qscale = s->qscale; /* DC coefficient */ if (n < 4) { quant_matrix = s->intra_matrix; - component = 0; + component = 0; } else { quant_matrix = s->chroma_intra_matrix; - component = (n & 1) + 1; + component = (n & 1) + 1; } diff = decode_dc(&s->gb, component); if (diff >= 0xffff) @@ -601,25 +633,29 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, int16_t *bloc /* now quantify & encode AC coefficients */ for (;;) { UPDATE_CACHE(re, &s->gb); - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], + TEX_VLC_BITS, 2, 0); if (level == 127) { break; } else if (level != 0) { i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; level = (level * qscale * quant_matrix[j]) >> 4; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - + SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); } else { /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; LAST_SKIP_BITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; + LAST_SKIP_BITS(re, &s->gb, 6); UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); SKIP_BITS(re, &s->gb, 12); + level = SHOW_SBITS(re, &s->gb, 12); + SKIP_BITS(re, &s->gb, 12); i += run; check_scantable_index(s, i); - j = scantable[i]; + j = scantable[i]; if (level < 0) { level = (-level * qscale * quant_matrix[j]) >> 4; level = -level; @@ -651,11 +687,10 @@ static inline int get_dmv(MpegEncContext *s) static inline int get_qscale(MpegEncContext *s) { int qscale = get_bits(&s->gb, 5); - if (s->q_scale_type) { + if (s->q_scale_type) return non_linear_qscale[qscale]; - } else { + else return qscale << 1; - } } /* motion type (for MPEG-2) */ @@ -676,17 +711,19 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (s->mb_skip_run-- != 0) { if (s->pict_type == AV_PICTURE_TYPE_P) { s->mb_skipped = 1; - s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; + s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] = + MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; } else { int mb_type; if (s->mb_x) mb_type = s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1]; else - mb_type = s->current_picture.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1]; // FIXME not sure if this is allowed in MPEG at all + // FIXME not sure if this is allowed in MPEG at all + mb_type = s->current_picture.mb_type[s->mb_width + (s->mb_y - 1) * s->mb_stride - 1]; if (IS_INTRA(mb_type)) return -1; - s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = + s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride] = mb_type | MB_TYPE_SKIP; // assert(s->current_picture.mb_type[s->mb_x + s->mb_y * s->mb_stride - 1] & (MB_TYPE_16x16 | MB_TYPE_16x8)); @@ -702,7 +739,9 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) case AV_PICTURE_TYPE_I: if (get_bits1(&s->gb) == 0) { if (get_bits1(&s->gb) == 0) { - av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in I Frame at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "invalid mb type in I Frame at %d %d\n", + s->mb_x, s->mb_y); return -1; } mb_type = MB_TYPE_QUANT | MB_TYPE_INTRA; @@ -713,7 +752,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) case AV_PICTURE_TYPE_P: mb_type = get_vlc2(&s->gb, ff_mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); if (mb_type < 0) { - av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y); return -1; } mb_type = ptype2mb_type[mb_type]; @@ -721,7 +761,8 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) case AV_PICTURE_TYPE_B: mb_type = get_vlc2(&s->gb, ff_mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); if (mb_type < 0) { - av_log(s->avctx, AV_LOG_ERROR, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y); return -1; } mb_type = btype2mb_type[mb_type]; @@ -732,15 +773,14 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (IS_INTRA(mb_type)) { s->dsp.clear_blocks(s->block[0]); - if (!s->chroma_y_shift) { + if (!s->chroma_y_shift) s->dsp.clear_blocks(s->block[6]); - } /* compute DCT type */ - if (s->picture_structure == PICT_FRAME && // FIXME add an interlaced_dct coded var? - !s->frame_pred_frame_dct) { + // FIXME: add an interlaced_dct coded var? + if (s->picture_structure == PICT_FRAME && + !s->frame_pred_frame_dct) s->interlaced_dct = get_bits1(&s->gb); - } if (IS_QUANT(mb_type)) s->qscale = get_qscale(s); @@ -748,42 +788,44 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (s->concealment_motion_vectors) { /* just parse them */ if (s->picture_structure != PICT_FRAME) - skip_bits1(&s->gb); /* field select */ + skip_bits1(&s->gb); /* field select */ - s->mv[0][0][0]= s->last_mv[0][0][0]= s->last_mv[0][1][0] = - mpeg_decode_motion(s, s->mpeg_f_code[0][0], s->last_mv[0][0][0]); - s->mv[0][0][1]= s->last_mv[0][0][1]= s->last_mv[0][1][1] = - mpeg_decode_motion(s, s->mpeg_f_code[0][1], s->last_mv[0][0][1]); + s->mv[0][0][0] = + s->last_mv[0][0][0] = + s->last_mv[0][1][0] = mpeg_decode_motion(s, s->mpeg_f_code[0][0], + s->last_mv[0][0][0]); + s->mv[0][0][1] = + s->last_mv[0][0][1] = + s->last_mv[0][1][1] = mpeg_decode_motion(s, s->mpeg_f_code[0][1], + s->last_mv[0][0][1]); skip_bits1(&s->gb); /* marker */ - } else - memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ + } else { + /* reset mv prediction */ + memset(s->last_mv, 0, sizeof(s->last_mv)); + } s->mb_intra = 1; #if FF_API_XVMC FF_DISABLE_DEPRECATION_WARNINGS // if 1, we memcpy blocks in xvmcvideo - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) { + if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks - } FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_XVMC */ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (s->flags2 & CODEC_FLAG2_FAST) { - for (i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) mpeg2_fast_decode_block_intra(s, *s->pblocks[i], i); - } } else { - for (i = 0; i < mb_block_count; i++) { + for (i = 0; i < mb_block_count; i++) if (mpeg2_decode_block_intra(s, *s->pblocks[i], i) < 0) return -1; - } } } else { - for (i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0) return -1; - } } } else { if (mb_type & MB_TYPE_ZERO_MV) { @@ -795,8 +837,8 @@ FF_ENABLE_DEPRECATION_WARNINGS s->interlaced_dct = get_bits1(&s->gb); s->mv_type = MV_TYPE_16X16; } else { - s->mv_type = MV_TYPE_FIELD; - mb_type |= MB_TYPE_INTERLACED; + s->mv_type = MV_TYPE_FIELD; + mb_type |= MB_TYPE_INTERLACED; s->field_select[0][0] = s->picture_structure - 1; } @@ -807,15 +849,15 @@ FF_ENABLE_DEPRECATION_WARNINGS s->last_mv[0][0][1] = 0; s->last_mv[0][1][0] = 0; s->last_mv[0][1][1] = 0; - s->mv[0][0][0] = 0; - s->mv[0][0][1] = 0; + s->mv[0][0][0] = 0; + s->mv[0][0][1] = 0; } else { assert(mb_type & MB_TYPE_L0L1); // FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED /* get additional motion vector type */ - if (s->frame_pred_frame_dct) + if (s->frame_pred_frame_dct) { motion_type = MT_FRAME; - else { + } else { motion_type = get_bits(&s->gb, 2); if (s->picture_structure == PICT_FRAME && HAS_CBP(mb_type)) s->interlaced_dct = get_bits1(&s->gb); @@ -830,15 +872,21 @@ FF_ENABLE_DEPRECATION_WARNINGS switch (motion_type) { case MT_FRAME: /* or MT_16X8 */ if (s->picture_structure == PICT_FRAME) { - mb_type |= MB_TYPE_16x16; + mb_type |= MB_TYPE_16x16; s->mv_type = MV_TYPE_16X16; for (i = 0; i < 2; i++) { if (USES_LIST(mb_type, i)) { /* MT_FRAME */ - s->mv[i][0][0]= s->last_mv[i][0][0]= s->last_mv[i][1][0] = - mpeg_decode_motion(s, s->mpeg_f_code[i][0], s->last_mv[i][0][0]); - s->mv[i][0][1]= s->last_mv[i][0][1]= s->last_mv[i][1][1] = - mpeg_decode_motion(s, s->mpeg_f_code[i][1], s->last_mv[i][0][1]); + s->mv[i][0][0] = + s->last_mv[i][0][0] = + s->last_mv[i][1][0] = + mpeg_decode_motion(s, s->mpeg_f_code[i][0], + s->last_mv[i][0][0]); + s->mv[i][0][1] = + s->last_mv[i][0][1] = + s->last_mv[i][1][1] = + mpeg_decode_motion(s, s->mpeg_f_code[i][1], + s->last_mv[i][0][1]); /* full_pel: only for MPEG-1 */ if (s->full_pel[i]) { s->mv[i][0][0] <<= 1; @@ -847,7 +895,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } } else { - mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; + mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; s->mv_type = MV_TYPE_16X8; for (i = 0; i < 2; i++) { if (USES_LIST(mb_type, i)) { @@ -953,7 +1001,8 @@ FF_ENABLE_DEPRECATION_WARNINGS } break; default: - av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "00 motion_type at %d %d\n", s->mb_x, s->mb_y); return -1; } } @@ -964,36 +1013,35 @@ FF_ENABLE_DEPRECATION_WARNINGS cbp = get_vlc2(&s->gb, ff_mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); if (mb_block_count > 6) { - cbp <<= mb_block_count - 6; - cbp |= get_bits(&s->gb, mb_block_count - 6); - s->dsp.clear_blocks(s->block[6]); + cbp <<= mb_block_count - 6; + cbp |= get_bits(&s->gb, mb_block_count - 6); + s->dsp.clear_blocks(s->block[6]); } if (cbp <= 0) { - av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "invalid cbp at %d %d\n", s->mb_x, s->mb_y); return -1; } #if FF_API_XVMC FF_DISABLE_DEPRECATION_WARNINGS - //if 1, we memcpy blocks in xvmcvideo - if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) { + // if 1, we memcpy blocks in xvmcvideo + if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) ff_xvmc_pack_pblocks(s, cbp); - } FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_XVMC */ if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (s->flags2 & CODEC_FLAG2_FAST) { for (i = 0; i < 6; i++) { - if (cbp & 32) { + if (cbp & 32) mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i); - } else { + else s->block_last_index[i] = -1; - } cbp += cbp; } } else { - cbp <<= 12-mb_block_count; + cbp <<= 12 - mb_block_count; for (i = 0; i < mb_block_count; i++) { if (cbp & (1 << 11)) { @@ -1008,11 +1056,10 @@ FF_ENABLE_DEPRECATION_WARNINGS } else { if (s->flags2 & CODEC_FLAG2_FAST) { for (i = 0; i < 6; i++) { - if (cbp & 32) { + if (cbp & 32) mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i); - } else { + else s->block_last_index[i] = -1; - } cbp += cbp; } } else { @@ -1040,14 +1087,14 @@ FF_ENABLE_DEPRECATION_WARNINGS static av_cold int mpeg_decode_init(AVCodecContext *avctx) { - Mpeg1Context *s = avctx->priv_data; + Mpeg1Context *s = avctx->priv_data; MpegEncContext *s2 = &s->mpeg_enc_ctx; int i; /* we need some permutation to store matrices, * until MPV_common_init() sets the real permutation. */ for (i = 0; i < 64; i++) - s2->dsp.idct_permutation[i]=i; + s2->dsp.idct_permutation[i] = i; ff_MPV_decode_defaults(s2); @@ -1061,7 +1108,7 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) s->mpeg_enc_ctx.picture_number = 0; s->repeat_field = 0; s->mpeg_enc_ctx.codec_id = avctx->codec->id; - avctx->color_range = AVCOL_RANGE_MPEG; + avctx->color_range = AVCOL_RANGE_MPEG; if (avctx->codec->id == AV_CODEC_ID_MPEG1VIDEO) avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; else @@ -1069,17 +1116,21 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) return 0; } -static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCodecContext *avctx_from) +static int mpeg_decode_update_thread_context(AVCodecContext *avctx, + const AVCodecContext *avctx_from) { Mpeg1Context *ctx = avctx->priv_data, *ctx_from = avctx_from->priv_data; MpegEncContext *s = &ctx->mpeg_enc_ctx, *s1 = &ctx_from->mpeg_enc_ctx; int err; - if (avctx == avctx_from || !ctx_from->mpeg_enc_ctx_allocated || !s1->context_initialized) + if (avctx == avctx_from || + !ctx_from->mpeg_enc_ctx_allocated || + !s1->context_initialized) return 0; err = ff_mpeg_update_thread_context(avctx, avctx_from); - if (err) return err; + if (err) + return err; if (!ctx->mpeg_enc_ctx_allocated) memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); @@ -1098,16 +1149,16 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, memcpy(temp_matrix, matrix, 64 * sizeof(uint16_t)); - for (i = 0; i < 64; i++) { + for (i = 0; i < 64; i++) matrix[new_perm[i]] = temp_matrix[old_perm[i]]; - } } #if FF_API_XVMC static const enum AVPixelFormat pixfmt_xvmc_mpg2_420[] = { AV_PIX_FMT_XVMC_MPEG2_IDCT, AV_PIX_FMT_XVMC_MPEG2_MC, - AV_PIX_FMT_NONE }; + AV_PIX_FMT_NONE +}; #endif /* FF_API_XVMC */ static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = { @@ -1126,7 +1177,7 @@ static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = { static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; #if FF_API_XVMC @@ -1136,7 +1187,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_XVMC */ - if (s->chroma_format < 2) + if (s->chroma_format < 2) return avctx->get_format(avctx, mpeg12_hwaccel_pixfmt_list_420); else if (s->chroma_format == 2) return AV_PIX_FMT_YUV422P; @@ -1148,21 +1199,19 @@ FF_ENABLE_DEPRECATION_WARNINGS * It may be called in different places for MPEG-1 and MPEG-2. */ static int mpeg_decode_postinit(AVCodecContext *avctx) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; uint8_t old_permutation[64]; int ret; - if ((s1->mpeg_enc_ctx_allocated == 0) || - avctx->coded_width != s->width || - avctx->coded_height != s->height || + if ((s1->mpeg_enc_ctx_allocated == 0) || + avctx->coded_width != s->width || + avctx->coded_height != s->height || s1->save_width != s->width || s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info || s1->save_progressive_seq != s->progressive_sequence || - 0) - { - + 0) { if (s1->mpeg_enc_ctx_allocated) { ParseContext pc = s->parse_context; s->parse_context.buffer = 0; @@ -1188,45 +1237,49 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) avctx->has_b_frames = !s->low_delay; if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) { - //MPEG-1 fps + // MPEG-1 fps avctx->time_base.den = ff_mpeg12_frame_rate_tab[s->frame_rate_index].num; avctx->time_base.num = ff_mpeg12_frame_rate_tab[s->frame_rate_index].den; - //MPEG-1 aspect - avctx->sample_aspect_ratio = av_d2q(1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); - avctx->ticks_per_frame=1; - } else {//MPEG-2 - //MPEG-2 fps + // MPEG-1 aspect + avctx->sample_aspect_ratio = av_d2q(1.0 / ff_mpeg1_aspect[s->aspect_ratio_info], 255); + avctx->ticks_per_frame = 1; + } else { // MPEG-2 + // MPEG-2 fps av_reduce(&s->avctx->time_base.den, &s->avctx->time_base.num, - ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, + ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num * 2, ff_mpeg12_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, 1 << 30); avctx->ticks_per_frame = 2; - //MPEG-2 aspect + // MPEG-2 aspect if (s->aspect_ratio_info > 1) { AVRational dar = av_mul_q(av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info], - (AVRational) {s1->pan_scan.width, s1->pan_scan.height}), - (AVRational) {s->width, s->height}); - - // we ignore the spec here and guess a bit as reality does not match the spec, see for example - // res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg - // issue1613, 621, 562 + (AVRational) { s1->pan_scan.width, + s1->pan_scan.height }), + (AVRational) { s->width, s->height }); + + /* We ignore the spec here and guess a bit as reality does not + * match the spec, see for example res_change_ffmpeg_aspect.ts + * and sequence-display-aspect.mpg. + * issue1613, 621, 562 */ if ((s1->pan_scan.width == 0) || (s1->pan_scan.height == 0) || - (av_cmp_q(dar, (AVRational) {4, 3}) && av_cmp_q(dar, (AVRational) {16, 9}))) { + (av_cmp_q(dar, (AVRational) { 4, 3 }) && + av_cmp_q(dar, (AVRational) { 16, 9 }))) { s->avctx->sample_aspect_ratio = av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info], - (AVRational) {s->width, s->height}); + (AVRational) { s->width, s->height }); } else { s->avctx->sample_aspect_ratio = av_div_q(ff_mpeg2_aspect[s->aspect_ratio_info], - (AVRational) {s1->pan_scan.width, s1->pan_scan.height}); -//issue1613 4/3 16/9 -> 16/9 -//res_change_ffmpeg_aspect.ts 4/3 225/44 ->4/3 -//widescreen-issue562.mpg 4/3 16/9 -> 16/9 + (AVRational) { s1->pan_scan.width, s1->pan_scan.height }); +// issue1613 4/3 16/9 -> 16/9 +// res_change_ffmpeg_aspect.ts 4/3 225/44 ->4/3 +// widescreen-issue562.mpg 4/3 16/9 -> 16/9 // s->avctx->sample_aspect_ratio = av_mul_q(s->avctx->sample_aspect_ratio, (AVRational) {s->width, s->height}); av_dlog(avctx, "A %d/%d\n", - ff_mpeg2_aspect[s->aspect_ratio_info].num, ff_mpeg2_aspect[s->aspect_ratio_info].den); + ff_mpeg2_aspect[s->aspect_ratio_info].num, + ff_mpeg2_aspect[s->aspect_ratio_info].den); av_dlog(avctx, "B %d/%d\n", s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den); } @@ -1241,7 +1294,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) // until then pix_fmt may be changed right after codec init #if FF_API_XVMC if ((avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT || - avctx->hwaccel) && avctx->idct_algo == FF_IDCT_AUTO) + avctx->hwaccel) && avctx->idct_algo == FF_IDCT_AUTO) #else if (avctx->hwaccel && avctx->idct_algo == FF_IDCT_AUTO) #endif /* FF_API_XVMC */ @@ -1264,14 +1317,14 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) return 0; } -static int mpeg1_decode_picture(AVCodecContext *avctx, - const uint8_t *buf, int buf_size) +static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, + int buf_size) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; int ref, f_code, vbv_delay; - init_get_bits(&s->gb, buf, buf_size*8); + init_get_bits(&s->gb, buf, buf_size * 8); ref = get_bits(&s->gb, 10); /* temporal ref */ s->pict_type = get_bits(&s->gb, 3); @@ -1279,7 +1332,8 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, return -1; vbv_delay = get_bits(&s->gb, 16); - if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) { + if (s->pict_type == AV_PICTURE_TYPE_P || + s->pict_type == AV_PICTURE_TYPE_B) { s->full_pel[0] = get_bits1(&s->gb); f_code = get_bits(&s->gb, 3); if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM)) @@ -1299,7 +1353,8 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I; if (avctx->debug & FF_DEBUG_PICT_INFO) - av_log(avctx, AV_LOG_DEBUG, "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type); + av_log(avctx, AV_LOG_DEBUG, + "vbv_delay %d, ref %d type:%d\n", vbv_delay, ref, s->pict_type); s->y_dc_scale = 8; s->c_dc_scale = 8; @@ -1308,14 +1363,14 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, static void mpeg_decode_sequence_extension(Mpeg1Context *s1) { - MpegEncContext *s= &s1->mpeg_enc_ctx; + MpegEncContext *s = &s1->mpeg_enc_ctx; int horiz_size_ext, vert_size_ext; int bit_rate_ext; skip_bits(&s->gb, 1); /* profile and level esc*/ s->avctx->profile = get_bits(&s->gb, 3); s->avctx->level = get_bits(&s->gb, 4); - s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */ + s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */ s->chroma_format = get_bits(&s->gb, 2); /* chroma_format 1=420, 2=422, 3=444 */ horiz_size_ext = get_bits(&s->gb, 2); vert_size_ext = get_bits(&s->gb, 2); @@ -1334,12 +1389,13 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) s1->frame_rate_ext.den = get_bits(&s->gb, 5) + 1; av_dlog(s->avctx, "sequence extension\n"); - s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; + s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; if (s->avctx->debug & FF_DEBUG_PICT_INFO) - av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n", - s->avctx->profile, s->avctx->level, s->avctx->rc_buffer_size, s->bit_rate); - + av_log(s->avctx, AV_LOG_DEBUG, + "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n", + s->avctx->profile, s->avctx->level, + s->avctx->rc_buffer_size, s->bit_rate); } static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) @@ -1355,7 +1411,7 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) s->avctx->colorspace = get_bits(&s->gb, 8); } w = get_bits(&s->gb, 14); - skip_bits(&s->gb, 1); //marker + skip_bits(&s->gb, 1); // marker h = get_bits(&s->gb, 14); // remaining 3 bits are zero padding @@ -1399,7 +1455,8 @@ static void mpeg_decode_picture_display_extension(Mpeg1Context *s1) s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]); } -static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], uint16_t matrix1[64], int intra) +static int load_matrix(MpegEncContext *s, uint16_t matrix0[64], + uint16_t matrix1[64], int intra) { int i; @@ -1425,23 +1482,28 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) { av_dlog(s->avctx, "matrix extension\n"); - if (get_bits1(&s->gb)) load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1); - if (get_bits1(&s->gb)) load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0); - if (get_bits1(&s->gb)) load_matrix(s, s->chroma_intra_matrix, NULL , 1); - if (get_bits1(&s->gb)) load_matrix(s, s->chroma_inter_matrix, NULL , 0); + if (get_bits1(&s->gb)) + load_matrix(s, s->chroma_intra_matrix, s->intra_matrix, 1); + if (get_bits1(&s->gb)) + load_matrix(s, s->chroma_inter_matrix, s->inter_matrix, 0); + if (get_bits1(&s->gb)) + load_matrix(s, s->chroma_intra_matrix, NULL, 1); + if (get_bits1(&s->gb)) + load_matrix(s, s->chroma_inter_matrix, NULL, 0); } static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) { MpegEncContext *s = &s1->mpeg_enc_ctx; - s->full_pel[0] = s->full_pel[1] = 0; + s->full_pel[0] = s->full_pel[1] = 0; s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); if (!s->pict_type && s1->mpeg_enc_ctx_allocated) { - av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code, guessing missing values\n"); + av_log(s->avctx, AV_LOG_ERROR, + "Missing picture start code, guessing missing values\n"); if (s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1] == 15) { if (s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15) s->pict_type = AV_PICTURE_TYPE_I; @@ -1466,17 +1528,20 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) if (s->progressive_sequence && !s->progressive_frame) { s->progressive_frame = 1; - av_log(s->avctx, AV_LOG_ERROR, "interlaced frame in progressive sequence, ignoring\n"); + av_log(s->avctx, AV_LOG_ERROR, + "interlaced frame in progressive sequence, ignoring\n"); } - if (s->picture_structure == 0 || (s->progressive_frame && s->picture_structure != PICT_FRAME)) { - av_log(s->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s->picture_structure); + if (s->picture_structure == 0 || + (s->progressive_frame && s->picture_structure != PICT_FRAME)) { + av_log(s->avctx, AV_LOG_ERROR, + "picture_structure %d invalid, ignoring\n", + s->picture_structure); s->picture_structure = PICT_FRAME; } - if (s->progressive_sequence && !s->frame_pred_frame_dct) { + if (s->progressive_sequence && !s->frame_pred_frame_dct) av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n"); - } if (s->picture_structure == PICT_FRAME) { s->first_field = 0; @@ -1510,7 +1575,7 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) { AVCodecContext *avctx = s->avctx; - Mpeg1Context *s1 = (Mpeg1Context*)s; + Mpeg1Context *s1 = (Mpeg1Context *) s; /* start frame decoding */ if (s->first_field || s->picture_structure == PICT_FRAME) { @@ -1562,14 +1627,15 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (s->avctx->hwaccel && (s->avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) { if (s->avctx->hwaccel->end_frame(s->avctx) < 0) - av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode first field\n"); + av_log(avctx, AV_LOG_ERROR, + "hardware accelerator failed to decode first field\n"); } for (i = 0; i < 4; i++) { s->current_picture.f.data[i] = s->current_picture_ptr->f.data[i]; - if (s->picture_structure == PICT_BOTTOM_FIELD) { - s->current_picture.f.data[i] += s->current_picture_ptr->f.linesize[i]; - } + if (s->picture_structure == PICT_BOTTOM_FIELD) + s->current_picture.f.data[i] += + s->current_picture_ptr->f.linesize[i]; } } @@ -1624,9 +1690,8 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, } /* extra slice info */ - while (get_bits1(&s->gb) != 0) { + while (get_bits1(&s->gb) != 0) skip_bits(&s->gb, 8); - } s->mb_x = 0; @@ -1641,9 +1706,8 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, return -1; } if (code >= 33) { - if (code == 33) { + if (code == 33) s->mb_x += 33; - } /* otherwise, stuffing, nothing to do */ } else { s->mb_x += code; @@ -1652,7 +1716,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, } } - if (s->mb_x >= (unsigned)s->mb_width) { + if (s->mb_x >= (unsigned) s->mb_width) { av_log(s->avctx, AV_LOG_ERROR, "initial skip overflow\n"); return -1; } @@ -1677,12 +1741,22 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, if (s->mb_y == 0 && s->mb_x == 0 && (s->first_field || s->picture_structure == PICT_FRAME)) { if (s->avctx->debug & FF_DEBUG_PICT_INFO) { - av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", - s->qscale, s->mpeg_f_code[0][0], s->mpeg_f_code[0][1], s->mpeg_f_code[1][0], s->mpeg_f_code[1][1], - s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")), - s->progressive_sequence ? "ps" :"", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" :"", s->top_field_first ? "top" :"", - s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors, - s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :""); + av_log(s->avctx, AV_LOG_DEBUG, + "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", + s->qscale, + s->mpeg_f_code[0][0], s->mpeg_f_code[0][1], + s->mpeg_f_code[1][0], s->mpeg_f_code[1][1], + s->pict_type == AV_PICTURE_TYPE_I ? "I" : + (s->pict_type == AV_PICTURE_TYPE_P ? "P" : + (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")), + s->progressive_sequence ? "ps" : "", + s->progressive_frame ? "pf" : "", + s->alternate_scan ? "alt" : "", + s->top_field_first ? "top" : "", + s->intra_dc_precision, s->picture_structure, + s->frame_pred_frame_dct, s->concealment_motion_vectors, + s->q_scale_type, s->intra_vlc_format, + s->repeat_first_field, s->chroma_420_type ? "420" : ""); } } @@ -1698,7 +1772,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (mpeg_decode_mb(s, s->block) < 0) return -1; - if (s->current_picture.motion_val[0] && !s->encoding) { // note motion_val is normally NULL unless we want to extract the MVs + // Note motion_val is normally NULL unless we want to extract the MVs. + if (s->current_picture.motion_val[0] && !s->encoding) { const int wrap = s->b8_stride; int xy = s->mb_x * 2 + s->mb_y * 2 * wrap; int b8_xy = 4 * (s->mb_x + s->mb_y * s->mb_stride); @@ -1706,26 +1781,29 @@ FF_ENABLE_DEPRECATION_WARNINGS for (i = 0; i < 2; i++) { for (dir = 0; dir < 2; dir++) { - if (s->mb_intra || (dir == 1 && s->pict_type != AV_PICTURE_TYPE_B)) { + if (s->mb_intra || + (dir == 1 && s->pict_type != AV_PICTURE_TYPE_B)) { motion_x = motion_y = 0; - } else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)) { + } else if (s->mv_type == MV_TYPE_16X16 || + (s->mv_type == MV_TYPE_FIELD && field_pic)) { motion_x = s->mv[dir][0][0]; motion_y = s->mv[dir][0][1]; - } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { + } else { /* if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8)) */ motion_x = s->mv[dir][i][0]; motion_y = s->mv[dir][i][1]; } - s->current_picture.motion_val[dir][xy ][0] = motion_x; - s->current_picture.motion_val[dir][xy ][1] = motion_y; + s->current_picture.motion_val[dir][xy][0] = motion_x; + s->current_picture.motion_val[dir][xy][1] = motion_y; s->current_picture.motion_val[dir][xy + 1][0] = motion_x; s->current_picture.motion_val[dir][xy + 1][1] = motion_y; - s->current_picture.ref_index [dir][b8_xy ] = + s->current_picture.ref_index [dir][b8_xy] = s->current_picture.ref_index [dir][b8_xy + 1] = s->field_select[dir][i]; - assert(s->field_select[dir][i] == 0 || s->field_select[dir][i] == 1); + assert(s->field_select[dir][i] == 0 || + s->field_select[dir][i] == 1); } - xy += wrap; - b8_xy +=2; + xy += wrap; + b8_xy += 2; } } @@ -1738,21 +1816,27 @@ FF_ENABLE_DEPRECATION_WARNINGS if (++s->mb_x >= s->mb_width) { const int mb_size = 16; - ff_mpeg_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size); + ff_mpeg_draw_horiz_band(s, mb_size * (s->mb_y >> field_pic), mb_size); ff_MPV_report_decode_progress(s); - s->mb_x = 0; + s->mb_x = 0; s->mb_y += 1 << field_pic; if (s->mb_y >= s->mb_height) { int left = get_bits_left(&s->gb); - int is_d10 = s->chroma_format == 2 && s->pict_type == AV_PICTURE_TYPE_I && avctx->profile == 0 && avctx->level == 5 - && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0 - && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/; - - if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) - || ((avctx->err_recognition & AV_EF_BUFFER) && left > 8)) { - av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23))); + int is_d10 = s->chroma_format == 2 && + s->pict_type == AV_PICTURE_TYPE_I && + avctx->profile == 0 && avctx->level == 5 && + s->intra_dc_precision == 2 && + s->q_scale_type == 1 && s->alternate_scan == 0 && + s->progressive_frame == 0 + /* vbv_delay == 0xBBB || 0xE10 */; + + if (left < 0 || + (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) || + ((avctx->err_recognition & AV_EF_BUFFER) && left > 8)) { + av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", + left, show_bits(&s->gb, FFMIN(left, 23))); return -1; } else goto eos; @@ -1791,7 +1875,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (s->mb_skip_run) { int i; if (s->pict_type == AV_PICTURE_TYPE_I) { - av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, + "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); return -1; } @@ -1821,14 +1906,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } } eos: // end of slice - *buf += (get_bits_count(&s->gb)-1)/8; + *buf += (get_bits_count(&s->gb) - 1) / 8; av_dlog(s, "y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y); return 0; } static int slice_decode_thread(AVCodecContext *c, void *arg) { - MpegEncContext *s = *(void**)arg; + MpegEncContext *s = *(void **) arg; const uint8_t *buf = s->gb.buffer; int mb_y = s->start_mb_y; const int field_pic = s->picture_structure != PICT_FRAME; @@ -1848,17 +1933,21 @@ static int slice_decode_thread(AVCodecContext *c, void *arg) if (c->err_recognition & AV_EF_EXPLODE) return ret; if (s->resync_mb_x >= 0 && s->resync_mb_y >= 0) - ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR); + ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, + s->mb_x, s->mb_y, + ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR); } else { - ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_AC_END | ER_DC_END | ER_MV_END); + ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, + s->mb_x - 1, s->mb_y, + ER_AC_END | ER_DC_END | ER_MV_END); } if (s->mb_y == s->end_mb_y) return 0; start_code = -1; - buf = avpriv_find_start_code(buf, s->gb.buffer_end, &start_code); - mb_y= (start_code - SLICE_MIN_START_CODE) << field_pic; + buf = avpriv_find_start_code(buf, s->gb.buffer_end, &start_code); + mb_y = (start_code - SLICE_MIN_START_CODE) << field_pic; if (s->picture_structure == PICT_BOTTOM_FIELD) mb_y++; if (mb_y < 0 || mb_y >= s->end_mb_y) @@ -1872,7 +1961,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg) */ static int slice_end(AVCodecContext *avctx, AVFrame *pict) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) @@ -1880,7 +1969,8 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (s->avctx->hwaccel) { if (s->avctx->hwaccel->end_frame(s->avctx) < 0) - av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); + av_log(avctx, AV_LOG_ERROR, + "hardware accelerator failed to decode picture\n"); } #if FF_API_XVMC @@ -1891,7 +1981,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_XVMC */ /* end of slice reached */ - if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field) { + if (/* s->mb_y << field_pic == s->mb_height && */ !s->first_field) { /* end of image */ ff_er_frame_end(&s->er); @@ -1925,18 +2015,18 @@ FF_ENABLE_DEPRECATION_WARNINGS static int mpeg1_decode_sequence(AVCodecContext *avctx, const uint8_t *buf, int buf_size) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; int width, height; int i, v, j; - init_get_bits(&s->gb, buf, buf_size*8); + init_get_bits(&s->gb, buf, buf_size * 8); width = get_bits(&s->gb, 12); height = get_bits(&s->gb, 12); if (width == 0 || height == 0) { - av_log(avctx, AV_LOG_WARNING, "Invalid horizontal or vertical size " - "value.\n"); + av_log(avctx, AV_LOG_WARNING, + "Invalid horizontal or vertical size value.\n"); if (avctx->err_recognition & AV_EF_BITSTREAM) return AVERROR_INVALIDDATA; } @@ -1985,13 +2075,14 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, return -1; } - /* we set MPEG-2 parameters so that it emulates MPEG-1 */ + /* We set MPEG-2 parameters so that it emulates MPEG-1. */ s->progressive_sequence = 1; s->progressive_frame = 1; s->picture_structure = PICT_FRAME; s->frame_pred_frame_dct = 1; s->chroma_format = 1; - s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; + s->codec_id = + s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; s->out_format = FMT_MPEG1; if (s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay = 1; @@ -2005,7 +2096,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, static int vcr2_init_sequence(AVCodecContext *avctx) { - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; int i, v; @@ -2014,10 +2105,10 @@ static int vcr2_init_sequence(AVCodecContext *avctx) if (s1->mpeg_enc_ctx_allocated) { ff_MPV_common_end(s); } - s->width = avctx->coded_width; - s->height = avctx->coded_height; + s->width = avctx->coded_width; + s->height = avctx->coded_height; avctx->has_b_frames = 0; // true? - s->low_delay = 1; + s->low_delay = 1; avctx->pix_fmt = mpeg_get_pixelformat(avctx); avctx->hwaccel = ff_find_hwaccel(avctx); @@ -2057,7 +2148,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx) return 0; } - static int mpeg_decode_a53_cc(AVCodecContext *avctx, const uint8_t *p, int buf_size) { @@ -2071,14 +2161,13 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, if (cc_count > 0 && buf_size >= 7 + cc_count * 3) { av_freep(&s1->a53_caption); s1->a53_caption_size = cc_count * 3; - s1->a53_caption = av_malloc(s1->a53_caption_size); - if (s1->a53_caption) { + s1->a53_caption = av_malloc(s1->a53_caption_size); + if (s1->a53_caption) memcpy(s1->a53_caption, p + 7, s1->a53_caption_size); - } } return 1; } else if (buf_size >= 11 && - p[0] == 'C' && p[1] == 'C' && p[2] == 0x01 && p[3] == 0xf8) { + p[0] == 'C' && p[1] == 'C' && p[2] == 0x01 && p[3] == 0xf8) { /* extract DVD CC data */ int cc_count = 0; int i; @@ -2090,7 +2179,7 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, if (cc_count > 0) { av_freep(&s1->a53_caption); s1->a53_caption_size = cc_count * 6; - s1->a53_caption = av_malloc(s1->a53_caption_size); + s1->a53_caption = av_malloc(s1->a53_caption_size); if (s1->a53_caption) { uint8_t field1 = !!(p[4] & 0x80); uint8_t *cap = s1->a53_caption; @@ -2143,7 +2232,8 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, S3D_video_format_type == 0x23) { Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - AVStereo3D *stereo = av_stereo3d_create_side_data(&s->current_picture_ptr->f); + AVStereo3D *stereo = + av_stereo3d_create_side_data(&s->current_picture_ptr->f); if (!stereo) return; @@ -2177,7 +2267,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, int time_code_seconds, time_code_pictures; int broken_link; - init_get_bits(&s->gb, buf, buf_size*8); + init_get_bits(&s->gb, buf, buf_size * 8); skip_bits1(&s->gb); /* drop_frame_flag */ @@ -2188,20 +2278,20 @@ static void mpeg_decode_gop(AVCodecContext *avctx, time_code_pictures = get_bits(&s->gb, 6); s1->closed_gop = get_bits1(&s->gb); - /*broken_link indicate that after editing the - reference frames of the first B-Frames after GOP I-Frame - are missing (open gop)*/ + /* broken_link indicate that after editing the + * reference frames of the first B-Frames after GOP I-Frame + * are missing (open gop) */ broken_link = get_bits1(&s->gb); if (s->avctx->debug & FF_DEBUG_PICT_INFO) - av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n", + av_log(s->avctx, AV_LOG_DEBUG, + "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n", time_code_hours, time_code_minutes, time_code_seconds, time_code_pictures, s1->closed_gop, broken_link); } -static int decode_chunks(AVCodecContext *avctx, - AVFrame *picture, int *got_output, - const uint8_t *buf, int buf_size) +static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, + int *got_output, const uint8_t *buf, int buf_size) { Mpeg1Context *s = avctx->priv_data; MpegEncContext *s2 = &s->mpeg_enc_ctx; @@ -2216,11 +2306,14 @@ static int decode_chunks(AVCodecContext *avctx, buf_ptr = avpriv_find_start_code(buf_ptr, buf_end, &start_code); if (start_code > 0x1ff) { if (!skip_frame) { - if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) && + if (HAVE_THREADS && + (avctx->active_thread_type & FF_THREAD_SLICE) && !avctx->hwaccel) { int i; - avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*)); + avctx->execute(avctx, slice_decode_thread, + &s2->thread_context[0], NULL, + s->slice_count, sizeof(void *)); for (i = 0; i < s->slice_count; i++) s2->er.error_count += s2->thread_context[i]->er.error_count; } @@ -2229,7 +2322,8 @@ static int decode_chunks(AVCodecContext *avctx, if (ret < 0) return ret; else if (ret) { - if (s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice + // FIXME: merge with the stuff in mpeg_decode_slice + if (s2->last_picture_ptr || s2->low_delay) *got_output = 1; } } @@ -2239,18 +2333,19 @@ static int decode_chunks(AVCodecContext *avctx, input_size = buf_end - buf_ptr; - if (avctx->debug & FF_DEBUG_STARTCODE) { - av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n", start_code, buf_ptr-buf, input_size); - } + if (avctx->debug & FF_DEBUG_STARTCODE) + av_log(avctx, AV_LOG_DEBUG, "%3X at %td left %d\n", + start_code, buf_ptr - buf, input_size); /* prepare data for next start code */ switch (start_code) { case SEQ_START_CODE: if (last_code == 0) { mpeg1_decode_sequence(avctx, buf_ptr, input_size); - s->sync=1; + s->sync = 1; } else { - av_log(avctx, AV_LOG_ERROR, "ignoring SEQ_START_CODE after %X\n", last_code); + av_log(avctx, AV_LOG_ERROR, + "ignoring SEQ_START_CODE after %X\n", last_code); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } @@ -2269,7 +2364,7 @@ static int decode_chunks(AVCodecContext *avctx, avctx->execute(avctx, slice_decode_thread, s2->thread_context, NULL, - s->slice_count, sizeof(void*)); + s->slice_count, sizeof(void *)); for (i = 0; i < s->slice_count; i++) s2->er.error_count += s2->thread_context[i]->er.error_count; s->slice_count = 0; @@ -2277,30 +2372,33 @@ static int decode_chunks(AVCodecContext *avctx, if (last_code == 0 || last_code == SLICE_MIN_START_CODE) { ret = mpeg_decode_postinit(avctx); if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n"); + av_log(avctx, AV_LOG_ERROR, + "mpeg_decode_postinit() failure\n"); return ret; } - /* we have a complete image: we try to decompress it */ + /* We have a complete image: we try to decompress it. */ if (mpeg1_decode_picture(avctx, buf_ptr, input_size) < 0) s2->pict_type = 0; s->first_slice = 1; - last_code = PICTURE_START_CODE; + last_code = PICTURE_START_CODE; } else { - av_log(avctx, AV_LOG_ERROR, "ignoring pic after %X\n", last_code); + av_log(avctx, AV_LOG_ERROR, + "ignoring pic after %X\n", last_code); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } break; case EXT_START_CODE: - init_get_bits(&s2->gb, buf_ptr, input_size*8); + init_get_bits(&s2->gb, buf_ptr, input_size * 8); switch (get_bits(&s2->gb, 4)) { case 0x1: if (last_code == 0) { - mpeg_decode_sequence_extension(s); + mpeg_decode_sequence_extension(s); } else { - av_log(avctx, AV_LOG_ERROR, "ignoring seq ext after %X\n", last_code); + av_log(avctx, AV_LOG_ERROR, + "ignoring seq ext after %X\n", last_code); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } @@ -2318,7 +2416,8 @@ static int decode_chunks(AVCodecContext *avctx, if (last_code == PICTURE_START_CODE) { mpeg_decode_picture_coding_extension(s); } else { - av_log(avctx, AV_LOG_ERROR, "ignoring pic cod ext after %X\n", last_code); + av_log(avctx, AV_LOG_ERROR, + "ignoring pic cod ext after %X\n", last_code); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } @@ -2330,11 +2429,12 @@ static int decode_chunks(AVCodecContext *avctx, break; case GOP_START_CODE: if (last_code == 0) { - s2->first_field=0; + s2->first_field = 0; mpeg_decode_gop(avctx, buf_ptr, input_size); - s->sync=1; + s->sync = 1; } else { - av_log(avctx, AV_LOG_ERROR, "ignoring GOP_START_CODE after %X\n", last_code); + av_log(avctx, AV_LOG_ERROR, + "ignoring GOP_START_CODE after %X\n", last_code); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } @@ -2350,12 +2450,14 @@ static int decode_chunks(AVCodecContext *avctx, mb_y++; if (mb_y >= s2->mb_height) { - av_log(s2->avctx, AV_LOG_ERROR, "slice below image (%d >= %d)\n", mb_y, s2->mb_height); + av_log(s2->avctx, AV_LOG_ERROR, + "slice below image (%d >= %d)\n", mb_y, s2->mb_height); return -1; } if (s2->last_picture_ptr == NULL) { - /* Skip B-frames if we do not have reference frames and gop is not closed */ + /* Skip B-frames if we do not have reference frames and + * GOP is not closed. */ if (s2->pict_type == AV_PICTURE_TYPE_B) { if (!s->closed_gop) { skip_frame = 1; @@ -2364,17 +2466,20 @@ static int decode_chunks(AVCodecContext *avctx, } } if (s2->pict_type == AV_PICTURE_TYPE_I) - s->sync=1; + s->sync = 1; if (s2->next_picture_ptr == NULL) { - /* Skip P-frames if we do not have a reference frame or we have an invalid header. */ + /* Skip P-frames if we do not have a reference frame or + * we have an invalid header. */ if (s2->pict_type == AV_PICTURE_TYPE_P && !s->sync) { skip_frame = 1; break; } } - if ((avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type == AV_PICTURE_TYPE_B) || - (avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type != AV_PICTURE_TYPE_I) || - avctx->skip_frame >= AVDISCARD_ALL) { + if ((avctx->skip_frame >= AVDISCARD_NONREF && + s2->pict_type == AV_PICTURE_TYPE_B) || + (avctx->skip_frame >= AVDISCARD_NONKEY && + s2->pict_type != AV_PICTURE_TYPE_I) || + avctx->skip_frame >= AVDISCARD_ALL) { skip_frame = 1; break; } @@ -2383,7 +2488,8 @@ static int decode_chunks(AVCodecContext *avctx, break; if (s2->codec_id == AV_CODEC_ID_MPEG2VIDEO) { - if (mb_y < avctx->skip_top || mb_y >= s2->mb_height - avctx->skip_bottom) + if (mb_y < avctx->skip_top || + mb_y >= s2->mb_height - avctx->skip_bottom) break; } @@ -2395,17 +2501,19 @@ static int decode_chunks(AVCodecContext *avctx, } if (s->first_slice) { - skip_frame = 0; + skip_frame = 0; s->first_slice = 0; if (mpeg_field_start(s2, buf, buf_size) < 0) return -1; } if (!s2->current_picture_ptr) { - av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n"); + av_log(avctx, AV_LOG_ERROR, + "current_picture not initialized\n"); return AVERROR_INVALIDDATA; } - if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_SLICE) && + if (HAVE_THREADS && + (avctx->active_thread_type & FF_THREAD_SLICE) && !avctx->hwaccel) { int threshold = (s2->mb_height * s->slice_count + s2->slice_context_count / 2) / @@ -2416,13 +2524,12 @@ static int decode_chunks(AVCodecContext *avctx, thread_context->start_mb_y = mb_y; thread_context->end_mb_y = s2->mb_height; if (s->slice_count) { - s2->thread_context[s->slice_count-1]->end_mb_y = mb_y; - ret = ff_update_duplicate_context(thread_context, - s2); + s2->thread_context[s->slice_count - 1]->end_mb_y = mb_y; + ret = ff_update_duplicate_context(thread_context, s2); if (ret < 0) return ret; } - init_get_bits(&thread_context->gb, buf_ptr, input_size*8); + init_get_bits(&thread_context->gb, buf_ptr, input_size * 8); s->slice_count++; } buf_ptr += 2; // FIXME add minimum number of bytes per slice @@ -2434,9 +2541,13 @@ static int decode_chunks(AVCodecContext *avctx, if (avctx->err_recognition & AV_EF_EXPLODE) return ret; if (s2->resync_mb_x >= 0 && s2->resync_mb_y >= 0) - ff_er_add_slice(&s2->er, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x, s2->mb_y, ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR); + ff_er_add_slice(&s2->er, s2->resync_mb_x, + s2->resync_mb_y, s2->mb_x, s2->mb_y, + ER_AC_ERROR | ER_DC_ERROR | ER_MV_ERROR); } else { - ff_er_add_slice(&s2->er, s2->resync_mb_x, s2->resync_mb_y, s2->mb_x-1, s2->mb_y, ER_AC_END | ER_DC_END | ER_MV_END); + ff_er_add_slice(&s2->er, s2->resync_mb_x, + s2->resync_mb_y, s2->mb_x - 1, s2->mb_y, + ER_AC_END | ER_DC_END | ER_MV_END); } } } @@ -2445,9 +2556,8 @@ static int decode_chunks(AVCodecContext *avctx, } } -static int mpeg_decode_frame(AVCodecContext *avctx, - void *data, int *got_output, - AVPacket *avpkt) +static int mpeg_decode_frame(AVCodecContext *avctx, void *data, + int *got_output, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -2471,9 +2581,11 @@ static int mpeg_decode_frame(AVCodecContext *avctx, } if (s2->flags & CODEC_FLAG_TRUNCATED) { - int next = ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size, NULL); + int next = ff_mpeg1_find_frame_end(&s2->parse_context, buf, + buf_size, NULL); - if (ff_combine_frame(&s2->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0) + if (ff_combine_frame(&s2->parse_context, next, + (const uint8_t **) &buf, &buf_size) < 0) return buf_size; } @@ -2483,7 +2595,8 @@ static int mpeg_decode_frame(AVCodecContext *avctx, s->slice_count = 0; if (avctx->extradata && !s->extradata_decoded) { - int ret = decode_chunks(avctx, picture, got_output, avctx->extradata, avctx->extradata_size); + int ret = decode_chunks(avctx, picture, got_output, + avctx->extradata, avctx->extradata_size); s->extradata_decoded = 1; if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) return ret; @@ -2492,12 +2605,11 @@ static int mpeg_decode_frame(AVCodecContext *avctx, return decode_chunks(avctx, picture, got_output, buf, buf_size); } - static void flush(AVCodecContext *avctx) { Mpeg1Context *s = avctx->priv_data; - s->sync=0; + s->sync = 0; s->closed_gop = 0; ff_mpeg_flush(avctx); @@ -2522,10 +2634,9 @@ static const AVProfile mpeg2_video_profiles[] = { { FF_PROFILE_MPEG2_SIMPLE, "Simple" }, { FF_PROFILE_RESERVED, "Reserved" }, { FF_PROFILE_RESERVED, "Reserved" }, - { FF_PROFILE_UNKNOWN }, + { FF_PROFILE_UNKNOWN }, }; - AVCodec ff_mpeg1video_decoder = { .name = "mpeg1video", .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), @@ -2587,7 +2698,7 @@ AVCodec ff_mpeg_xvmc_decoder = { .close = mpeg_decode_end, .decode = mpeg_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | - CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, + CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, .flush = flush, }; -- cgit v1.2.3