Changeset 47 for mppenc/branches/zorg

Timestamp:

09/23/06 14:52:51 (18 years ago)

Author:

zorg

Message:

Fix project

Location:

mppenc/branches/zorg

Files:

• bin (added)
• src/config.h (added)
• src/encode_sv7.c (modified) (6 diffs)
• src/mpp.h (added)
• src/mppdec.h (added)
• src/profile.h (added)
• win32/mppenc.sln (added)
• win32/mppenc.vcproj (added)

mppenc/branches/zorg/src/encode_sv7.c

@@ -93 +93 @@
     WriteBits ( 1            ,  1 );    // true gapless: used?
     WriteBits ( SamplesRest  , 11 );    // true gapless: valid samples in last frame
-    WriteBits ( 0            , 20 );
+    WriteBits ( 1            , 1 );             // we now support fast seeking
+    WriteBits ( 0            , 19 );
 
     WriteBits ( (MPPENC_VERSION[0]&15)*100 + (MPPENC_VERSION[2]&15)*10 + (MPPENC_VERSION[3]&15),
@@ -109 +110 @@
 #define ENCODE_SCF1( new, old, rll )                         \
         d = new - old + 7;                                   \
-        if ( d <= 14u  &&  (rll < 32  || (int)new < 0 ) ) {  \
+        if ( d <= 14u  && rll < 32) {                        \
             WriteBits ( Table[d].Code, Table[d].Length );    \
         }                                                    \
@@ -242 +243 @@
             case 2:
                 ENCODE_SCF1 ( SCF_Index_L[n][0], SCF_Last_L[n]    , DSCF_RLL_L[n] );
-                ENCODE_SCFn ( SCF_Index_L[n][2], SCF_Index_L[n][1], DSCF_RLL_L[n] );
+                ENCODE_SCFn ( SCF_Index_L[n][2], SCF_Index_L[n][0], DSCF_RLL_L[n] );
                 SCF_Last_L[n] = SCF_Index_L[n][2];
                 break;
@@ -251 +252 @@
             }
         }
-        DSCF_RLL_L[n]++;        // Increased counters for SCF that haven't been initialized again
+        if (DSCF_RLL_L[n] <= 32)
+            DSCF_RLL_L[n]++;        // Increased counters for SCF that haven't been initialized again
 
         if ( Res_R[n] ) {
@@ -268 +270 @@
             case 2:
                 ENCODE_SCF1 ( SCF_Index_R[n][0], SCF_Last_R[n]    , DSCF_RLL_R[n] );
-                ENCODE_SCFn ( SCF_Index_R[n][2], SCF_Index_R[n][1], DSCF_RLL_R[n] );
+                ENCODE_SCFn ( SCF_Index_R[n][2], SCF_Index_R[n][0], DSCF_RLL_R[n] );
                 SCF_Last_R[n] = SCF_Index_R[n][2];
                 break;
@@ -277 +279 @@
             }
         }
-        DSCF_RLL_R[n]++;          // Increased counters for SCF that haven't been freshly initialized
+        if (DSCF_RLL_R[n] <= 32)
+            DSCF_RLL_R[n]++;          // Increased counters for SCF that haven't been freshly initialized
     }