This function was broken when the start bin was not at the start of a band.
Unified · Split
| @@ -34,24 +34,23 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 · 33 unmodified lines | |||
| 34 | add r0, r0, r4, lsl #1 @ mask + band | 34 | add r0, r0, r4, lsl #1 @ mask + band |
| 35 | add r4, lr, r4 | 35 | add r4, lr, r4 |
| 36 | add r7, r7, r2 @ bap + start | 36 | add r7, r7, r2 @ bap + start |
| 37 | ldrb r10, [r4], #1 | ||
| 38 | 1: | 37 | 1: |
| 39 | ldrsh r9, [r0], #2 @ mask[band] | 38 | ldrsh r9, [r0], #2 @ mask[band] |
| 40 | mov r8, #0xff0 | 39 | mov r8, #0xff0 |
| 41 | sub r9, r9, r12 @ - snr_offset | 40 | sub r9, r9, r12 @ - snr_offset |
| 42 | mov r11, r10 | 41 | ldrb r10, [r4, #1]! @ band_start_tab[++band] |
| 43 | ldrb r10, [r4], #1 @ band_start_tab[band++] | ||
| 44 | subs r9, r9, r5 @ - floor | 42 | subs r9, r9, r5 @ - floor |
| 45 | it lt | 43 | it lt |
| 46 | movlt r9, #0 | 44 | movlt r9, #0 |
| 47 | cmp r10, r3 @ - end | 45 | cmp r10, r3 @ - end |
| 48 | and r9, r9, r8, lsl #1 @ & 0x1fe0 | 46 | and r9, r9, r8, lsl #1 @ & 0x1fe0 |
| 49 | ite gt | 47 | ite gt |
| 50 | subgt r8, r3, r11 | 48 | subgt r8, r3, r2 |
| 51 | suble r8, r10, r11 | 49 | suble r8, r10, r2 |
| 50 | mov r2, r10 | ||
| 52 | add r9, r9, r5 @ + floor => m | 51 | add r9, r9, r5 @ + floor => m |
| 53 | tst r8, #1 | 52 | tst r8, #1 |
| 54 | add r2, r7, r8 | 53 | add r11, r7, r8 |
| 55 | bne 3f | 54 | bne 3f |
| 56 | b 5f | 55 | b 5f |
| 57 | 2: | 56 | 2: |
| @@ -65,9 +64,9 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 · 7 unmodified lines | |||
| 65 | ldrb lr, [r6, lr] | 64 | ldrb lr, [r6, lr] |
| 66 | strb r8, [r7], #1 @ bap[bin] | 65 | strb r8, [r7], #1 @ bap[bin] |
| 67 | strb lr, [r7], #1 | 66 | strb lr, [r7], #1 |
| 68 | 5: cmp r7, r2 | 67 | 5: cmp r7, r11 |
| 69 | blo 2b | 68 | blo 2b |
| 70 | cmp r3, r11 | 69 | cmp r3, r10 |
| 71 | bgt 1b | 70 | bgt 1b |
| 72 | pop {r4-r11,pc} | 71 | pop {r4-r11,pc} |
| 73 | 3: | 72 | 3: |