History

avcodec/proresenc_anatoliy: rework encode_ac_coeffs() prototype

This makes the prototype closer to the function of the same name in proresenc_kostya.

Clément Bœsch committed 2 years ago

Commit 29fd3f71 parent 35431001 file · +5 −4Browse files

Unified · Split

libavcodec/proresenc_anatoliy.c+5−4
@@ -282,8 +282,9 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, · 281 unmodified lines
282 }282 }
283}283}
284 284
285static void encode_ac_coeffs(PutBitContext *pb,285static void encode_acs(PutBitContext *pb, int16_t *blocks,
286 int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64])286 int blocks_per_slice,
287 int *qmat, const uint8_t ff_prores_scan[64])
287{288{
288 int prev_run = 4;289 int prev_run = 4;
289 int prev_level = 2;290 int prev_level = 2;
@@ -292,7 +293,7 @@ static void encode_ac_coeffs(PutBitContext *pb, · 2 unmodified lines
292 for (i = 1; i < 64; i++) {293 for (i = 1; i < 64; i++) {
293 int indp = ff_prores_scan[i];294 int indp = ff_prores_scan[i];
294 for (j = 0; j < blocks_per_slice; j++) {295 for (j = 0; j < blocks_per_slice; j++) {
295 int val = (in[(j << 6) + indp]) / qmat[indp];296 int val = (blocks[(j << 6) + indp]) / qmat[indp];
296 if (val) {297 if (val) {
297 encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run);298 encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run);
298 299
@@ -378,7 +379,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig · 79 unmodified lines
378 init_put_bits(&pb, buf, buf_size);379 init_put_bits(&pb, buf, buf_size);
379 380
380 encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]);381 encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]);
381 encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan);382 encode_acs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan);
382 383
383 flush_put_bits(&pb);384 flush_put_bits(&pb);
384 return put_bits_ptr(&pb) - pb.buf;385 return put_bits_ptr(&pb) - pb.buf;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t