Changeset 205 for libmpc/branches/r2d/mpc2sv8/mpc2sv8.c

Timestamp:

02/09/07 12:31:52 (18 years ago)

Author:

r2d

Message:

• corrected a small bug
• added copy of header and footer data (tags) of the input file
• added encoder version conversion

File:

• libmpc/branches/r2d/mpc2sv8/mpc2sv8.c (modified) (6 diffs)

libmpc/branches/r2d/mpc2sv8/mpc2sv8.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <mpc/mpcdec.h>
+#include <mpc/minimax.h>
 
 #include "../libmpcdec/decoder.h"
 #include "../libmpcdec/internal.h"
 #include "../libmpcenc/libmpcenc.h"
+
+#define TMP_BUF_SIZE 128
 
 static void datacpy(mpc_decoder * d, mpc_encoder_t * e)
@@ -81 +84 @@
         mpc_encoder_t e;
         mpc_uint_t si_size;
+        mpc_size_t stream_size;
+        size_t r_size;
+        FILE * in_file;
+        char buf[TMP_BUF_SIZE];
 
     printf("mpc2sv8 - musepack (mpc) sv7 to sv8 converter\n");
@@ -99 +106 @@
         e.MS_Channelmode = si.ms;
 
-        // copie début fichier
+        // copy begining of file
+        in_file = fopen(argv[1], "rb");
+        if(in_file == 0) return !MPC_STATUS_OK;
+        r_size = si.header_position;
+        while(r_size) {
+                size_t tmp_size = fread(buf, 1, mini(TMP_BUF_SIZE, r_size), in_file);
+                if (fwrite(buf, 1, tmp_size, e.outputFile) != tmp_size) {
+                        fprintf(stderr, "Error writing to target file");
+                        exit(!MPC_STATUS_OK);
+                }
+                r_size -= tmp_size;
+        }
 
-        // conversion stream
+        // stream conversion
         e.seek_ref = ftell(e.outputFile);
         writeMagic(&e);
@@ -107 +125 @@
                                           si.channels); // FIXME : convert replay gain info
         si_size = writeBlock(&e, "SI", MPC_TRUE, 0);
-        writeEncoderInfo(&e, si.profile, si.pns, 0, 0, 0, 0); // FIXME : convert encoder information
+        writeEncoderInfo(&e, si.profile, si.pns, si.encoder_version / 100,
+                                          si.encoder_version % 100, 0, 0);
         writeBlock(&e, "EI", MPC_FALSE, 0);
         e.seek_ptr = ftell(e.outputFile);
@@ -127 +146 @@
         }
     // write the last incomplete block
-        if ((e.block_cnt & ((1 << e.seek_pwr) - 1)) == 0) {
-                e.seek_table[e.seek_pos] = ftell(e.outputFile);
-                e.seek_pos++;
+        if (e.framesInBlock != 0) {
+                if ((e.block_cnt & ((1 << e.seek_pwr) - 1)) == 0) {
+                        e.seek_table[e.seek_pos] = ftell(e.outputFile);
+                        e.seek_pos++;
+                }
+                e.block_cnt++;
+                writeBlock(&e, "AD", MPC_FALSE, 0);
         }
-        writeBlock(&e, "AD", MPC_FALSE, 0);
         writeSeekTable(&e);
         writeBlock(&e, "ST", MPC_FALSE, 0); // write seek table block
@@ -143 +165 @@
         }
 
-        // copie fin fichier
-
+        // copy end of file
+        stream_size = (((mpc_demux_pos(demux) + 7) >> 3) - si.header_position + 3) & ~3;
+        fseek(in_file, si.header_position + stream_size, SEEK_SET);
+        while((r_size = fread(buf, 1, TMP_BUF_SIZE, in_file))) {
+                if (fwrite(buf, 1, r_size, e.outputFile) != r_size) {
+                        fprintf(stderr, "Error writing to target file");
+                        break;
+                }
+        }
 
         fclose ( e.outputFile );
-    mpc_demux_exit(demux);
-    mpc_reader_exit_stdio(&reader);
+        fclose ( in_file );
+        mpc_demux_exit(demux);
+        mpc_reader_exit_stdio(&reader);
 
-    return 0;
+        return MPC_STATUS_OK;
 }