Changeset 339

Timestamp:

06/30/07 20:18:26 (17 years ago)

Author:

r2d

Message:

added check stream option to mpcdec

File:

• libmpc/trunk/mpcdec/mpcdec.c (modified) (6 diffs)

libmpc/trunk/mpcdec/mpcdec.c

@@ -36 +36 @@
 #include <time.h>
 #include <mpc/mpcdec.h>
+#include "../libmpcdec/decoder.h"
+#include "../libmpcdec/internal.h"
 #include <libwaveformat.h>
 #include <getopt.h>
@@ -86 +88 @@
     printf("Usage: %s [-i] [-h] <infile.mpc> [<outfile.wav>]\n"
                         "-i : print file information on stdout\n"
+                        "-c : check the file for stream errors\n"
+                        "     (doesn't fully decode, outfile will be ignored)\n"
                         "-h : print this help\n", exename);
 }
@@ -96 +100 @@
         mpc_streaminfo si;
         mpc_status err;
-        mpc_bool_t info = MPC_FALSE;
+        mpc_bool_t info = MPC_FALSE, is_wav_output = MPC_FALSE, check = MPC_FALSE;
     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;
         int c;
 
     printf("mpcdec - musepack (mpc) decoder sample application\n");
 
-        while ((c = getopt(argc , argv, "ih")) != -1) {
+        while ((c = getopt(argc , argv, "ihc")) != -1) {
                 switch (c) {
                         case 'i':
                                 info = MPC_TRUE;
+                                break;
+                        case 'c':
+                                check = MPC_TRUE;
                                 break;
                         case 'h':
@@ -135 +141 @@
         }
 
-        is_wav_output = argc - optind > 1;
+        if (!check)
+                is_wav_output = argc - optind > 1;
     if(is_wav_output)
     {
@@ -154 +161 @@
 
         frame.buffer = sample_buffer;
+            if (check)
+                    demux->d->samples_to_skip = MPC_FRAME_LENGTH + MPC_DECODER_SYNTH_DELAY;
         begin        = clock();
         err = mpc_demux_decode(demux, &frame);
@@ -182 +191 @@
         if (err != MPC_STATUS_OK)
                 printf("An error occured while decoding\n");
-
-    printf("%u samples ", total_samples);
-        if (sum <= 0) sum = 1;
-        total_samples = (mpc_uint32_t) ((mpc_uint64_t) total_samples * CLOCKS_PER_SEC * 100 / ((mpc_uint64_t)si.sample_freq * sum));
-    printf("decoded in %u ms (%u.%02ux)\n",
-                   (unsigned int) (sum * 1000 / CLOCKS_PER_SEC),
-           total_samples / 100,
-           total_samples % 100
-           );
+        else if (check)
+                printf("No error found\n");
+
+        if (!check) {
+                printf("%u samples ", total_samples);
+                if (sum <= 0) sum = 1;
+                total_samples = (mpc_uint32_t) ((mpc_uint64_t) total_samples * CLOCKS_PER_SEC * 100 / ((mpc_uint64_t)si.sample_freq * sum));
+                printf("decoded in %u ms (%u.%02ux)\n",
+                        (unsigned int) (sum * 1000 / CLOCKS_PER_SEC),
+                        total_samples / 100,
+                        total_samples % 100
+                        );
+        }
 
     mpc_demux_exit(demux);