Changeset 213

Timestamp:

02/13/07 12:13:51 (18 years ago)

Author:

r2d

Message:

• mpcenc should now support encoding from pipe with unknow file length (fb2k), untested

File:

• libmpc/branches/r2d/mpcenc/mpcenc.c (modified) (5 diffs)

libmpc/branches/r2d/mpcenc/mpcenc.c

@@ -1514 +1514 @@
         PsyModel         m;
         mpc_encoder_t    e;
+        mpc_uint_t si_size;
 
     // initialize tables which must be initialized once and only once
@@ -1611 +1612 @@
         writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
                                            m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels, 0, 0, 0, 0);
-        writeBlock(&e, "SI", MPC_TRUE, 0);
+        si_size = writeBlock(&e, "SI", MPC_TRUE, 0);
         writeEncoderInfo(&e, m.FullQual, m.PNS > 0, MPPENC_MAJOR, MPPENC_MINOR,
                                           MPPENC_IMPLEMENT, MPPENC_BUILD);
@@ -1642 +1643 @@
     if ( myfeof (Wave.fp) ) {
         stderr_printf ( "WAVE file has incorrect header: header: %.3f s, contents: %.3f s    \n",
-                                                (long double)(AllSamplesRead) / m.SampleFreq, (long double)(SamplesInWAVE) / m.SampleFreq );
-        SamplesInWAVE = AllSamplesRead;
+                                                (long double)(SamplesInWAVE) / m.SampleFreq, (long double)(AllSamplesRead) / m.SampleFreq);
     }
 
@@ -1712 +1712 @@
         // adapt SamplesInWAV to the real number of contained samples
         if ( myfeof (Wave.fp) ) {
-            stderr_printf ( "WAVE file has incorrect header: header: %.3f s, contents: %.3f s    \n",
-                                                        (long double)(AllSamplesRead) / m.SampleFreq, (long double)(SamplesInWAVE) / m.SampleFreq );
-            SamplesInWAVE = AllSamplesRead;
+                        stderr_printf ( "WAVE file has incorrect header: header: %.3f s, contents: %.3f s    \n",
+                                                        (long double)(SamplesInWAVE) / m.SampleFreq, (long double)(AllSamplesRead) / m.SampleFreq);
         }
     }
@@ -1730 +1729 @@
         writeBlock(&e, "ST", MPC_FALSE, 0); // write seek table block
         writeBlock(&e, "SE", MPC_FALSE, 0); // write end of stream block
+
+        if (SamplesInWAVE != AllSamplesRead) {
+                SamplesInWAVE = AllSamplesRead;
+                fseek(e.outputFile, e.seek_ref + 4, SEEK_SET);
+                writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
+                                                   m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels, 0, 0, 0, 0);
+                writeBlock(&e, "SI", MPC_TRUE, si_size);
+                fseek(e.outputFile, 0, SEEK_END);
+        }
+
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.outputBits );