From: Attila Nagy <attilanagy@google.com>
Date: Mon, 17 Jan 2011 11:00:08 +0000 (+0200)
Subject: Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5
X-Git-Tag: v0.9.6~89^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bf235a4c92efdd622c59a622ab03dd081012089;p=libvpx

Fix issue 262, vp8cx_pack_tokens_into_partitions_armv5

http://code.google.com/p/webm/issues/detail?id=262
Function was asuming that partitions have equal amount of mb_rows,
which is not always true.

Change-Id: I59ed40117fd408392a85c633beeb5340ed2f4b25
---

diff --git a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
index 57cd318ee..42dae13de 100644
--- a/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
+++ b/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm
@@ -65,6 +65,8 @@
 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
+                                        ; mb_rows starts at i
     str     r5,  [sp, #12]
 
     ; Reset all of the VP8 Writer data for each partition that