mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-31 10:45:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: unite duplicate FourCC

Browse source 
Unite in fourcc.h the FourCCs that are used twice or more in qtdemux
This commit is contained in:
Luis de Bethencourt 2015-11-20 11:05:51 +00:00
parent 4ecd25d267
commit 53f8f1abae
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/isomp4/fourcc.h
View file

@ -231,6 +231,7 @@ G_BEGIN_DECLS
#define FOURCC_url_ GST_MAKE_FOURCC('u','r','l',' ') #define FOURCC_url_ GST_MAKE_FOURCC('u','r','l',' ')
#define FOURCC_uuid GST_MAKE_FOURCC('u','u','i','d') #define FOURCC_uuid GST_MAKE_FOURCC('u','u','i','d')
#define FOURCC_v210 GST_MAKE_FOURCC('v','2','1','0') #define FOURCC_v210 GST_MAKE_FOURCC('v','2','1','0')
#define FOURCC_vc_1 GST_MAKE_FOURCC('v','c','-','1')
#define FOURCC_vide GST_MAKE_FOURCC('v','i','d','e') #define FOURCC_vide GST_MAKE_FOURCC('v','i','d','e')
#define FOURCC_vmhd GST_MAKE_FOURCC('v','m','h','d') #define FOURCC_vmhd GST_MAKE_FOURCC('v','m','h','d')
#define FOURCC_wave GST_MAKE_FOURCC('w','a','v','e') #define FOURCC_wave GST_MAKE_FOURCC('w','a','v','e')
@ -252,6 +253,7 @@ G_BEGIN_DECLS
#define FOURCC_3gp4 GST_MAKE_FOURCC('3','g','p','4') #define FOURCC_3gp4 GST_MAKE_FOURCC('3','g','p','4')
#define FOURCC_3gp6 GST_MAKE_FOURCC('3','g','p','6') #define FOURCC_3gp6 GST_MAKE_FOURCC('3','g','p','6')
#define FOURCC_3gr6 GST_MAKE_FOURCC('3','g','r','6') #define FOURCC_3gr6 GST_MAKE_FOURCC('3','g','r','6')
#define FOURCC_3g__ GST_MAKE_FOURCC('3','g',0,0)
#define FOURCC_isml GST_MAKE_FOURCC('i','s','m','l') #define FOURCC_isml GST_MAKE_FOURCC('i','s','m','l')
#define FOURCC_iso2 GST_MAKE_FOURCC('i','s','o','2') #define FOURCC_iso2 GST_MAKE_FOURCC('i','s','o','2')
#define FOURCC_isom GST_MAKE_FOURCC('i','s','o','m') #define FOURCC_isom GST_MAKE_FOURCC('i','s','o','m')
@ -307,6 +309,7 @@ G_BEGIN_DECLS
#define FOURCC_traf GST_MAKE_FOURCC('t','r','a','f') #define FOURCC_traf GST_MAKE_FOURCC('t','r','a','f')
#define FOURCC_trex GST_MAKE_FOURCC('t','r','e','x') #define FOURCC_trex GST_MAKE_FOURCC('t','r','e','x')
#define FOURCC_trun GST_MAKE_FOURCC('t','r','u','n') #define FOURCC_trun GST_MAKE_FOURCC('t','r','u','n')
#define FOURCC_wma_ GST_MAKE_FOURCC('w','m','a',' ')
/* MPEG DASH */ /* MPEG DASH */
#define FOURCC_tfdt GST_MAKE_FOURCC('t','f','d','t') #define FOURCC_tfdt GST_MAKE_FOURCC('t','f','d','t')

14
gst/isomp4/qtdemux.c
View file

@ -9429,7 +9429,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
gst_buffer_unref (buf); gst_buffer_unref (buf);
break; break;
} }
case GST_MAKE_FOURCC ('v', 'c', '-', '1'): case FOURCC_vc_1:
{ {
gint len = QT_UINT32 (stsd_data) - 0x66; gint len = QT_UINT32 (stsd_data) - 0x66;
const guint8 *vc1_data = stsd_data + 0x66; const guint8 *vc1_data = stsd_data + 0x66;
@ -9724,7 +9724,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
} }
break; break;
} }
case GST_MAKE_FOURCC ('w', 'm', 'a', ' '): case FOURCC_wma_:
{ {
gint len = QT_UINT32 (stsd_data) - offset; gint len = QT_UINT32 (stsd_data) - offset;
const guint8 *wfex_data = stsd_data + offset; const guint8 *wfex_data = stsd_data + offset;
@ -10502,7 +10502,7 @@ qtdemux_is_brand_3gp (GstQTDemux * qtdemux, gboolean major)
{ {
if (major) { if (major) {
return ((qtdemux->major_brand & GST_MAKE_FOURCC (255, 255, 0, 0)) == return ((qtdemux->major_brand & GST_MAKE_FOURCC (255, 255, 0, 0)) ==
GST_MAKE_FOURCC ('3', 'g', 0, 0)); FOURCC_3g__);
} else if (qtdemux->comp_brands != NULL) { } else if (qtdemux->comp_brands != NULL) {
GstMapInfo map; GstMapInfo map;
guint8 *data; guint8 *data;
@ -10514,7 +10514,7 @@ qtdemux_is_brand_3gp (GstQTDemux * qtdemux, gboolean major)
size = map.size; size = map.size;
while (size >= 4) { while (size >= 4) {
res = res || ((QT_FOURCC (data) & GST_MAKE_FOURCC (255, 255, 0, 0)) == res = res || ((QT_FOURCC (data) & GST_MAKE_FOURCC (255, 255, 0, 0)) ==
GST_MAKE_FOURCC ('3', 'g', 0, 0)); FOURCC_3g__);
data += 4; data += 4;
size -= 4; size -= 4;
} }
@ -11636,7 +11636,7 @@ qtdemux_add_container_format (GstQTDemux * qtdemux, GstTagList * tags)
if (qtdemux->major_brand == FOURCC_mjp2) if (qtdemux->major_brand == FOURCC_mjp2)
fmt = "Motion JPEG 2000"; fmt = "Motion JPEG 2000";
else if ((qtdemux->major_brand & 0xffff) == GST_MAKE_FOURCC ('3', 'g', 0, 0)) else if ((qtdemux->major_brand & 0xffff) == FOURCC_3g__)
fmt = "3GP"; fmt = "3GP";
else if (qtdemux->major_brand == FOURCC_qt__) else if (qtdemux->major_brand == FOURCC_qt__)
fmt = "Quicktime"; fmt = "Quicktime";
@ -12465,7 +12465,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
gst_caps_new_simple ("video/x-prores", "variant", G_TYPE_STRING, gst_caps_new_simple ("video/x-prores", "variant", G_TYPE_STRING,
"4444", NULL); "4444", NULL);
break; break;
case GST_MAKE_FOURCC ('v', 'c', '-', '1'): case FOURCC_vc_1:
case FOURCC_ovc1: case FOURCC_ovc1:
_codec ("VC-1"); _codec ("VC-1");
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
@ -12700,7 +12700,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
_codec ("QualComm PureVoice"); _codec ("QualComm PureVoice");
caps = gst_caps_from_string ("audio/qcelp"); caps = gst_caps_from_string ("audio/qcelp");
break; break;
case GST_MAKE_FOURCC ('w', 'm', 'a', ' '): case FOURCC_wma_:
case FOURCC_owma: case FOURCC_owma:
_codec ("WMA"); _codec ("WMA");
caps = gst_caps_new_empty_simple ("audio/x-wma"); caps = gst_caps_new_empty_simple ("audio/x-wma");