Mercurial > libavcodec.hg

changeset 11671:7f301b81b503 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the SBR patch count check to prevent overwrites. Thanks to Chromium.
author alexc
date Fri, 30 Apr 2010 23:08:44 +0000
parents 53584d5f86b8
children f838fa3eefee
files aacsbr.c
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/aacsbr.c	Fri Apr 30 22:42:52 2010 +0000
+++ b/aacsbr.c	Fri Apr 30 23:08:44 2010 +0000
@@ -519,6 +519,15 @@
             odd = (sb + sbr->k[0]) & 1;
         }
 
+        // Requirements (14496-3 sp04 p205) sets the maximum number of patches to 5.
+        // After this check the final number of patches can still be six which is
+        // illegal however the Coding Technologies decoder check stream has a final
+        // count of 6 patches
+        if (sbr->num_patches > 5) {
+            av_log(ac->avccontext, AV_LOG_ERROR, "Too many patches: %d\n", sbr->num_patches);
+            return -1;
+        }
+
         sbr->patch_num_subbands[sbr->num_patches]  = FFMAX(sb - usb, 0);
         sbr->patch_start_subband[sbr->num_patches] = sbr->k[0] - odd - sbr->patch_num_subbands[sbr->num_patches];
 
@@ -536,13 +545,6 @@
     if (sbr->patch_num_subbands[sbr->num_patches-1] < 3 && sbr->num_patches > 1)
         sbr->num_patches--;
 
-    // Requirements (14496-3 sp04 p205) sets the maximum number of patches to 5
-    // However the Coding Technologies decoder check uses 6 patches
-    if (sbr->num_patches > 6) {
-        av_log(ac->avccontext, AV_LOG_ERROR, "Too many patches: %d\n", sbr->num_patches);
-        return -1;
-    }
-
     return 0;
 }