Ticket #550: movenc.c.diff

movenc.c

@@ -20 +20 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+//------------------------------------------------------Modifications History
+// DATE       DESCRIPTION
+// 02/17/2011 Fixed handling of no data AMR frames
 
 #include "movenc.h"
 #include "avformat.h"
 
@@ -1873 +1967 @@
 
     if (enc->codec_id == CODEC_ID_AMR_NB) {
         /* We must find out how many AMR blocks there are in one packet */
-        static uint16_t packed_size[16] =
-            {13, 14, 16, 18, 20, 21, 27, 32, 6, 0, 0, 0, 0, 0, 0, 0};
+
+        // This array holds the number of data bytes used for each amr mode.
+        static const uint8_t packed_size[16] =
+            {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
         int len = 0;
 
-        while (len < size && samplesInChunk < 100) {
-            len += packed_size[(pkt->data[len] >> 3) & 0x0F];
+        while (len < size && samplesInChunk < 100)
+        {
+            // The first byte is a TOC byte that contains the AMR mode
+            // We add 1 here for the TOC byte
+            len += packed_size[(pkt->data[len] >> 3) & 0x0F] + 1;
             samplesInChunk++;
         }
+
         if(samplesInChunk > 1){
             av_log(s, AV_LOG_ERROR, "fatal error, input is not a single packet, implement a AVParser for it\n");
             return -1;