Mercurial > libavcodec.hg

changeset 11153:3827267cc207 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move branch based on custom mode outside the loop
author conrad
date Sat, 13 Feb 2010 18:59:21 +0000
parents b3ff7fcfffc4
children c11bcf7e3e6b
files vp3.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/vp3.c	Sat Feb 13 18:55:27 2010 +0000
+++ b/vp3.c	Sat Feb 13 18:59:21 2010 +0000
@@ -648,6 +648,7 @@
     int current_fragment;
     int coding_mode;
     int custom_mode_alphabet[CODING_MODE_COUNT];
+    const int *alphabet;
 
     if (s->keyframe) {
         for (i = 0; i < s->fragment_count; i++)
@@ -664,7 +665,9 @@
                 custom_mode_alphabet[i] = MODE_INTER_NO_MV;
             for (i = 0; i < 8; i++)
                 custom_mode_alphabet[get_bits(gb, 3)] = i;
-        }
+            alphabet = custom_mode_alphabet;
+        } else
+            alphabet = ModeAlphabet[scheme-1];
 
         /* iterate through all of the macroblocks that contain 1 or more
          * coded fragments */
@@ -697,11 +700,8 @@
                 /* mode 7 means get 3 bits for each coding mode */
                 if (scheme == 7)
                     coding_mode = get_bits(gb, 3);
-                else if(scheme == 0)
-                    coding_mode = custom_mode_alphabet
-                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
                 else
-                    coding_mode = ModeAlphabet[scheme-1]
+                    coding_mode = alphabet
                         [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
 
                 s->macroblock_coding[current_macroblock] = coding_mode;