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
310310
311311 nb_coefs = FFMIN(s->nb_coefs[0], s->nb_coefs[1]);
312312
313− s->blocks[0].new_rematrixing_strategy = 1;
314313 for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) {
315314 block = &s->blocks[blk];
315+ block->new_rematrixing_strategy = !blk;
316316 for (bnd = 0; bnd < 4; bnd++) {
317317 /* calculate calculate sum of squared coeffs for one band in one block */
318318 int start = ff_ac3_rematrix_band_tab[bnd];
@@ -337,7 +337,6 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) · 18 unmodified lines
337337
338338 /* determine if new rematrixing flags will be sent */
339339 if (blk &&
340− !block->new_rematrixing_strategy &&
341340 block->rematrixing_flags[bnd] != block0->rematrixing_flags[bnd]) {
342341 block->new_rematrixing_strategy = 1;
343342 }
tests/ref/acodec/ac3_fixed+1−1
@@ -1,2 +1,2 @@
1−f8eddf3c4e119bcb2aa89a76d7461259 *./tests/data/acodec/ac3.rm
1+07bd593823ebd721b3a32ef298bdfc20 *./tests/data/acodec/ac3.rm
22 98751 ./tests/data/acodec/ac3.rm
tests/ref/seek/ac3_rm+20−10
@@ -1,13 +1,17 @@
11 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
22 ret: 0 st:-1 flags:0 ts:-1.000000
33 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
4−ret:-1 st:-1 flags:1 ts: 1.894167
5−ret:-1 st: 0 flags:0 ts: 0.788000
4+ret: 0 st:-1 flags:1 ts: 1.894167
5+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
6+ret: 0 st: 0 flags:0 ts: 0.788000
7+ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
68 ret: 0 st: 0 flags:1 ts:-0.317000
79 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
8−ret:-1 st:-1 flags:0 ts: 2.576668
10+ret: 0 st:-1 flags:0 ts: 2.576668
11+ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
912 ret:-1 st:-1 flags:1 ts: 1.470835
10−ret:-1 st: 0 flags:0 ts: 0.365000
13+ret: 0 st: 0 flags:0 ts: 0.365000
14+ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
1115 ret: 0 st: 0 flags:1 ts:-0.741000
1216 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
1317 ret:-1 st:-1 flags:0 ts: 2.153336
@@ -16,20 +20,26 @@ ret: 0 st: 0 flags:0 ts:-0.058000 · 2 unmodified lines
1620 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
1721 ret:-1 st: 0 flags:1 ts: 2.836000
1822 ret:-1 st:-1 flags:0 ts: 1.730004
19−ret:-1 st:-1 flags:1 ts: 0.624171
23+ret: 0 st:-1 flags:1 ts: 0.624171
24+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
2025 ret: 0 st: 0 flags:0 ts:-0.482000
2126 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
22−ret:-1 st: 0 flags:1 ts: 2.413000
27+ret: 0 st: 0 flags:1 ts: 2.413000
28+ret: 0 st: 0 flags:1 dts: 2.229000 pts: 2.229000 pos: 36705 size: 556
2329 ret:-1 st:-1 flags:0 ts: 1.306672
24−ret:-1 st:-1 flags:1 ts: 0.200839
30+ret: 0 st:-1 flags:1 ts: 0.200839
31+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
2532 ret: 0 st: 0 flags:0 ts:-0.905000
2633 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
2734 ret:-1 st: 0 flags:1 ts: 1.989000
28−ret:-1 st:-1 flags:0 ts: 0.883340
35+ret: 0 st:-1 flags:0 ts: 0.883340
36+ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
2937 ret: 0 st:-1 flags:1 ts:-0.222493
3038 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 271 size: 556
31−ret:-1 st: 0 flags:0 ts: 2.672000
39+ret: 0 st: 0 flags:0 ts: 2.672000
40+ret: 0 st: 0 flags:1 dts:6354.691000 pts:6354.691000 pos: 10783 size: 304
3241 ret:-1 st: 0 flags:1 ts: 1.566000
33−ret:-1 st:-1 flags:0 ts: 0.460008
42+ret: 0 st:-1 flags:0 ts: 0.460008
43+ret: 0 st: 0 flags:1 dts:4160806.587000 pts:4160806.587000 pos: 3883 size: 116
3444 ret: 0 st:-1 flags:1 ts:-0.645825
3545 ret: 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