ref: 8d00562fba7827b61496ad20580d19038e047fb9
parent: 4341e5af66c92531fcd3f3e66ac18e70b3752ca9
parent: a5cd42feb9d5944cbc4043aca2829ef78e270431
author: Johann <johannkoenig@google.com>
date: Mon Oct 17 05:21:31 EDT 2011
Merge "Fix: vp8cx_pack_tokens_into_partitions_armv5 crash"
--- a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
+++ b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
@@ -65,7 +65,7 @@
numparts_loop
ldr r10, [sp, #40] ; ptr
ldr r5, [sp, #36] ; move mb_rows to the counting section
- sub r5, r5, r11 ; move start point with each partition
+ subs r5, r5, r11 ; move start point with each partition
; mb_rows starts at i
str r5, [sp, #12]
@@ -80,6 +80,8 @@
str r2, [r0, #vp8_writer_pos]
str r10, [r0, #vp8_writer_buffer]
+ ble end_partition ; if (mb_rows <= 0) end partition
+
mb_row_loop
ldr r1, [r7, #tokenlist_start]
@@ -344,6 +346,7 @@
str r6, [sp, #12]
bgt mb_row_loop
+end_partition
mov r12, #32
stop_encode_loop
--
⑨