Changeset 162 for libmpc/branches/r2d/mpcdec

Timestamp:

12/19/06 02:08:32 (19 years ago)

Author:

zorg

Message:

Fix mpcdec compilation for latest libmpcdec
Fix and update cmake build system (static libs only currently)
Use mpc booleans in mppenc

Location:

libmpc/branches/r2d/mpcdec

Files:

• CMakeLists.txt (added)
• mpcdec.c (modified) (5 diffs)

libmpc/branches/r2d/mpcdec/mpcdec.c

@@ -63 +63 @@
 main(int argc, char **argv)
 {
-    mpc_reader reader; mpc_streaminfo si; mpc_decoder* decoder; mpc_status err;
+    mpc_reader reader; mpc_demux* demux; mpc_streaminfo si; mpc_decoder* decoder; mpc_status err;
     MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
     clock_t begin, end, sum; int total_samples; t_wav_output_file wav_output;
     mpc_bool_t is_wav_output;
 
+    printf("mpcdec - musepack (mpc) decoder sample application\n");
     if(3 < argc && argc < 2)
     {
@@ -77 +78 @@
     if(err < 0) return !MPC_STATUS_OK;
 
-    err = mpc_streaminfo_init(&si, &reader);
-    if(err < 0) return !MPC_STATUS_OK;
-
-    err = mpc_decoder_init(&decoder, &reader, &si);
-    if(err < 0) return !MPC_STATUS_OK;
+    demux = mpc_demux_init(&reader);
+    if(!demux) return !MPC_STATUS_OK;
+    mpc_demux_get_info(demux,  &si);
+    decoder = mpc_decoder_init(&si);
 
     is_wav_output = argc > 2;
@@ -92 +92 @@
         wavo_fc.m_user_data = fopen(argv[2], "wb");
         if(!wavo_fc.m_user_data) return !MPC_STATUS_OK;
-        err = waveformat_output_open(&wav_output, wavo_fc, si.channels, 16, 0, si.sample_freq, (t_wav_uint32) si.pcm_samples * 2);
+        err = waveformat_output_open(&wav_output, wavo_fc, si.channels, 16, 0, si.sample_freq, (t_wav_uint32) si.samples * 2);
         if(!err) return !MPC_STATUS_OK;
     }
@@ -99 +99 @@
     while(MPC_TRUE)
     {
-        mpc_uint32_t samples;
+        mpc_frame_info frame; mpc_uint32_t samples;
 
-        begin   = clock();
-        samples = mpc_decoder_decode(decoder, sample_buffer, 0, 0);
-        end     = clock();
+        frame.buffer = sample_buffer;
+        begin        = clock();
+        mpc_demux_decode(demux, &frame);
+        end          = clock();
+        if(frame.bits == -1) break;
 
-        if(samples <= 0) break;
-        if(!samples)     break;
-        total_samples += samples;
+        total_samples += frame.samples;
         sum           += end - begin;
 
         if(is_wav_output)
-            if(waveformat_output_process_float32(&wav_output, sample_buffer, samples*2) < 0)
+            if(waveformat_output_process_float32(&wav_output, sample_buffer, frame.samples*2) < 0)
                 break;
     }
@@ -124 +124 @@
 
     mpc_decoder_exit(decoder);
+    mpc_demux_exit(demux);
     mpc_reader_exit_stdio(&reader);
     if(is_wav_output)