Changeset 138

Timestamp:

11/15/06 13:29:00 (17 years ago)

Author:

r2d

Message:

• added CRC check in libmpcdec

Location:

libmpc/branches/r2d

Files:

• Makefile.am (modified) (1 diff)
• common/Makefile.am (added)
• configure.in (modified) (1 diff)
• libmpc.kdevelop (modified) (4 diffs)
• libmpcdec/Makefile.am (modified) (1 diff)
• libmpcdec/mpc_demux.c (modified) (3 diffs)
• libmpcdec/streaminfo.c (modified) (2 diffs)
• libmpcenc/Makefile.am (modified) (1 diff)
• mppenc/Makefile.am (modified) (1 diff)

libmpc/branches/r2d/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libwavformat libmpcpsy libmpcenc libmpcdec mppenc mpcdec
+SUBDIRS = common libwavformat libmpcpsy libmpcenc libmpcdec mppenc mpcdec

libmpc/branches/r2d/configure.in

@@ -8 +8 @@
 AM_PROG_LIBTOOL
 
-AC_OUTPUT(Makefile libmpcenc/Makefile libmpcpsy/Makefile mppenc/Makefile libwavformat/Makefile libmpcdec/Makefile mpcdec/Makefile)
+AC_OUTPUT(Makefile libmpcenc/Makefile libmpcpsy/Makefile mppenc/Makefile libwavformat/Makefile libmpcdec/Makefile mpcdec/Makefile common/Makefile)

libmpc/branches/r2d/libmpc.kdevelop

@@ -3 +3 @@
   <general>
     <author>Nicolas Botti</author>
-    <email/>
+    <email></email>
     <version>0.1</version>
     <projectmanagement>KDevAutoProject</projectmanagement>
@@ -14 +14 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>libmpcpsy/libmpcpsy.a</activetarget>
+      <activetarget>libmpcdec/libmpcdec.la</activetarget>
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
-      <mainprogram>src/mppenc</mainprogram>
+      <mainprogram>/usr/bin/xmms</mainprogram>
       <terminal>true</terminal>
-      <directoryradio>executable</directoryradio>
+      <directoryradio>custom</directoryradio>
       <runarguments>
-        <mppenc/>
+        <mppenc></mppenc>
       </runarguments>
       <customdirectory>/</customdirectory>
-      <programargs/>
+      <programargs></programargs>
       <autocompile>true</autocompile>
       <envvars/>
@@ -184 +184 @@
     </codecompletion>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -200 +200 @@
   <kdevdebugger>
     <general>
-      <programargs>--overwrite ~/mdv-startup.wav</programargs>
-      <gdbpath/>
+      <programargs>~/mdv-startup.mpc</programargs>
+      <gdbpath></gdbpath>
       <dbgshell>libtool</dbgshell>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>

libmpc/branches/r2d/libmpcdec/Makefile.am

@@ -10 +10 @@
 AM_CFLAGS = -DMPC_LITTLE_ENDIAN
 
+libmpcdec_la_LIBADD = $(top_builddir)/common/libcommon.a

libmpc/branches/r2d/libmpcdec/mpc_demux.c

@@ -43 +43 @@
 
 // streaminfo.c
-mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si, const mpc_bits_reader * r_in);
+mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si,
+                                                                          const mpc_bits_reader * r_in,
+                                                                          mpc_size_t block_size);
 mpc_status streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r_in);
 void  streaminfo_encoder_info(mpc_streaminfo* si, const mpc_bits_reader * r_in);
@@ -134 +136 @@
                 while( memcmp(b.key, "AD", 2) != 0 ){ // scan all blocks until audio
                         mpc_demux_fill(d, 11 + b.size, 0);
-                        if (memcmp(b.key, "SI", 2) == 0)
-                                streaminfo_read_header_sv8(&d->si, &d->bits_reader);
-                        else if (memcmp(b.key, "EI", 2) == 0)
+                        if (memcmp(b.key, "SI", 2) == 0){
+                                int ret = streaminfo_read_header_sv8(&d->si, &d->bits_reader, b.size);
+                                if (ret != MPC_STATUS_OK)
+                                        return ret;
+                        } else if (memcmp(b.key, "EI", 2) == 0)
                                 streaminfo_encoder_info(&d->si, &d->bits_reader);
                         else if (memcmp(b.key, "RG", 2) == 0)
@@ -161 +165 @@
                 p_tmp->block_bits = 0;
                 // lire entête
-                mpc_demux_header(p_tmp);
-                // initialisation decodeur
-                p_tmp->d = mpc_decoder_init(&p_tmp->si);
+                if (mpc_demux_header(p_tmp) == MPC_STATUS_OK) {
+                        // initialisation decodeur
+                        p_tmp->d = mpc_decoder_init(&p_tmp->si);
+                } else {
+                        free(p_tmp);
+                        p_tmp = 0;
+                }
         }
 

libmpc/branches/r2d/libmpcdec/streaminfo.c

@@ -39 +39 @@
 #include <stdio.h>
 #include "internal.h"
+
+unsigned long crc32(unsigned char *buf, int len);
 
 mpc_uint32_t mpc_bits_read(mpc_bits_reader * r, const unsigned int nb_bits);
@@ -139 +141 @@
 /// Reads streaminfo from SV8 header.
 mpc_status
-streaminfo_read_header_sv8(mpc_streaminfo* si, const mpc_bits_reader * r_in)
-{
-        mpc_uint32_t CRC;
+streaminfo_read_header_sv8(mpc_streaminfo* si, const mpc_bits_reader * r_in,
+                                                   mpc_size_t block_size)
+{
+        mpc_uint32_t CRC, CRC_tmp;
         mpc_bits_reader r = *r_in;
 
-        // FIXME : add CRC check
         CRC = mpc_bits_read(&r, 32);
+        CRC_tmp = crc32(r.buff + 1 - (r.count >> 3), block_size - 4);
+        if (CRC != CRC_tmp)
+                return MPC_STATUS_FILE;
+
         si->stream_version = mpc_bits_read(&r, 8);
         mpc_bits_get_size(&r, &si->samples);

libmpc/branches/r2d/libmpcenc/Makefile.am

@@ -2 +2 @@
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcenc.a
-libmpcenc_a_SOURCES = analy_filter.c bitstream.c encode_sv7.c huffsv7.c quant.c \
-        crc32.c
+libmpcenc_a_SOURCES = analy_filter.c bitstream.c encode_sv7.c huffsv7.c quant.c
 
 
 noinst_HEADERS = libmpcenc.h
+
+

libmpc/branches/r2d/mppenc/Makefile.am

@@ -11 +11 @@
         winmsg.c
 mppenc_LDADD = $(top_builddir)/libmpcpsy/libmpcpsy.a \
-        $(top_builddir)/libmpcenc/libmpcenc.a -lm
+        $(top_builddir)/libmpcenc/libmpcenc.a $(top_builddir)/common/libcommon.a -lm
 AM_CFLAGS = -DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0