[vlc-commits] mux: mp4: rename esds variable

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Feb  8 17:36:07 2019 +0100| [d3d370f037bdeeb356d70773a6dfcc3334b3ace5] | committer: Francois Cartegnie

mux: mp4: rename esds variable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3d370f037bdeeb356d70773a6dfcc3334b3ace5
---

 modules/mux/mp4/libmp4mux.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index 98c139a002..67a80326e5 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -553,49 +553,49 @@ static bo_t *GetESDS(mp4mux_trackinfo_t *p_track)
     if (i_bitrate_max <= 1)
         i_bitrate_max = 0x7fffffff;
 
-    /* ES_Descr */
+    /* ES_Descr ISO/IEC 14496-1 8.3.3 */
     bo_add_mp4_tag_descr(esds, 0x03, 3 + 5 + 13 + i_decoder_specific_info_size + 5 + 1);
     bo_add_16be(esds, p_track->i_track_id);
     bo_add_8   (esds, 0x1f);      // flags=0|streamPriority=0x1f
 
-    /* DecoderConfigDescr */
+    /* DecoderConfigDescr ISO/IEC 14496-1 8.3.4 */
     bo_add_mp4_tag_descr(esds, 0x04, 13 + i_decoder_specific_info_size);
 
-    int  i_object_type_indication;
+    uint8_t i_object_profile_indication;
     switch(p_track->fmt.i_codec)
     {
     case VLC_CODEC_MP4V:
-        i_object_type_indication = 0x20;
+        i_object_profile_indication = 0x20;
         break;
     case VLC_CODEC_MPGV:
         if(p_track->fmt.i_original_fourcc == VLC_CODEC_MP1V)
         {
-            i_object_type_indication = 0x6b;
+            i_object_profile_indication = 0x6b;
             break;
         }
         /* fallthrough */
     case VLC_CODEC_MP2V:
         /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
-        i_object_type_indication = 0x65;
+        i_object_profile_indication = 0x65;
         break;
     case VLC_CODEC_MP1V:
         /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
-        i_object_type_indication = 0x6b;
+        i_object_profile_indication = 0x6b;
         break;
     case VLC_CODEC_MP4A:
         /* FIXME for mpeg2-aac == 0x66->0x68 */
-        i_object_type_indication = 0x40;
+        i_object_profile_indication = 0x40;
         break;
     case VLC_CODEC_MP3:
     case VLC_CODEC_MPGA:
-        i_object_type_indication =
+        i_object_profile_indication =
             p_track->fmt.audio.i_rate < 32000 ? 0x69 : 0x6b;
         break;
     case VLC_CODEC_DTS:
-        i_object_type_indication = 0xa9;
+        i_object_profile_indication = 0xa9;
         break;
     default:
-        i_object_type_indication = 0xFE; /* No profile specified */
+        i_object_profile_indication = 0xFE; /* No profile specified */
         break;
     }
 
@@ -616,7 +616,7 @@ static bo_t *GetESDS(mp4mux_trackinfo_t *p_track)
             break;
     }
 
-    bo_add_8   (esds, i_object_type_indication);
+    bo_add_8   (esds, i_object_profile_indication);
     bo_add_8   (esds, (i_stream_type << 2) | 1);
     bo_add_24be(esds, 1024 * 1024);       // bufferSizeDB
     bo_add_32be(esds, i_bitrate_max);     // maxBitrate