Changeset 4339 for pjproject/trunk/pjmedia/src/pjmedia-codec/silk.c

Timestamp:

Jan 31, 2013 5:23:46 AM (12 years ago)

Author:

ming

Message:

Re #1608: Try to store the number of frames in the packet in case SKP_Silk_SDK_get_TOC() couldn't return the correct number of frames during decode
This was reported to happen in SILK ARM version (thanks to Marcus for the report)

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/silk.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/silk.c

@@ -772 +772 @@
         frames[i].type = PJMEDIA_FRAME_TYPE_AUDIO;
         frames[i].bit_info = (((unsigned)ts->u64 & 0xFFFF) << 16) |
-                              (((unsigned)pkt & 0xFF) << 8) | i;
+                              (((unsigned)pkt & 0xFF) << 8) |
+                              (toc.framesInPacket << 4) | i;
         frames[i].buf = pkt;
         frames[i].size = pkt_size;
@@ -801 +802 @@
     frm_info = input->bit_info & 0xF;
 
+    if (toc.framesInPacket == 0) {
+        /* In SILK ARM version, the table of content can indicate
+         * that the number of frames in the packet is 0.
+         * Try to get the number of frames in packet that we save
+         * in the frame instead.
+         */
+        toc.framesInPacket = (input->bit_info & 0xF0) >> 4;
+    }
+    
     if (toc.framesInPacket == 0) {
         output->size = 0;