virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

dnxhd: replace asserts by av_asserts

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-01 12:14:03 +02:00
parent e6866b1c67
commit 422418b664
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/dnxhdenc.c
View File

@ -127,7 +127,7 @@ static int dnxhd_init_vlc(DNXHDEncContext *ctx)
if (ctx->cid_table->ac_level[j] >> 1 == alevel && if (ctx->cid_table->ac_level[j] >> 1 == alevel &&
(!offset || (ctx->cid_table->ac_flags[j] & 1) && offset) && (!offset || (ctx->cid_table->ac_flags[j] & 1) && offset) &&
(!run || (ctx->cid_table->ac_flags[j] & 2) && run)) { (!run || (ctx->cid_table->ac_flags[j] & 2) && run)) {
assert(!ctx->vlc_codes[index]); av_assert1(!ctx->vlc_codes[index]);
if (alevel) { if (alevel) {
ctx->vlc_codes[index] = (ctx->cid_table->ac_codes[j]<<1)|(sign&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; ctx->vlc_bits [index] = ctx->cid_table->ac_bits[j]+1;
@ -138,7 +138,7 @@ static int dnxhd_init_vlc(DNXHDEncContext *ctx)
break; break;
} }
} }
assert(!alevel || j < 257); av_assert0(!alevel || j < 257);
if (offset) { if (offset) {
ctx->vlc_codes[index] = (ctx->vlc_codes[index]<<ctx->cid_table->index_bits)|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_bits [index]+= ctx->cid_table->index_bits;
@ -147,7 +147,7 @@ static int dnxhd_init_vlc(DNXHDEncContext *ctx)
} }
for (i = 0; i < 62; i++) { for (i = 0; i < 62; i++) {
int run = ctx->cid_table->run[i]; int run = ctx->cid_table->run[i];
assert(run < 63); av_assert0(run < 63);
ctx->run_codes[run] = ctx->cid_table->run_codes[i]; 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];
} }
@ -542,7 +542,7 @@ static int dnxhd_calc_bits_thread(AVCodecContext *avctx, void *arg, int jobnr, i
if (diff < 0) nbits = av_log2_16bit(-2*diff); if (diff < 0) nbits = av_log2_16bit(-2*diff);
else nbits = av_log2_16bit( 2*diff); else nbits = av_log2_16bit( 2*diff);
assert(nbits < ctx->cid_table->bit_depth + 4); av_assert1(nbits < ctx->cid_table->bit_depth + 4);
dc_bits += ctx->cid_table->dc_bits[nbits] + nbits; dc_bits += ctx->cid_table->dc_bits[nbits] + nbits;
ctx->m.last_dc[n] = block[0]; ctx->m.last_dc[n] = block[0];
@ -810,13 +810,13 @@ static void radix_count(const RCCMPEntry *data, int size, int buckets[RADIX_PASS
buckets[j][get_bucket(v, 0)]++; buckets[j][get_bucket(v, 0)]++;
v >>= BUCKET_BITS; v >>= BUCKET_BITS;
} }
assert(!v); av_assert1(!v);
} }
for (j = 0; j < RADIX_PASSES; j++) { for (j = 0; j < RADIX_PASSES; j++) {
int offset = size; int offset = size;
for (i = NBUCKETS - 1; i >= 0; i--) for (i = NBUCKETS - 1; i >= 0; i--)
buckets[j][i] = offset -= buckets[j][i]; buckets[j][i] = offset -= buckets[j][i];
assert(!buckets[j][0]); av_assert1(!buckets[j][0]);
} }
} }
@ -941,12 +941,12 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
for (i = 0; i < ctx->m.mb_height; i++) { for (i = 0; i < ctx->m.mb_height; i++) {
AV_WB32(ctx->msip + i * 4, offset); AV_WB32(ctx->msip + i * 4, offset);
offset += ctx->slice_size[i]; offset += ctx->slice_size[i];
assert(!(ctx->slice_size[i] & 3)); av_assert1(!(ctx->slice_size[i] & 3));
} }
avctx->execute2(avctx, dnxhd_encode_thread, buf, NULL, ctx->m.mb_height); avctx->execute2(avctx, dnxhd_encode_thread, buf, NULL, ctx->m.mb_height);
assert(640 + offset + 4 <= ctx->cid_table->coding_unit_size); 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 AV_WB32(buf + ctx->cid_table->coding_unit_size - 4, 0x600DC0DE); // EOF