diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:04:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:04:10 +0200 |
commit | bad101ab8a54dd36d569daef35f8e583500bbf49 (patch) | |
tree | a8d7ac676897e6b29f857bd91bc8f7416938bb56 | |
parent | d9fef740bd6a5aa2a3ce1a612348a05c4c5ca6e9 (diff) | |
parent | 89ef08c992c484a46711b1a68a988303679c288e (diff) | |
download | ffmpeg-bad101ab8a54dd36d569daef35f8e583500bbf49.tar.gz |
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
* commit '89ef08c992c484a46711b1a68a988303679c288e':
DNxHD: K&R formatting cosmetics
Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/dnxhd_parser.c | 10 | ||||
-rw-r--r-- | libavcodec/dnxhddata.c | 2 | ||||
-rw-r--r-- | libavcodec/dnxhddec.c | 51 | ||||
-rw-r--r-- | libavcodec/dnxhdenc.c | 450 |
4 files changed, 308 insertions, 205 deletions
diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 6e030e4212..fffb98fa48 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -46,7 +46,7 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (!pic_found) { for (i = 0; i < buf_size; i++) { - state = (state<<8) | buf[i]; + state = (state << 8) | buf[i]; if ((state & 0xffffffffff00LL) == DNXHD_HEADER_PREFIX) { i++; pic_found = 1; @@ -61,14 +61,14 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (!buf_size) /* EOF considered as end of frame */ return 0; for (; i < buf_size; i++) { - state = (state<<8) | buf[i]; + state = (state << 8) | buf[i]; if ((state & 0xffffffffff00LL) == DNXHD_HEADER_PREFIX) { if (!interlaced || dctx->cur_field) { pc->frame_start_found = 0; pc->state64 = -1; dctx->interlaced = interlaced; dctx->cur_field = 0; - return i-5; + return i - 5; } else { /* continue, to get the second field */ dctx->interlaced = interlaced = (state&2)>>1; @@ -98,12 +98,12 @@ static int dnxhd_parse(AVCodecParserContext *s, } else { next = dnxhd_find_frame_end(dctx, buf, buf_size); if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { - *poutbuf = NULL; + *poutbuf = NULL; *poutbuf_size = 0; return buf_size; } } - *poutbuf = buf; + *poutbuf = buf; *poutbuf_size = buf_size; return next; } diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 80f5337288..7ea91915e2 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1067,7 +1067,7 @@ int avpriv_dnxhd_get_frame_size(int cid) int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth) { int i, j; - int mbs = avctx->bit_rate/1000000; + int mbs = avctx->bit_rate / 1000000; if (!mbs) return 0; for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++) { diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 0f9fd16b5b..e33593c114 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -57,9 +57,12 @@ typedef struct DNXHDContext { #define DNXHD_VLC_BITS 9 #define DNXHD_DC_VLC_BITS 7 -static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, int16_t *block, int n, int qscale); -static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, int16_t *block, int n, int qscale); -static void dnxhd_decode_dct_block_10_444(DNXHDContext *ctx, int16_t *block, int n, int qscale); +static void dnxhd_decode_dct_block_8(DNXHDContext *ctx, int16_t *block, + int n, int qscale); +static void dnxhd_decode_dct_block_10(DNXHDContext *ctx, int16_t *block, + int n, int qscale); +static void dnxhd_decode_dct_block_10_444(DNXHDContext *ctx, int16_t *block, + int n, int qscale); static av_cold int dnxhd_decode_init(AVCodecContext *avctx) { @@ -99,14 +102,16 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid) ctx->cid_table->run_bits, 1, 1, ctx->cid_table->run_codes, 2, 2, 0); - ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, ff_zigzag_direct); + ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, + ff_zigzag_direct); ctx->cid = cid; } return 0; } static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, - const uint8_t *buf, int buf_size, int first_field) + const uint8_t *buf, int buf_size, + int first_field) { static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 }; static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 }; @@ -123,7 +128,8 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, ctx->cur_field = buf[5] & 1; frame->interlaced_frame = 1; frame->top_field_first = first_field ^ ctx->cur_field; - av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field); + av_log(ctx->avctx, AV_LOG_DEBUG, + "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field); } ctx->height = AV_RB16(buf + 0x18); @@ -170,22 +176,24 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, return AVERROR_INVALIDDATA; } - ctx->mb_width = ctx->width>>4; + ctx->mb_width = ctx->width >> 4; ctx->mb_height = buf[0x16d]; - av_dlog(ctx->avctx, "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height); + av_dlog(ctx->avctx, + "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height); - if ((ctx->height+15)>>4 == ctx->mb_height && frame->interlaced_frame) + if ((ctx->height + 15) >> 4 == ctx->mb_height && frame->interlaced_frame) ctx->height <<= 1; if (ctx->mb_height > 68 || - (ctx->mb_height << frame->interlaced_frame) > (ctx->height+15)>>4) { - av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big: %d\n", ctx->mb_height); + (ctx->mb_height << frame->interlaced_frame) > (ctx->height + 15) >> 4) { + av_log(ctx->avctx, AV_LOG_ERROR, + "mb height too big: %d\n", ctx->mb_height); return AVERROR_INVALIDDATA; } for (i = 0; i < ctx->mb_height; i++) { - ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i<<2)); + ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i << 2)); av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]); if (buf_size < ctx->mb_scan_index[i] + 0x280LL) { av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n"); @@ -213,12 +221,12 @@ static av_always_inline void dnxhd_decode_dct_block(DNXHDContext *ctx, OPEN_READER(bs, &ctx->gb); if (!ctx->is_444) { - if (n&2) { - component = 1 + (n&1); + if (n & 2) { + component = 1 + (n & 1); scale = ctx->chroma_scale; weight_matrix = ctx->cid_table->chroma_weight; } else { - component = 0; + component = 0; scale = ctx->luma_scale; weight_matrix = ctx->cid_table->luma_weight; } @@ -274,13 +282,13 @@ static av_always_inline void dnxhd_decode_dct_block(DNXHDContext *ctx, break; } - j = ctx->scantable.permutated[i]; + j = ctx->scantable.permutated[i]; level *= scale[i]; if (level_bias < 32 || weight_matrix[i] != level_bias) level += level_bias; level >>= level_shift; - block[j] = (level^sign) - sign; + block[j] = (level ^ sign) - sign; UPDATE_CACHE(bs, &ctx->gb); GET_VLC(index1, bs, &ctx->gb, ctx->ac_vlc.table, @@ -308,7 +316,8 @@ static void dnxhd_decode_dct_block_10_444(DNXHDContext *ctx, int16_t *block, dnxhd_decode_dct_block(ctx, block, n, qscale, 6, 32, 6); } -static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, int x, int y) +static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, + int x, int y) { int shift1 = ctx->bit_depth == 10; int dct_linesize_luma = frame->linesize[0]; @@ -409,8 +418,8 @@ static int dnxhd_decode_macroblocks(DNXHDContext *ctx, AVFrame *frame, return 0; } -static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, - AVPacket *avpkt) +static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -422,7 +431,7 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_dlog(avctx, "frame size %d\n", buf_size); - decode_coding_unit: +decode_coding_unit: if ((ret = dnxhd_decode_header(ctx, picture, buf, buf_size, first_field)) < 0) return ret; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 5d742a785d..b5edb72643 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -23,24 +23,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define RC_VARIANCE 1 // use variance or ssd for fast rc - #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/timer.h" + #include "avcodec.h" #include "dsputil.h" #include "internal.h" #include "mpegvideo.h" #include "dnxhdenc.h" -#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM -#define DNX10BIT_QMAT_SHIFT 18 // The largest value that will not lead to overflow for 10bit samples. -static const AVOption options[]={ - {"nitris_compat", "encode with Avid Nitris compatibility", offsetof(DNXHDEncContext, nitris_compat), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, VE}, -{NULL} +// The largest value that will not lead to overflow for 10bit samples. +#define DNX10BIT_QMAT_SHIFT 18 +#define RC_VARIANCE 1 // use variance or ssd for fast rc +#define LAMBDA_FRAC_BITS 10 + +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "nitris_compat", "encode with Avid Nitris compatibility", + offsetof(DNXHDEncContext, nitris_compat), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { NULL } }; static const AVClass dnxhd_class = { @@ -50,18 +54,22 @@ static const AVClass dnxhd_class = { .version = LIBAVUTIL_VERSION_INT, }; -#define LAMBDA_FRAC_BITS 10 - -static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, ptrdiff_t line_size) +static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, + const uint8_t *pixels, + ptrdiff_t line_size) { int i; for (i = 0; i < 4; i++) { - block[0] = pixels[0]; block[1] = pixels[1]; - block[2] = pixels[2]; block[3] = pixels[3]; - block[4] = pixels[4]; block[5] = pixels[5]; - block[6] = pixels[6]; block[7] = pixels[7]; - pixels += line_size; - block += 8; + block[0] = pixels[0]; + block[1] = pixels[1]; + block[2] = pixels[2]; + block[3] = pixels[3]; + block[4] = pixels[4]; + block[5] = pixels[5]; + block[6] = pixels[6]; + block[7] = pixels[7]; + pixels += line_size; + block += 8; } memcpy(block, block - 8, sizeof(*block) * 8); memcpy(block + 8, block - 16, sizeof(*block) * 8); @@ -69,7 +77,10 @@ static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint memcpy(block + 24, block - 32, sizeof(*block) * 8); } -static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, ptrdiff_t line_size) +static av_always_inline +void dnxhd_10bit_get_pixels_8x4_sym(int16_t *av_restrict block, + const uint8_t *pixels, + ptrdiff_t line_size) { int i; const uint16_t* pixels16 = (const uint16_t*)pixels; @@ -118,24 +129,28 @@ static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, int16_t *block, static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx) { int i, j, level, run; - int max_level = 1<<(ctx->cid_table->bit_depth+2); - - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->vlc_codes, max_level*4*sizeof(*ctx->vlc_codes), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->vlc_bits, max_level*4*sizeof(*ctx->vlc_bits) , fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_codes, 63*2, fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_bits, 63, fail); - - ctx->vlc_codes += max_level*2; - ctx->vlc_bits += max_level*2; + int max_level = 1 << (ctx->cid_table->bit_depth + 2); + + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->vlc_codes, + max_level * 4 * sizeof(*ctx->vlc_codes), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->vlc_bits, + max_level * 4 * sizeof(*ctx->vlc_bits), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_codes, + 63 * 2, fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->run_bits, + 63, fail); + + ctx->vlc_codes += max_level * 2; + ctx->vlc_bits += max_level * 2; for (level = -max_level; level < max_level; level++) { for (run = 0; run < 2; run++) { - int index = (level<<1)|run; + int index = (level << 1) | run; int sign, offset = 0, alevel = level; MASK_ABS(sign, alevel); if (alevel > 64) { - offset = (alevel-1)>>6; - alevel -= offset<<6; + offset = (alevel - 1) >> 6; + alevel -= offset << 6; } for (j = 0; j < 257; j++) { if (ctx->cid_table->ac_level[j] >> 1 == alevel && @@ -143,19 +158,21 @@ static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx) (!run || (ctx->cid_table->ac_flags[j] & 2) && run)) { av_assert1(!ctx->vlc_codes[index]); if (alevel) { - ctx->vlc_codes[index] = (ctx->cid_table->ac_codes[j]<<1)|(sign&1); - ctx->vlc_bits [index] = ctx->cid_table->ac_bits[j]+1; + ctx->vlc_codes[index] = + (ctx->cid_table->ac_codes[j] << 1) | (sign & 1); + ctx->vlc_bits[index] = ctx->cid_table->ac_bits[j] + 1; } else { ctx->vlc_codes[index] = ctx->cid_table->ac_codes[j]; - ctx->vlc_bits [index] = ctx->cid_table->ac_bits [j]; + ctx->vlc_bits[index] = ctx->cid_table->ac_bits[j]; } break; } } av_assert0(!alevel || j < 257); if (offset) { - ctx->vlc_codes[index] = (ctx->vlc_codes[index]<<ctx->cid_table->index_bits)|offset; - ctx->vlc_bits [index]+= ctx->cid_table->index_bits; + ctx->vlc_codes[index] = + (ctx->vlc_codes[index] << ctx->cid_table->index_bits) | offset; + ctx->vlc_bits[index] += ctx->cid_table->index_bits; } } } @@ -163,45 +180,56 @@ static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx) int run = ctx->cid_table->run[i]; av_assert0(run < 63); ctx->run_codes[run] = ctx->cid_table->run_codes[i]; - ctx->run_bits [run] = ctx->cid_table->run_bits[i]; + ctx->run_bits[run] = ctx->cid_table->run_bits[i]; } return 0; - fail: +fail: return AVERROR(ENOMEM); } static av_cold int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias) { // init first elem to 1 to avoid div by 0 in convert_matrix - uint16_t weight_matrix[64] = {1,}; // convert_matrix needs uint16_t* + uint16_t weight_matrix[64] = { 1, }; // convert_matrix needs uint16_t* int qscale, i; const uint8_t *luma_weight_table = ctx->cid_table->luma_weight; const uint8_t *chroma_weight_table = ctx->cid_table->chroma_weight; - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_l, (ctx->m.avctx->qmax+1) * 64 * sizeof(int), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_c, (ctx->m.avctx->qmax+1) * 64 * sizeof(int), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_l16, (ctx->m.avctx->qmax+1) * 64 * 2 * sizeof(uint16_t), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_c16, (ctx->m.avctx->qmax+1) * 64 * 2 * sizeof(uint16_t), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_l, + (ctx->m.avctx->qmax + 1) * 64 * sizeof(int), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_c, + (ctx->m.avctx->qmax + 1) * 64 * sizeof(int), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_l16, + (ctx->m.avctx->qmax + 1) * 64 * 2 * sizeof(uint16_t), + fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->qmatrix_c16, + (ctx->m.avctx->qmax + 1) * 64 * 2 * sizeof(uint16_t), + fail); if (ctx->cid_table->bit_depth == 8) { for (i = 1; i < 64; i++) { int j = ctx->m.dsp.idct_permutation[ff_zigzag_direct[i]]; weight_matrix[j] = ctx->cid_table->luma_weight[i]; } - ff_convert_matrix(&ctx->m.dsp, ctx->qmatrix_l, ctx->qmatrix_l16, weight_matrix, - ctx->m.intra_quant_bias, 1, ctx->m.avctx->qmax, 1); + ff_convert_matrix(&ctx->m.dsp, ctx->qmatrix_l, ctx->qmatrix_l16, + weight_matrix, ctx->m.intra_quant_bias, 1, + ctx->m.avctx->qmax, 1); for (i = 1; i < 64; i++) { int j = ctx->m.dsp.idct_permutation[ff_zigzag_direct[i]]; weight_matrix[j] = ctx->cid_table->chroma_weight[i]; } - ff_convert_matrix(&ctx->m.dsp, ctx->qmatrix_c, ctx->qmatrix_c16, weight_matrix, - ctx->m.intra_quant_bias, 1, ctx->m.avctx->qmax, 1); + ff_convert_matrix(&ctx->m.dsp, ctx->qmatrix_c, ctx->qmatrix_c16, + weight_matrix, ctx->m.intra_quant_bias, 1, + ctx->m.avctx->qmax, 1); for (qscale = 1; qscale <= ctx->m.avctx->qmax; qscale++) { for (i = 0; i < 64; i++) { - ctx->qmatrix_l [qscale] [i] <<= 2; ctx->qmatrix_c [qscale] [i] <<= 2; - ctx->qmatrix_l16[qscale][0][i] <<= 2; ctx->qmatrix_l16[qscale][1][i] <<= 2; - ctx->qmatrix_c16[qscale][0][i] <<= 2; ctx->qmatrix_c16[qscale][1][i] <<= 2; + ctx->qmatrix_l[qscale][i] <<= 2; + ctx->qmatrix_c[qscale][i] <<= 2; + ctx->qmatrix_l16[qscale][0][i] <<= 2; + ctx->qmatrix_l16[qscale][1][i] <<= 2; + ctx->qmatrix_c16[qscale][0][i] <<= 2; + ctx->qmatrix_c16[qscale][1][i] <<= 2; } } } else { @@ -210,16 +238,21 @@ static av_cold int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias) for (i = 1; i < 64; i++) { int j = ctx->m.dsp.idct_permutation[ff_zigzag_direct[i]]; - // The quantization formula from the VC-3 standard is: - // quantized = sign(block[i]) * floor(abs(block[i]/s) * p / (qscale * weight_table[i])) - // Where p is 32 for 8-bit samples and 8 for 10-bit ones. - // The s factor compensates scaling of DCT coefficients done by the DCT routines, - // and therefore is not present in standard. It's 8 for 8-bit samples and 4 for 10-bit ones. - // We want values of ctx->qtmatrix_l and ctx->qtmatrix_r to be: - // ((1 << DNX10BIT_QMAT_SHIFT) * (p / s)) / (qscale * weight_table[i]) - // For 10-bit samples, p / s == 2 - ctx->qmatrix_l[qscale][j] = (1 << (DNX10BIT_QMAT_SHIFT + 1)) / (qscale * luma_weight_table[i]); - ctx->qmatrix_c[qscale][j] = (1 << (DNX10BIT_QMAT_SHIFT + 1)) / (qscale * chroma_weight_table[i]); + /* The quantization formula from the VC-3 standard is: + * quantized = sign(block[i]) * floor(abs(block[i]/s) * p / + * (qscale * weight_table[i])) + * Where p is 32 for 8-bit samples and 8 for 10-bit ones. + * The s factor compensates scaling of DCT coefficients done by + * the DCT routines, and therefore is not present in standard. + * It's 8 for 8-bit samples and 4 for 10-bit ones. + * We want values of ctx->qtmatrix_l and ctx->qtmatrix_r to be: + * ((1 << DNX10BIT_QMAT_SHIFT) * (p / s)) / + * (qscale * weight_table[i]) + * For 10-bit samples, p / s == 2 */ + ctx->qmatrix_l[qscale][j] = (1 << (DNX10BIT_QMAT_SHIFT + 1)) / + (qscale * luma_weight_table[i]); + ctx->qmatrix_c[qscale][j] = (1 << (DNX10BIT_QMAT_SHIFT + 1)) / + (qscale * chroma_weight_table[i]); } } } @@ -230,21 +263,23 @@ static av_cold int dnxhd_init_qmat(DNXHDEncContext *ctx, int lbias, int cbias) ctx->m.q_intra_matrix = ctx->qmatrix_l; return 0; - fail: +fail: return AVERROR(ENOMEM); } static av_cold int dnxhd_init_rc(DNXHDEncContext *ctx) { - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160*(ctx->m.avctx->qmax + 1)*sizeof(RCEntry), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_rc, 8160 * (ctx->m.avctx->qmax + 1) * sizeof(RCEntry), fail); if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD) - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_cmp, ctx->m.mb_num*sizeof(RCCMPEntry), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_cmp, + ctx->m.mb_num * sizeof(RCCMPEntry), fail); - ctx->frame_bits = (ctx->cid_table->coding_unit_size - 640 - 4 - ctx->min_padding) * 8; + ctx->frame_bits = (ctx->cid_table->coding_unit_size - + 640 - 4 - ctx->min_padding) * 8; ctx->qscale = 1; - ctx->lambda = 2<<LAMBDA_FRAC_BITS; // qscale 2 + ctx->lambda = 2 << LAMBDA_FRAC_BITS; // qscale 2 return 0; - fail: +fail: return AVERROR(ENOMEM); } @@ -261,13 +296,15 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) bit_depth = 10; break; default: - av_log(avctx, AV_LOG_ERROR, "pixel format is incompatible with DNxHD\n"); + av_log(avctx, AV_LOG_ERROR, + "pixel format is incompatible with DNxHD\n"); return AVERROR(EINVAL); } ctx->cid = ff_dnxhd_find_cid(avctx, bit_depth); if (!ctx->cid) { - av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD. Valid DNxHD profiles:\n"); + av_log(avctx, AV_LOG_ERROR, + "video parameters incompatible with DNxHD. Valid DNxHD profiles:\n"); ff_dnxhd_print_profiles(avctx, AV_LOG_ERROR); return AVERROR(EINVAL); } @@ -277,7 +314,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) av_assert0(index >= 0); ctx->cid_table = &ff_dnxhd_cid_table[index]; - ctx->m.avctx = avctx; + ctx->m.avctx = avctx; ctx->m.mb_intra = 1; ctx->m.h263_aic = 1; @@ -290,12 +327,12 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->m.dct_quantize = ff_dct_quantize_c; if (ctx->cid_table->bit_depth == 10) { - ctx->m.dct_quantize = dnxhd_10bit_dct_quantize; - ctx->get_pixels_8x4_sym = dnxhd_10bit_get_pixels_8x4_sym; - ctx->block_width_l2 = 4; + ctx->m.dct_quantize = dnxhd_10bit_dct_quantize; + ctx->get_pixels_8x4_sym = dnxhd_10bit_get_pixels_8x4_sym; + ctx->block_width_l2 = 4; } else { - ctx->get_pixels_8x4_sym = dnxhd_8bit_get_pixels_8x4_sym; - ctx->block_width_l2 = 3; + ctx->get_pixels_8x4_sym = dnxhd_8bit_get_pixels_8x4_sym; + ctx->block_width_l2 = 3; } if (ARCH_X86) @@ -305,7 +342,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->m.mb_width = (avctx->width + 15) / 16; if (avctx->flags & CODEC_FLAG_INTERLACED_DCT) { - ctx->interlaced = 1; + ctx->interlaced = 1; ctx->m.mb_height /= 2; } @@ -313,10 +350,12 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) ctx->m.intra_quant_bias = avctx->intra_quant_bias; - if ((ret = dnxhd_init_qmat(ctx, ctx->m.intra_quant_bias, 0)) < 0) // XXX tune lbias/cbias + // XXX tune lbias/cbias + if ((ret = dnxhd_init_qmat(ctx, ctx->m.intra_quant_bias, 0)) < 0) return ret; - // Avid Nitris hardware decoder requires a minimum amount of padding in the coding unit payload + /* Avid Nitris hardware decoder requires a minimum amount of padding + * in the coding unit payload */ if (ctx->nitris_compat) ctx->min_padding = 1600; @@ -325,10 +364,14 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) if ((ret = dnxhd_init_rc(ctx)) < 0) return ret; - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_size, ctx->m.mb_height*sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_offs, ctx->m.mb_height*sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_bits, ctx->m.mb_num *sizeof(uint16_t), fail); - FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_qscale, ctx->m.mb_num *sizeof(uint8_t), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_size, + ctx->m.mb_height * sizeof(uint32_t), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->slice_offs, + ctx->m.mb_height * sizeof(uint32_t), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_bits, + ctx->m.mb_num * sizeof(uint16_t), fail); + FF_ALLOCZ_OR_GOTO(ctx->m.avctx, ctx->mb_qscale, + ctx->m.mb_num * sizeof(uint8_t), fail); avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) @@ -349,32 +392,32 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->thread[0] = ctx; for (i = 1; i < avctx->thread_count; i++) { - ctx->thread[i] = av_malloc(sizeof(DNXHDEncContext)); + ctx->thread[i] = av_malloc(sizeof(DNXHDEncContext)); memcpy(ctx->thread[i], ctx, sizeof(DNXHDEncContext)); } return 0; - fail: //for FF_ALLOCZ_OR_GOTO +fail: // for FF_ALLOCZ_OR_GOTO return AVERROR(ENOMEM); } static int dnxhd_write_header(AVCodecContext *avctx, uint8_t *buf) { DNXHDEncContext *ctx = avctx->priv_data; - static const uint8_t header_prefix[5] = { 0x00,0x00,0x02,0x80,0x01 }; + static const uint8_t header_prefix[5] = { 0x00, 0x00, 0x02, 0x80, 0x01 }; memset(buf, 0, 640); memcpy(buf, header_prefix, 5); - buf[5] = ctx->interlaced ? ctx->cur_field+2 : 0x01; + buf[5] = ctx->interlaced ? ctx->cur_field + 2 : 0x01; buf[6] = 0x80; // crc flag off buf[7] = 0xa0; // reserved - AV_WB16(buf + 0x18, avctx->height>>ctx->interlaced); // ALPF + AV_WB16(buf + 0x18, avctx->height >> ctx->interlaced); // ALPF AV_WB16(buf + 0x1a, avctx->width); // SPL - AV_WB16(buf + 0x1d, avctx->height>>ctx->interlaced); // NAL + AV_WB16(buf + 0x1d, avctx->height >> ctx->interlaced); // NAL buf[0x21] = ctx->cid_table->bit_depth == 10 ? 0x58 : 0x38; - buf[0x22] = 0x88 + (ctx->interlaced<<2); + buf[0x22] = 0x88 + (ctx->interlaced << 2); AV_WB32(buf + 0x28, ctx->cid); // CID buf[0x2c] = ctx->interlaced ? 0 : 0x80; @@ -393,16 +436,19 @@ static av_always_inline void dnxhd_encode_dc(DNXHDEncContext *ctx, int diff) { int nbits; if (diff < 0) { - nbits = av_log2_16bit(-2*diff); + nbits = av_log2_16bit(-2 * diff); diff--; } else { - nbits = av_log2_16bit(2*diff); + nbits = av_log2_16bit(2 * diff); } put_bits(&ctx->m.pb, ctx->cid_table->dc_bits[nbits] + nbits, - (ctx->cid_table->dc_codes[nbits]<<nbits) + (diff & ((1 << nbits) - 1))); + (ctx->cid_table->dc_codes[nbits] << nbits) + + (diff & ((1 << nbits) - 1))); } -static av_always_inline void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, int last_index, int n) +static av_always_inline +void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, + int last_index, int n) { int last_non_zero = 0; int slevel, i, j; @@ -415,30 +461,34 @@ static av_always_inline void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *b slevel = block[j]; if (slevel) { int run_level = i - last_non_zero - 1; - int rlevel = (slevel<<1)|!!run_level; + int rlevel = (slevel << 1) | !!run_level; put_bits(&ctx->m.pb, ctx->vlc_bits[rlevel], ctx->vlc_codes[rlevel]); if (run_level) - put_bits(&ctx->m.pb, ctx->run_bits[run_level], ctx->run_codes[run_level]); + put_bits(&ctx->m.pb, ctx->run_bits[run_level], + ctx->run_codes[run_level]); last_non_zero = i; } } put_bits(&ctx->m.pb, ctx->vlc_bits[0], ctx->vlc_codes[0]); // EOB } -static av_always_inline void dnxhd_unquantize_c(DNXHDEncContext *ctx, int16_t *block, int n, int qscale, int last_index) +static av_always_inline +void dnxhd_unquantize_c(DNXHDEncContext *ctx, int16_t *block, int n, + int qscale, int last_index) { const uint8_t *weight_matrix; int level; int i; - weight_matrix = (n&2) ? ctx->cid_table->chroma_weight : ctx->cid_table->luma_weight; + weight_matrix = (n & 2) ? ctx->cid_table->chroma_weight + : ctx->cid_table->luma_weight; for (i = 1; i <= last_index; i++) { int j = ctx->m.intra_scantable.permutated[i]; level = block[j]; if (level) { if (level < 0) { - level = (1-2*level) * qscale * weight_matrix[i]; + level = (1 - 2 * level) * qscale * weight_matrix[i]; if (ctx->cid_table->bit_depth == 10) { if (weight_matrix[i] != 8) level += 8; @@ -450,7 +500,7 @@ static av_always_inline void dnxhd_unquantize_c(DNXHDEncContext *ctx, int16_t *b } level = -level; } else { - level = (2*level+1) * qscale * weight_matrix[i]; + level = (2 * level + 1) * qscale * weight_matrix[i]; if (ctx->cid_table->bit_depth == 10) { if (weight_matrix[i] != 8) level += 8; @@ -475,7 +525,8 @@ static av_always_inline int dnxhd_ssd_block(int16_t *qblock, int16_t *block) return score; } -static av_always_inline int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, int16_t *block, int last_index) +static av_always_inline +int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, int16_t *block, int last_index) { int last_non_zero = 0; int bits = 0; @@ -485,20 +536,25 @@ static av_always_inline int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, int16_t *bl level = block[j]; if (level) { int run_level = i - last_non_zero - 1; - bits += ctx->vlc_bits[(level<<1)|!!run_level]+ctx->run_bits[run_level]; + bits += ctx->vlc_bits[(level << 1) | + !!run_level] + ctx->run_bits[run_level]; last_non_zero = i; } } return bits; } -static av_always_inline void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, int mb_y) +static av_always_inline +void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, int mb_y) { const int bs = ctx->block_width_l2; const int bw = 1 << bs; - const uint8_t *ptr_y = ctx->thread[0]->src[0] + ((mb_y << 4) * ctx->m.linesize) + (mb_x << bs+1); - const uint8_t *ptr_u = ctx->thread[0]->src[1] + ((mb_y << 4) * ctx->m.uvlinesize) + (mb_x << bs); - const uint8_t *ptr_v = ctx->thread[0]->src[2] + ((mb_y << 4) * ctx->m.uvlinesize) + (mb_x << bs); + const uint8_t *ptr_y = ctx->thread[0]->src[0] + + ((mb_y << 4) * ctx->m.linesize) + (mb_x << bs + 1); + const uint8_t *ptr_u = ctx->thread[0]->src[1] + + ((mb_y << 4) * ctx->m.uvlinesize) + (mb_x << bs); + const uint8_t *ptr_v = ctx->thread[0]->src[2] + + ((mb_y << 4) * ctx->m.uvlinesize) + (mb_x << bs); DSPContext *dsp = &ctx->m.dsp; dsp->get_pixels(ctx->blocks[0], ptr_y, ctx->m.linesize); @@ -506,12 +562,20 @@ static av_always_inline void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, in dsp->get_pixels(ctx->blocks[2], ptr_u, ctx->m.uvlinesize); dsp->get_pixels(ctx->blocks[3], ptr_v, ctx->m.uvlinesize); - if (mb_y+1 == ctx->m.mb_height && ctx->m.avctx->height == 1080) { + if (mb_y + 1 == ctx->m.mb_height && ctx->m.avctx->height == 1080) { if (ctx->interlaced) { - ctx->get_pixels_8x4_sym(ctx->blocks[4], ptr_y + ctx->dct_y_offset, ctx->m.linesize); - ctx->get_pixels_8x4_sym(ctx->blocks[5], ptr_y + ctx->dct_y_offset + bw, ctx->m.linesize); - ctx->get_pixels_8x4_sym(ctx->blocks[6], ptr_u + ctx->dct_uv_offset, ctx->m.uvlinesize); - ctx->get_pixels_8x4_sym(ctx->blocks[7], ptr_v + ctx->dct_uv_offset, ctx->m.uvlinesize); + ctx->get_pixels_8x4_sym(ctx->blocks[4], + ptr_y + ctx->dct_y_offset, + ctx->m.linesize); + ctx->get_pixels_8x4_sym(ctx->blocks[5], + ptr_y + ctx->dct_y_offset + bw, + ctx->m.linesize); + ctx->get_pixels_8x4_sym(ctx->blocks[6], + ptr_u + ctx->dct_uv_offset, + ctx->m.uvlinesize); + ctx->get_pixels_8x4_sym(ctx->blocks[7], + ptr_v + ctx->dct_uv_offset, + ctx->m.uvlinesize); } else { dsp->clear_block(ctx->blocks[4]); dsp->clear_block(ctx->blocks[5]); @@ -519,20 +583,26 @@ static av_always_inline void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, in dsp->clear_block(ctx->blocks[7]); } } else { - dsp->get_pixels(ctx->blocks[4], ptr_y + ctx->dct_y_offset, ctx->m.linesize); - dsp->get_pixels(ctx->blocks[5], ptr_y + ctx->dct_y_offset + bw, ctx->m.linesize); - dsp->get_pixels(ctx->blocks[6], ptr_u + ctx->dct_uv_offset, ctx->m.uvlinesize); - dsp->get_pixels(ctx->blocks[7], ptr_v + ctx->dct_uv_offset, ctx->m.uvlinesize); + dsp->get_pixels(ctx->blocks[4], + ptr_y + ctx->dct_y_offset, ctx->m.linesize); + dsp->get_pixels(ctx->blocks[5], + ptr_y + ctx->dct_y_offset + bw, ctx->m.linesize); + dsp->get_pixels(ctx->blocks[6], + ptr_u + ctx->dct_uv_offset, ctx->m.uvlinesize); + dsp->get_pixels(ctx->blocks[7], + ptr_v + ctx->dct_uv_offset, ctx->m.uvlinesize); } } -static av_always_inline int dnxhd_switch_matrix(DNXHDEncContext *ctx, int i) +static av_always_inline +int dnxhd_switch_matrix(DNXHDEncContext *ctx, int i) { const static uint8_t component[8]={0,0,1,2,0,0,1,2}; return component[i]; } -static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) +static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, + int jobnr, int threadnr) { DNXHDEncContext *ctx = avctx->priv_data; int mb_y = jobnr, mb_x; @@ -558,13 +628,16 @@ static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, int jobnr, i int overflow, nbits, diff, last_index; int n = dnxhd_switch_matrix(ctx, i); - memcpy(block, src_block, 64*sizeof(*block)); - last_index = ctx->m.dct_quantize(&ctx->m, block, 4&(2*i), qscale, &overflow); - ac_bits += dnxhd_calc_ac_bits(ctx, block, last_index); + memcpy(block, src_block, 64 * sizeof(*block)); + last_index = ctx->m.dct_quantize(&ctx->m, block, 4 & (2*i), + qscale, &overflow); + ac_bits += dnxhd_calc_ac_bits(ctx, block, last_index); diff = block[0] - ctx->m.last_dc[n]; - if (diff < 0) nbits = av_log2_16bit(-2*diff); - else nbits = av_log2_16bit( 2*diff); + if (diff < 0) + nbits = av_log2_16bit(-2 * diff); + else + nbits = av_log2_16bit(2 * diff); av_assert1(nbits < ctx->cid_table->bit_depth + 4); dc_bits += ctx->cid_table->dc_bits[nbits] + nbits; @@ -577,18 +650,21 @@ static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, int jobnr, i ssd += dnxhd_ssd_block(block, src_block); } } - ctx->mb_rc[qscale][mb].ssd = ssd; - ctx->mb_rc[qscale][mb].bits = ac_bits+dc_bits+12+8*ctx->vlc_bits[0]; + ctx->mb_rc[qscale][mb].ssd = ssd; + ctx->mb_rc[qscale][mb].bits = ac_bits + dc_bits + 12 + + 8 * ctx->vlc_bits[0]; } return 0; } -static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) +static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, + int jobnr, int threadnr) { DNXHDEncContext *ctx = avctx->priv_data; int mb_y = jobnr, mb_x; ctx = ctx->thread[threadnr]; - init_put_bits(&ctx->m.pb, (uint8_t *)arg + 640 + ctx->slice_offs[jobnr], ctx->slice_size[jobnr]); + init_put_bits(&ctx->m.pb, (uint8_t *)arg + 640 + ctx->slice_offs[jobnr], + ctx->slice_size[jobnr]); ctx->m.last_dc[0] = ctx->m.last_dc[1] = @@ -598,21 +674,22 @@ static int dnxhd_encode_thread(AVCodecContext *avctx, void *arg, int jobnr, int int qscale = ctx->mb_qscale[mb]; int i; - put_bits(&ctx->m.pb, 12, qscale<<1); + put_bits(&ctx->m.pb, 12, qscale << 1); dnxhd_get_blocks(ctx, mb_x, mb_y); for (i = 0; i < 8; i++) { int16_t *block = ctx->blocks[i]; int overflow, n = dnxhd_switch_matrix(ctx, i); - int last_index = ctx->m.dct_quantize(&ctx->m, block, 4&(2*i), qscale, &overflow); - //START_TIMER; + int last_index = ctx->m.dct_quantize(&ctx->m, block, 4 & (2*i), + qscale, &overflow); + // START_TIMER; dnxhd_encode_block(ctx, block, last_index, n); - //STOP_TIMER("encode_block"); + // STOP_TIMER("encode_block"); } } - if (put_bits_count(&ctx->m.pb)&31) - put_bits(&ctx->m.pb, 32-(put_bits_count(&ctx->m.pb)&31), 0); + if (put_bits_count(&ctx->m.pb) & 31) + put_bits(&ctx->m.pb, 32 - (put_bits_count(&ctx->m.pb) & 31), 0); flush_put_bits(&ctx->m.pb); return 0; } @@ -629,14 +706,15 @@ static void dnxhd_setup_threads_slices(DNXHDEncContext *ctx) unsigned mb = mb_y * ctx->m.mb_width + mb_x; ctx->slice_size[mb_y] += ctx->mb_bits[mb]; } - ctx->slice_size[mb_y] = (ctx->slice_size[mb_y]+31)&~31; + ctx->slice_size[mb_y] = (ctx->slice_size[mb_y] + 31) & ~31; ctx->slice_size[mb_y] >>= 3; thread_size = ctx->slice_size[mb_y]; offset += thread_size; } } -static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) +static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, + int jobnr, int threadnr) { DNXHDEncContext *ctx = avctx->priv_data; int mb_y = jobnr, mb_x, x, y; @@ -645,9 +723,9 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int ctx = ctx->thread[threadnr]; if (ctx->cid_table->bit_depth == 8) { - uint8_t *pix = ctx->thread[0]->src[0] + ((mb_y<<4) * ctx->m.linesize); + uint8_t *pix = ctx->thread[0]->src[0] + ((mb_y << 4) * ctx->m.linesize); for (mb_x = 0; mb_x < ctx->m.mb_width; ++mb_x, pix += 16) { - unsigned mb = mb_y * ctx->m.mb_width + mb_x; + unsigned mb = mb_y * ctx->m.mb_width + mb_x; int sum; int varc; @@ -666,15 +744,16 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int } } } - varc = (varc - (((unsigned)sum * sum) >> 8) + 128) >> 8; + varc = (varc - (((unsigned) sum * sum) >> 8) + 128) >> 8; ctx->mb_cmp[mb].value = varc; - ctx->mb_cmp[mb].mb = mb; + ctx->mb_cmp[mb].mb = mb; } } else { // 10-bit int const linesize = ctx->m.linesize >> 1; for (mb_x = 0; mb_x < ctx->m.mb_width; ++mb_x) { - uint16_t *pix = (uint16_t*)ctx->thread[0]->src[0] + ((mb_y << 4) * linesize) + (mb_x << 4); + uint16_t *pix = (uint16_t *)ctx->thread[0]->src[0] + + ((mb_y << 4) * linesize) + (mb_x << 4); unsigned mb = mb_y * ctx->m.mb_width + mb_x; int sum = 0; int sqsum = 0; @@ -684,8 +763,8 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int for (i = 0; i < 16; ++i) { for (j = 0; j < 16; ++j) { // Turn 16-bit pixels into 10-bit ones. - int const sample = (unsigned)pix[j] >> 6; - sum += sample; + int const sample = (unsigned) pix[j] >> 6; + sum += sample; sqsum += sample * sample; // 2^10 * 2^10 * 16 * 16 = 2^28, which is less than INT_MAX } @@ -694,7 +773,7 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int mean = sum >> 8; // 16*16 == 2^8 sqmean = sqsum >> 8; ctx->mb_cmp[mb].value = sqmean - mean * mean; - ctx->mb_cmp[mb].mb = mb; + ctx->mb_cmp[mb].mb = mb; } } return 0; @@ -708,14 +787,15 @@ static int dnxhd_encode_rdo(AVCodecContext *avctx, DNXHDEncContext *ctx) for (q = 1; q < avctx->qmax; q++) { ctx->qscale = q; - avctx->execute2(avctx, dnxhd_calc_bits_thread, NULL, NULL, ctx->m.mb_height); + avctx->execute2(avctx, dnxhd_calc_bits_thread, + NULL, NULL, ctx->m.mb_height); } - up_step = down_step = 2<<LAMBDA_FRAC_BITS; - lambda = ctx->lambda; + up_step = down_step = 2 << LAMBDA_FRAC_BITS; + lambda = ctx->lambda; for (;;) { int bits = 0; - int end = 0; + int end = 0; if (lambda == last_higher) { lambda++; end = 1; // need to set final qscales/bits @@ -724,25 +804,26 @@ static int dnxhd_encode_rdo(AVCodecContext *avctx, DNXHDEncContext *ctx) for (x = 0; x < ctx->m.mb_width; x++) { unsigned min = UINT_MAX; int qscale = 1; - int mb = y*ctx->m.mb_width+x; + int mb = y * ctx->m.mb_width + x; for (q = 1; q < avctx->qmax; q++) { - unsigned score = ctx->mb_rc[q][mb].bits*lambda+ - ((unsigned)ctx->mb_rc[q][mb].ssd<<LAMBDA_FRAC_BITS); + unsigned score = ctx->mb_rc[q][mb].bits * lambda + + ((unsigned) ctx->mb_rc[q][mb].ssd << LAMBDA_FRAC_BITS); if (score < min) { - min = score; + min = score; qscale = q; } } bits += ctx->mb_rc[qscale][mb].bits; ctx->mb_qscale[mb] = qscale; - ctx->mb_bits[mb] = ctx->mb_rc[qscale][mb].bits; + ctx->mb_bits[mb] = ctx->mb_rc[qscale][mb].bits; } - bits = (bits+31)&~31; // padding + bits = (bits + 31) & ~31; // padding if (bits > ctx->frame_bits) break; } - //av_dlog(ctx->m.avctx, "lambda %d, up %u, down %u, bits %d, frame %d\n", - // lambda, last_higher, last_lower, bits, ctx->frame_bits); + // av_dlog(ctx->m.avctx, + // "lambda %d, up %u, down %u, bits %d, frame %d\n", + // lambda, last_higher, last_lower, bits, ctx->frame_bits); if (end) { if (bits > ctx->frame_bits) return AVERROR(EINVAL); @@ -791,7 +872,8 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx) bits = 0; ctx->qscale = qscale; // XXX avoid recalculating bits - ctx->m.avctx->execute2(ctx->m.avctx, dnxhd_calc_bits_thread, NULL, NULL, ctx->m.mb_height); + ctx->m.avctx->execute2(ctx->m.avctx, dnxhd_calc_bits_thread, + NULL, NULL, ctx->m.mb_height); for (y = 0; y < ctx->m.mb_height; y++) { for (x = 0; x < ctx->m.mb_width; x++) bits += ctx->mb_rc[qscale][y*ctx->m.mb_width+x].bits; @@ -799,8 +881,10 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx) if (bits > ctx->frame_bits) break; } - //av_dlog(ctx->m.avctx, "%d, qscale %d, bits %d, frame %d, higher %d, lower %d\n", - // ctx->m.avctx->frame_number, qscale, bits, ctx->frame_bits, last_higher, last_lower); + // av_dlog(ctx->m.avctx, + // "%d, qscale %d, bits %d, frame %d, higher %d, lower %d\n", + // ctx->m.avctx->frame_number, qscale, bits, ctx->frame_bits, + // last_higher, last_lower); if (bits < ctx->frame_bits) { if (qscale == 1) return 1; @@ -810,7 +894,7 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx) } last_lower = FFMIN(qscale, last_lower); if (last_higher != 0) - qscale = (qscale+last_higher)>>1; + qscale = (qscale + last_higher) >> 1; else qscale -= down_step++; if (qscale < 1) @@ -821,7 +905,7 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx) break; last_higher = FFMAX(qscale, last_higher); if (last_lower != INT_MAX) - qscale = (qscale+last_lower)>>1; + qscale = (qscale + last_lower) >> 1; else qscale += up_step++; down_step = 1; @@ -841,11 +925,12 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx) static inline int get_bucket(int value, int shift) { value >>= shift; - value &= NBUCKETS - 1; + value &= NBUCKETS - 1; return NBUCKETS - 1 - value; } -static void radix_count(const RCCMPEntry *data, int size, int buckets[RADIX_PASSES][NBUCKETS]) +static void radix_count(const RCCMPEntry *data, int size, + int buckets[RADIX_PASSES][NBUCKETS]) { int i, j; memset(buckets, 0, sizeof(buckets[0][0]) * RADIX_PASSES * NBUCKETS); @@ -865,12 +950,13 @@ static void radix_count(const RCCMPEntry *data, int size, int buckets[RADIX_PASS } } -static void radix_sort_pass(RCCMPEntry *dst, const RCCMPEntry *data, int size, int buckets[NBUCKETS], int pass) +static void radix_sort_pass(RCCMPEntry *dst, const RCCMPEntry *data, + int size, int buckets[NBUCKETS], int pass) { int shift = pass * BUCKET_BITS; int i; for (i = 0; i < size; i++) { - int v = get_bucket(data[i].value, shift); + int v = get_bucket(data[i].value, shift); int pos = buckets[v]++; dst[pos] = data[i]; } @@ -898,30 +984,35 @@ static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx) return ret; for (y = 0; y < ctx->m.mb_height; y++) { for (x = 0; x < ctx->m.mb_width; x++) { - int mb = y*ctx->m.mb_width+x; + int mb = y * ctx->m.mb_width + x; int delta_bits; ctx->mb_qscale[mb] = ctx->qscale; ctx->mb_bits[mb] = ctx->mb_rc[ctx->qscale][mb].bits; max_bits += ctx->mb_rc[ctx->qscale][mb].bits; if (!RC_VARIANCE) { - delta_bits = ctx->mb_rc[ctx->qscale][mb].bits-ctx->mb_rc[ctx->qscale+1][mb].bits; + delta_bits = ctx->mb_rc[ctx->qscale][mb].bits - + ctx->mb_rc[ctx->qscale + 1][mb].bits; ctx->mb_cmp[mb].mb = mb; - ctx->mb_cmp[mb].value = delta_bits ? - ((ctx->mb_rc[ctx->qscale][mb].ssd-ctx->mb_rc[ctx->qscale+1][mb].ssd)*100)/delta_bits - : INT_MIN; //avoid increasing qscale + ctx->mb_cmp[mb].value = + delta_bits ? ((ctx->mb_rc[ctx->qscale][mb].ssd - + ctx->mb_rc[ctx->qscale + 1][mb].ssd) * 100) / + delta_bits + : INT_MIN; // avoid increasing qscale } } - max_bits += 31; //worst padding + max_bits += 31; // worst padding } if (!ret) { if (RC_VARIANCE) - avctx->execute2(avctx, dnxhd_mb_var_thread, NULL, NULL, ctx->m.mb_height); + avctx->execute2(avctx, dnxhd_mb_var_thread, + NULL, NULL, ctx->m.mb_height); radix_sort(ctx->mb_cmp, ctx->m.mb_num); for (x = 0; x < ctx->m.mb_num && max_bits > ctx->frame_bits; x++) { int mb = ctx->mb_cmp[x].mb; - max_bits -= ctx->mb_rc[ctx->qscale][mb].bits - ctx->mb_rc[ctx->qscale+1][mb].bits; - ctx->mb_qscale[mb] = ctx->qscale+1; - ctx->mb_bits[mb] = ctx->mb_rc[ctx->qscale+1][mb].bits; + max_bits -= ctx->mb_rc[ctx->qscale][mb].bits - + ctx->mb_rc[ctx->qscale + 1][mb].bits; + ctx->mb_qscale[mb] = ctx->qscale + 1; + ctx->mb_bits[mb] = ctx->mb_rc[ctx->qscale + 1][mb].bits; } } return 0; @@ -956,7 +1047,7 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt, dnxhd_load_picture(ctx, frame); - encode_coding_unit: +encode_coding_unit: for (i = 0; i < 3; i++) { ctx->src[i] = frame->data[i]; if (ctx->interlaced && ctx->cur_field) @@ -987,14 +1078,15 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt, avctx->execute2(avctx, dnxhd_encode_thread, buf, NULL, ctx->m.mb_height); av_assert1(640 + offset + 4 <= ctx->cid_table->coding_unit_size); - memset(buf + 640 + offset, 0, ctx->cid_table->coding_unit_size - 4 - offset - 640); + memset(buf + 640 + offset, 0, + ctx->cid_table->coding_unit_size - 4 - offset - 640); AV_WB32(buf + ctx->cid_table->coding_unit_size - 4, 0x600DC0DE); // EOF if (ctx->interlaced && first_field) { first_field = 0; ctx->cur_field ^= 1; - buf += ctx->cid_table->coding_unit_size; + buf += ctx->cid_table->coding_unit_size; goto encode_coding_unit; } @@ -1008,11 +1100,11 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt, static av_cold int dnxhd_encode_end(AVCodecContext *avctx) { DNXHDEncContext *ctx = avctx->priv_data; - int max_level = 1<<(ctx->cid_table->bit_depth+2); + int max_level = 1 << (ctx->cid_table->bit_depth + 2); int i; - av_free(ctx->vlc_codes-max_level*2); - av_free(ctx->vlc_bits -max_level*2); + av_free(ctx->vlc_codes - max_level * 2); + av_free(ctx->vlc_bits - max_level * 2); av_freep(&ctx->run_codes); av_freep(&ctx->run_bits); @@ -1051,9 +1143,11 @@ AVCodec ff_dnxhd_encoder = { .encode2 = dnxhd_encode_picture, .close = dnxhd_encode_end, .capabilities = CODEC_CAP_SLICE_THREADS, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUV422P10, - AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_NONE + }, .priv_class = &dnxhd_class, .defaults = dnxhd_defaults, }; |