History

ac3enc: fix bug in stereo rematrixing decision.

The rematrixing strategy reuse flags are not reset between frames, so they need to be initialized for all blocks, not just block 0.

Justin Ruggles committed 15 years ago

Commit 6159bd01 parent ee60e043 files · +22 −13Browse files

Unified · Split

3 files
  1. libavcodec/ac3enc.c +1 −2
  2. tests/ref/acodec/ac3_fixed +1 −1
  3. tests/ref/seek/ac3_rm +20 −10
libavcodec/ac3enc.c+1−2
@@ -310,9 +310,9 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) · 309 unmodified lines
310 310
311 nb_coefs = FFMIN(s->nb_coefs[0], s->nb_coefs[1]);311 nb_coefs = FFMIN(s->nb_coefs[0], s->nb_coefs[1]);
312 312
313 s->blocks[0].new_rematrixing_strategy = 1;
314 for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {313 for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
315 block = &s->blocks[blk];314 block = &s->blocks[blk];
315 block->new_rematrixing_strategy = !blk;
316 for (bnd = 0; bnd < 4; bnd++) {316 for (bnd = 0; bnd < 4; bnd++) {
317 /* calculate calculate sum of squared coeffs for one band in one block */317 /* calculate calculate sum of squared coeffs for one band in one block */
318 int start = ff_ac3_rematrix_band_tab[bnd];318 int start = ff_ac3_rematrix_band_tab[bnd];
@@ -337,7 +337,6 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) · 18 unmodified lines
337 337
338 /* determine if new rematrixing flags will be sent */338 /* determine if new rematrixing flags will be sent */
339 if (blk &&339 if (blk &&
340 !block->new_rematrixing_strategy &&
341 block->rematrixing_flags[bnd] != block0->rematrixing_flags[bnd]) {340 block->rematrixing_flags[bnd] != block0->rematrixing_flags[bnd]) {
342 block->new_rematrixing_strategy = 1;341 block->new_rematrixing_strategy = 1;
343 }342 }
tests/ref/acodec/ac3_fixed+1−1
@@ -1,2 +1,2 @@
1f8eddf3c4e119bcb2aa89a76d7461259 *./tests/data/acodec/ac3.rm107bd593823ebd721b3a32ef298bdfc20 *./tests/data/acodec/ac3.rm
298751 ./tests/data/acodec/ac3.rm298751 ./tests/data/acodec/ac3.rm
tests/ref/seek/ac3_rm+20−10
@@ -1,13 +1,17 @@
1ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 5561ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
2ret: 0 st:-1 flags:0 ts:-1.0000002ret: 0 st:-1 flags:0 ts:-1.000000
3ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 5563ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
4ret:-1 st:-1 flags:1 ts: 1.8941674ret: 0 st:-1 flags:1 ts: 1.894167
5ret:-1 st: 0 flags:0 ts: 0.7880005ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
6ret: 0 st: 0 flags:0 ts: 0.788000
7ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
6ret: 0 st: 0 flags:1 ts:-0.3170008ret: 0 st: 0 flags:1 ts:-0.317000
7ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 5569ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
8ret:-1 st:-1 flags:0 ts: 2.57666810ret: 0 st:-1 flags:0 ts: 2.576668
11ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
9ret:-1 st:-1 flags:1 ts: 1.47083512ret:-1 st:-1 flags:1 ts: 1.470835
10ret:-1 st: 0 flags:0 ts: 0.36500013ret: 0 st: 0 flags:0 ts: 0.365000
14ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
11ret: 0 st: 0 flags:1 ts:-0.74100015ret: 0 st: 0 flags:1 ts:-0.741000
12ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55616ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
13ret:-1 st:-1 flags:0 ts: 2.15333617ret:-1 st:-1 flags:0 ts: 2.153336
@@ -16,20 +20,26 @@ ret: 0 st: 0 flags:0 ts:-0.058000 · 2 unmodified lines
16ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55620ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
17ret:-1 st: 0 flags:1 ts: 2.83600021ret:-1 st: 0 flags:1 ts: 2.836000
18ret:-1 st:-1 flags:0 ts: 1.73000422ret:-1 st:-1 flags:0 ts: 1.730004
19ret:-1 st:-1 flags:1 ts: 0.62417123ret: 0 st:-1 flags:1 ts: 0.624171
24ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
20ret: 0 st: 0 flags:0 ts:-0.48200025ret: 0 st: 0 flags:0 ts:-0.482000
21ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55626ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
22ret:-1 st: 0 flags:1 ts: 2.41300027ret: 0 st: 0 flags:1 ts: 2.413000
28ret: 0 st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos: 36705 size: 556
23ret:-1 st:-1 flags:0 ts: 1.30667229ret:-1 st:-1 flags:0 ts: 1.306672
24ret:-1 st:-1 flags:1 ts: 0.20083930ret: 0 st:-1 flags:1 ts: 0.200839
31ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
25ret: 0 st: 0 flags:0 ts:-0.90500032ret: 0 st: 0 flags:0 ts:-0.905000
26ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55633ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
27ret:-1 st: 0 flags:1 ts: 1.98900034ret:-1 st: 0 flags:1 ts: 1.989000
28ret:-1 st:-1 flags:0 ts: 0.88334035ret: 0 st:-1 flags:0 ts: 0.883340
36ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
29ret: 0 st:-1 flags:1 ts:-0.22249337ret: 0 st:-1 flags:1 ts:-0.222493
30ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55638ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
31ret:-1 st: 0 flags:0 ts: 2.67200039ret: 0 st: 0 flags:0 ts: 2.672000
40ret: 0 st: 0 flags:1 dts:6354.691000 pts:6354.691000 pos: 10783 size: 304
32ret:-1 st: 0 flags:1 ts: 1.56600041ret:-1 st: 0 flags:1 ts: 1.566000
33ret:-1 st:-1 flags:0 ts: 0.46000842ret: 0 st:-1 flags:0 ts: 0.460008
43ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
34ret: 0 st:-1 flags:1 ts:-0.64582544ret: 0 st:-1 flags:1 ts:-0.645825
35ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 55645ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556

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