ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6

This function was broken when the start bin was not at the start of a band.

Mans Rullgard committed 14 years ago

Commit cd2f98f1 parent 148bc231 file · +7 −8Browse files

Unified · Split

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

Keyboard shortcuts