Changeset 68 for libmpcdec/branches/zorg/mpcdec/mpcdec.c

Timestamp:

10/06/06 17:14:05 (18 years ago)

Author:

zorg

Message:

Separated public interface from private headers
Use opaque objects whenever possible
Some (useless?) cosmetics on libmpcdec
Remove sv5-6 outdated support
Added libwavformat for upcoming mpcdec
New layout
Work in progress...

Location:

libmpcdec/branches/zorg/mpcdec

Files:

• . (added)
• mpcdec.c (moved) (moved from libmpcdec/branches/zorg/src/sample.cpp) (4 diffs)

libmpcdec/branches/zorg/mpcdec/mpcdec.c

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 #include <stdio.h>
 #include <assert.h>
@@ -38 +37 @@
 
 #include <mpcdec/mpcdec.h>
-
-/*
-  The data bundle we pass around with our reader to store file
-  position and size etc. 
-*/
-typedef struct reader_data_t {
-    FILE *file;
-    long size;
-    mpc_bool_t seekable;
-} reader_data;
-
-/*
-  Our implementations of the mpc_reader callback functions.
-*/
-mpc_int32_t
-read_impl(void *data, void *ptr, mpc_int32_t size)
-{
-    reader_data *d = (reader_data *) data;
-    return fread(ptr, 1, size, d->file);
-}
-
-mpc_bool_t
-seek_impl(void *data, mpc_int32_t offset)
-{
-    reader_data *d = (reader_data *) data;
-    return d->seekable ? !fseek(d->file, offset, SEEK_SET) : false;
-}
-
-mpc_int32_t
-tell_impl(void *data)
-{
-    reader_data *d = (reader_data *) data;
-    return ftell(d->file);
-}
-
-mpc_int32_t
-get_size_impl(void *data)
-{
-    reader_data *d = (reader_data *) data;
-    return d->size;
-}
-
-mpc_bool_t
-canseek_impl(void *data)
-{
-    reader_data *d = (reader_data *) data;
-    return d->seekable;
-}
-
-#define WFX_SIZE (2+2+4+4+2+2)
-
-#ifdef MPC_FIXED_POINT
-static int
-shift_signed(MPC_SAMPLE_FORMAT val, int shift)
-{
-    if (shift > 0)
-        val <<= shift;
-    else if (shift < 0)
-        val >>= -shift;
-    return (int)val;
-}
-#endif
-
-class WavWriter {
-  public:
-    WavWriter(FILE * p_output, unsigned p_nch, unsigned p_bps,
-              unsigned p_srate)
-    : m_file(p_output), m_nch(p_nch), m_bps(p_bps), m_srate(p_srate) {
-        assert(m_bps == 16 || m_bps == 24);
-
-        WriteRaw("RIFF", 4);
-        WriteDword(0);          //fix this in destructor
-
-        WriteRaw("WAVE", 4);
-        WriteRaw("fmt ", 4);
-        WriteDword(WFX_SIZE);
-
-        WriteWord(1);           //WAVE_FORMAT_PCM
-        WriteWord(m_nch);
-        WriteDword(m_srate);
-        WriteDword(m_srate * m_nch * (m_bps >> 3));
-        WriteWord(m_nch * (m_bps >> 3));
-        WriteWord(m_bps);
-        /*
-           WORD  wFormatTag; 
-           WORD  nChannels; 
-           DWORD nSamplesPerSec; 
-           DWORD nAvgBytesPerSec; 
-           WORD  nBlockAlign; 
-           WORD  wBitsPerSample; 
-         */
-        WriteRaw("data", 4);
-        WriteDword(0);          //fix this in destructor
-
-        m_data_bytes_written = 0;
-    } mpc_bool_t WriteSamples(const MPC_SAMPLE_FORMAT * p_buffer, unsigned p_size) {
-        unsigned n;
-        int clip_min = -1 << (m_bps - 1),
-            clip_max = (1 << (m_bps - 1)) - 1, float_scale = 1 << (m_bps - 1);
-        for (n = 0; n < p_size; n++) {
-            int val;
-#ifdef MPC_FIXED_POINT
-            val =
-                shift_signed(p_buffer[n],
-                             m_bps - MPC_FIXED_POINT_SCALE_SHIFT);
-#else
-            val = (int)(p_buffer[n] * float_scale);
-#endif
-            if (val < clip_min)
-                val = clip_min;
-            else if (val > clip_max)
-                val = clip_max;
-            if (!WriteInt(val, m_bps))
-                return false;
-        }
-        m_data_bytes_written += p_size * (m_bps >> 3);
-        return true;
-    }
-
-    ~WavWriter() {
-        if (m_data_bytes_written & 1) {
-            char blah = 0;
-            WriteRaw(&blah, 1);
-            m_data_bytes_written++;
-        }
-        Seek(4);
-        WriteDword((unsigned long)(m_data_bytes_written + 4 + 8 + WFX_SIZE +
-                                   8));
-        Seek(8 + 4 + 8 + WFX_SIZE + 4);
-        WriteDword(m_data_bytes_written);
-    }
-
-  private:
-
-    mpc_bool_t Seek(unsigned p_offset) {
-        return !fseek(m_file, p_offset, SEEK_SET);
-    }
-
-    mpc_bool_t WriteRaw(const void *p_buffer, unsigned p_bytes) {
-        return fwrite(p_buffer, 1, p_bytes, m_file) == p_bytes;
-    }
-
-    mpc_bool_t WriteDword(unsigned long p_val) {
-        return WriteInt(p_val, 32);
-    }
-    mpc_bool_t WriteWord(unsigned short p_val) {
-        return WriteInt(p_val, 16);
-    }
-
-    // write a little-endian number properly
-    mpc_bool_t WriteInt(unsigned int p_val, unsigned p_width_bits) {
-        unsigned char temp;
-        unsigned shift = 0;
-        assert((p_width_bits % 8) == 0);
-        do {
-            temp = (unsigned char)((p_val >> shift) & 0xFF);
-            if (!WriteRaw(&temp, 1))
-                return false;
-            shift += 8;
-        } while (shift < p_width_bits);
-        return true;
-    }
-
-    unsigned m_nch, m_bps, m_srate;
-    FILE *m_file;
-    unsigned m_data_bytes_written;
-};
-
+#include <libwaveformat.h>
 
 static void
@@ -218 +50 @@
 main(int argc, char **argv)
 {
+    mpc_reader reader; mpc_streaminfo si; mpc_decoder decoder; wavwriter
+
     if (argc != 2 && argc != 3) {
         if (argc > 0)
@@ -223 +57 @@
         return 0;
     }
+
 
     FILE *input = fopen(argv[1], "rb");