Note some more platforms where float-approx is tested, fix a bug in the prediction...
authorGregory Maxwell <greg@xiph.org>
Mon, 29 Jun 2009 16:48:57 +0000 (12:48 -0400)
committerGregory Maxwell <greg@xiph.org>
Mon, 29 Jun 2009 16:48:57 +0000 (12:48 -0400)
and remove some dead code from bands.c.

configure.ac
libcelt/bands.c
libcelt/celt.c

index b0a4f18..c9f399f 100644 (file)
@@ -93,7 +93,7 @@ AC_DEFINE_UNQUOTED(CELT_EXTRA_VERSION, "${CELT_EXTRA_VERSION}", [Version extra])
 
 has_float_approx=no
 #case "$host_cpu" in
 
 has_float_approx=no
 #case "$host_cpu" in
-#i[[3456]]86 | x86_64)
+#i[[3456]]86 | x86_64 | powerpc64 | powerpc32 | ia64)
 #  has_float_approx=yes
 #  ;;
 #esac    
 #  has_float_approx=yes
 #  ;;
 #esac    
index 59edb78..7b1fe30 100644 (file)
@@ -916,7 +916,6 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
             int enabled = 1;
             pband++;
             if (remaining_bits >= 1<<BITRES) {
             int enabled = 1;
             pband++;
             if (remaining_bits >= 1<<BITRES) {
-               enabled = pgains[pband] > QCONST16(.5,15);
                enabled = ec_dec_bits(dec, 1);
                balance += 1<<BITRES;
             }
                enabled = ec_dec_bits(dec, 1);
                balance += 1<<BITRES;
             }
@@ -1019,7 +1018,6 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
          int enabled = 1;
          pband++;
          if (remaining_bits >= 1<<BITRES) {
          int enabled = 1;
          pband++;
          if (remaining_bits >= 1<<BITRES) {
-            enabled = pgains[pband] > QCONST16(.5,15);
             enabled = ec_dec_bits(dec, 1);
             balance += 1<<BITRES;
          }
             enabled = ec_dec_bits(dec, 1);
             balance += 1<<BITRES;
          }
index 98bf4bf..5d32fdc 100644 (file)
@@ -1016,7 +1016,7 @@ int celt_encoder_ctl(CELTEncoder * restrict st, int request, ...)
          {
             st->force_intra   = 1;
             st->pitch_permitted = 0;
          {
             st->force_intra   = 1;
             st->pitch_permitted = 0;
-         } else if (value=1) {
+         } else if (value==1) {
             st->force_intra   = 0;
             st->pitch_permitted = 0;
          } else {
             st->force_intra   = 0;
             st->pitch_permitted = 0;
          } else {