1 files changed, 18 insertions, 7 deletions

diff --git a/apps/codecs/libcook/cook.c b/apps/codecs/libcook/cook.c
index ba5fbab6a1..315fe0aaff 100644
--- a/apps/codecs/libcook/cook.c
+++ b/apps/codecs/libcook/cook.c
@@ -708,16 +708,27 @@ static void dump_cook_context(COOKContext *q)
  * Cook initialization
  */
 
-int cook_decode_init(RMContext *rmctx, COOKContext *q)
-{   
+static inline uint16_t get_uint16be(uint8_t *buf)
+{
+    return (uint16_t)((buf[0] << 8)|buf[1]);
+}
+
+static inline uint32_t get_uint32be(uint8_t *buf)
+{
+    return (uint32_t)((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
+}
+
+ int cook_decode_init(RMContext *rmctx, COOKContext *q)
+ {   
+   
     /* cook extradata */
-    q->cookversion = rmctx->cook_version;
-    q->samples_per_frame =  rmctx->samples_pf_pc;
-    q->subbands = rmctx->nb_subbands;
+    q->cookversion = get_uint32be(rmctx->codec_extradata);
+    q->samples_per_frame =  get_uint16be(&rmctx->codec_extradata[4]);
+    q->subbands = get_uint16be(&rmctx->codec_extradata[6]);
     q->extradata_size = rmctx->extradata_size;
     if (q->extradata_size >= 16){
-        q->js_subband_start = rmctx->js_subband_start;
-        q->js_vlc_bits = rmctx->js_vlc_bits;
+        q->js_subband_start = get_uint16be(&rmctx->codec_extradata[12]);
+        q->js_vlc_bits = get_uint16be(&rmctx->codec_extradata[14]);
     }
 
     /* Take data from the RMContext (RM container). */