[vlc-commits] [Git][videolan/vlc][master] 2 commits: avformat: use hexadecimal to show CODEC_IDs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d740102e by Jean-Baptiste Kempf at 2023-08-08T07:25:55+00:00
avformat: use hexadecimal to show CODEC_IDs

This makes it easier to map the audio ones

- - - - -
a6125502 by Jean-Baptiste Kempf at 2023-08-08T07:25:55+00:00
Map ADPCM_EA_R3

- - - - -


4 changed files:

- include/vlc_fourcc.h
- modules/codec/avcodec/fourcc.c
- modules/demux/avformat/demux.c
- src/misc/fourcc_list.h


Changes:

=====================================
include/vlc_fourcc.h
=====================================
@@ -590,6 +590,7 @@
 #define VLC_CODEC_SMACKAUDIO                 VLC_FOURCC('S','M','K','A')
 #define VLC_CODEC_ADPCM_IMA_EA_SEAD          VLC_FOURCC('S','E','A','D')
 #define VLC_CODEC_ADPCM_EA_R1                VLC_FOURCC('E','A','R','1')
+#define VLC_CODEC_ADPCM_EA_R3                VLC_FOURCC('E','A','R','3')
 #define VLC_CODEC_ADPCM_IMA_APC              VLC_FOURCC('A','I','P','C')
 #define VLC_CODEC_DSD_LSBF                   VLC_FOURCC('D','S','D','l')
 #define VLC_CODEC_DSD_LSBF_PLANAR            VLC_FOURCC('D','S','F','l')


=====================================
modules/codec/avcodec/fourcc.c
=====================================
@@ -398,7 +398,7 @@ static const struct vlc_avcodec_fourcc audio_codecs[] =
     { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP },
     { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV },
     { VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1 },
-    /* AV_CODEC_ID_ADPCM_EA_R3 */
+    { VLC_CODEC_ADPCM_EA_R3, AV_CODEC_ID_ADPCM_EA_R3 },
     /* AV_CODEC_ID_ADPCM_EA_R2 */
     { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD },
     /* AV_CODEC_ID_ADPCM_IMA_EA_EACS */


=====================================
modules/demux/avformat/demux.c
=====================================
@@ -712,7 +712,7 @@ int avformat_OpenDemux( vlc_object_t *p_this )
             if( p_track->p_es && (s->disposition & AV_DISPOSITION_DEFAULT) )
                 es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, p_track->p_es );
 
-            msg_Dbg( p_demux, "adding es: %s codec = %4.4s (%d)",
+            msg_Dbg( p_demux, "adding es: %s codec = %4.4s (0x%x)",
                      psz_type, (char*)&fcc, cp->codec_id  );
         }
         es_format_Clean( &es_fmt );


=====================================
src/misc/fourcc_list.h
=====================================
@@ -1696,6 +1696,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
 
+    B(VLC_CODEC_ADPCM_EA_R3, "ADPCM Electronic Arts R3"),
+
     B(VLC_CODEC_ADPCM_IMA_APC, "ADPCM APC"),
 
     B(VLC_CODEC_DSD_LSBF, "DSD (Direct Stream Digital) LSB first"),



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f39f107f75d2fbdb142bada7660a16c8fc29eb3b...a61255026041d075aae1ad319e235e91add0f120

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f39f107f75d2fbdb142bada7660a16c8fc29eb3b...a61255026041d075aae1ad319e235e91add0f120
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance