[xiph-cvs] cvs commit: speex/src speexdec.c

[Jean-Marc Valin]

jm          03/01/17 00:15:08

  Modified:    libspeex vbr.c vbr.h
               src      speexdec.c
  Log:
  oops... last minute fixes

Revision  Changes    Path
1.21      +1 -1      speex/libspeex/vbr.c

Index: vbr.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/vbr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vbr.c	15 Jan 2003 07:51:45 -0000	1.20
+++ vbr.c	17 Jan 2003 05:15:08 -0000	1.21
@@ -42,7 +42,7 @@
 #define NOISE_POW .3
 
 
-float vbr_nb_thresh[8][11]={
+float vbr_nb_thresh[9][11]={
    {-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0}, /*   CNG   */
    { 3.5,  2.5,  2.0,  1.2,  0.5,  0.0, -0.5, -0.7, -0.8, -0.9, -1.0}, /*  2 kbps */
    {10.0,  6.5,  5.2,  4.5,  3.9,  3.5,  3.0,  2.5,  2.3,  1.8,  1.0}, /*  6 kbps */

<p><p>1.10      +1 -1      speex/libspeex/vbr.h

Index: vbr.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/vbr.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vbr.h	30 Nov 2002 05:24:41 -0000	1.9
+++ vbr.h	17 Jan 2003 05:15:08 -0000	1.10
@@ -38,7 +38,7 @@
 
 #define VBR_MEMORY_SIZE 5
 
-extern float vbr_nb_thresh[8][11];
+extern float vbr_nb_thresh[9][11];
 extern float vbr_hb_thresh[5][11];
 extern float vbr_uhb_thresh[2][11];
 

<p><p>1.73      +1 -1      speex/src/speexdec.c

Index: speexdec.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- speexdec.c	13 Jan 2003 22:29:41 -0000	1.72
+++ speexdec.c	17 Jan 2003 05:15:08 -0000	1.73
@@ -282,7 +282,7 @@
       modeID = forceMode;
    mode = speex_mode_list[modeID];
    
-   if (header->speex_version_id != 1)
+   if (header->speex_version_id > 1)
    {
       fprintf (stderr, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", header->speex_version_id);
       return NULL;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.