Changeset 4014

Timestamp:

Apr 4, 2012 4:45:28 AM (12 years ago)

Author:

bennylp

Message:

Re #1446: set format to PCM when WAVE_FMT_TAG_PCM is detected in AVI file, so that other pjmedia components can recognize that it is a raw PCM format

File:

• pjproject/trunk/pjmedia/src/pjmedia/avi_player.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/avi_player.c

@@ -59 +59 @@
     {
         unsigned i;
-        pj_int32_t *data32 = (pj_int32_t *)data;
-        pj_int16_t *data16 = (pj_int16_t *)data;
+
         count /= (bits == 32? 4 : 2);
-        for (i=0; i<count; ++i) {
-            if (bits == 32)
-                data32[i] = pj_swap32(data32[i]);
-            else
-                data16[i] = pj_swap16(data16[i]);
+
+        if (bits == 32) {
+            pj_int32_t *data32 = (pj_int32_t *)data;
+            for (i=0; i<count; ++i)
+                data32[i] = pj_swap32(data32[i]);
+        } else {
+            pj_int16_t *data16 = (pj_int16_t *)data;
+            for (i=0; i<count; ++i)
+                data16[i] = pj_swap16(data16[i]);
         }
+
     }
     static void data_to_host2(void *data, pj_uint8_t nsizes,
@@ -99 +103 @@
     unsigned         stream_id;
     unsigned         options;
+    pjmedia_format_id fmt_id;
     pj_uint16_t      bits_per_sample;
     pj_bool_t        eof;
@@ -327 +332 @@
 
     for (i = 0, nstr = 0; i < avi_hdr.avih_hdr.num_streams; i++) {
+        pjmedia_format_id fmt_id;
+
         /* Skip non-audio, non-video, or disabled streams) */
         if ((!COMPARE_TAG(avi_hdr.strl_hdr[i].data_type, 
@@ -355 +362 @@
                 continue;
             }
+            fmt_id = avi_hdr.strl_hdr[i].codec;
         } else {
             /* Check supported audio formats here */
@@ -366 +374 @@
                 continue;
             }
+            /* Normalize format ID */
+            fmt_id = avi_hdr.strl_hdr[i].codec;
+            if (avi_hdr.strl_hdr[i].codec == PJMEDIA_WAVE_FMT_TAG_PCM)
+                fmt_id = PJMEDIA_FORMAT_PCM;
         }
 
@@ -382 +394 @@
 
         fport[nstr]->stream_id = i;
+        fport[nstr]->fmt_id = fmt_id;
 
         /* Open file. */
@@ -434 +447 @@
             fport[i]->bits_per_sample = strf_hdr->bits_per_sample;
             pjmedia_format_init_audio(&fport[i]->base.info.fmt,
-                                      strl_hdr->codec,
+                                      fport[i]->fmt_id,
                                       strf_hdr->sample_rate,
                                       strf_hdr->nchannels,