1 files changed, 8 insertions, 23 deletions

diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c
index bfad7e8b36..c9c40986ba 100644
--- a/apps/codecs/librm/rm.c
+++ b/apps/codecs/librm/rm.c
@@ -95,27 +95,14 @@ static int read_uint32be(int fd, uint32_t* buf)
 }
 
 
-
-static int read_cook_extradata(int fd, RMContext *rmctx) {
-    read_uint32be(fd, &rmctx->cook_version);
-    read_uint16be(fd, &rmctx->samples_pf_pc);
-    read_uint16be(fd, &rmctx->nb_subbands);
-    if(rmctx->extradata_size == 16) {
-        read_uint32be(fd, &rmctx->unused);
-        read_uint16be(fd, &rmctx->js_subband_start);
-        read_uint16be(fd, &rmctx->js_vlc_bits);
-    }
-    return rmctx->extradata_size; /* for 'skipped' */
-}
-
 static void print_cook_extradata(RMContext *rmctx) {
 
-    DEBUGF("            cook_version = 0x%08x\n", rmctx->cook_version);
-    DEBUGF("            samples_per_frame_per_channel = %d\n", rmctx->samples_pf_pc);
-    DEBUGF("            number_of_subbands_in_freq_domain = %d\n", rmctx->nb_subbands);
-    if(rmctx->extradata_size == 16) {
-        DEBUGF("            joint_stereo_subband_start = %d\n",rmctx->js_subband_start);
-        DEBUGF("            joint_stereo_vlc_bits = %d\n", rmctx->js_vlc_bits);
+    DEBUGF("            cook_version = 0x%08x\n", get_uint32be(rmctx->codec_extradata));
+    DEBUGF("            samples_per_frame_per_channel = %d\n", get_uint16be(&rmctx->codec_extradata[4]));
+    DEBUGF("            number_of_subbands_in_freq_domain = %d\n", get_uint16be(&rmctx->codec_extradata[6]));
+     if(rmctx->extradata_size == 16) {
+        DEBUGF("            joint_stereo_subband_start = %d\n",get_uint16be(&rmctx->codec_extradata[12]));
+        DEBUGF("            joint_stereo_vlc_bits = %d\n", get_uint16be(&rmctx->codec_extradata[14]));
     }
 } 
 
@@ -250,10 +237,8 @@ static int real_read_audio_stream_info(int fd, RMContext *rmctx)
   
        read_uint32be(fd, &rmctx->extradata_size);
        skipped += 4;
-       if(!strncmp(fourcc2str(fourcc),"cook",4)){
-           skipped += read_cook_extradata(fd, rmctx); 
-           rmctx->codec_type = cook;
-       }
+       read(fd, rmctx->codec_extradata, rmctx->extradata_size);
+       skipped += rmctx->extradata_size;
        
        
        DEBUGF("        flavor = %d\n",flavor);