10 FourCCs generated with GST_MAKE_FOURCC() in gstqtmux.c and atoms.c
already exist in fourcc.h. Don't duplicate these and use them directly.
Plus moving 6 to fourcc.h, to centralize them all.
- atom_data =
- atom_data_new_from_data (GST_MAKE_FOURCC ('f', 'i', 'e', 'l'), &f, 1);
+ atom_data = atom_data_new_from_data (FOURCC_fiel, &f, 1);
return build_atom_info_wrapper ((Atom *) atom_data, atom_data_copy_data,
atom_data_free);
return build_atom_info_wrapper ((Atom *) atom_data, atom_data_copy_data,
atom_data_free);
- atom_data =
- atom_data_new_from_gst_buffer (GST_MAKE_FOURCC ('j', 'p', '2', 'x'),
- prefix);
+ atom_data = atom_data_new_from_gst_buffer (FOURCC_jp2x, prefix);
return build_atom_info_wrapper ((Atom *) atom_data, atom_data_copy_data,
atom_data_free);
return build_atom_info_wrapper ((Atom *) atom_data, atom_data_copy_data,
atom_data_free);
/* ihdr = image header box */
gst_byte_writer_put_uint32_be_unchecked (&writer, 22);
/* ihdr = image header box */
gst_byte_writer_put_uint32_be_unchecked (&writer, 22);
- gst_byte_writer_put_uint32_le_unchecked (&writer, GST_MAKE_FOURCC ('i', 'h',
- 'd', 'r'));
+ gst_byte_writer_put_uint32_le_unchecked (&writer, FOURCC_ihdr);
gst_byte_writer_put_uint32_be_unchecked (&writer, height);
gst_byte_writer_put_uint32_be_unchecked (&writer, width);
gst_byte_writer_put_uint16_be_unchecked (&writer, ncomp);
gst_byte_writer_put_uint32_be_unchecked (&writer, height);
gst_byte_writer_put_uint32_be_unchecked (&writer, width);
gst_byte_writer_put_uint16_be_unchecked (&writer, ncomp);
/* colour specification box */
gst_byte_writer_put_uint32_be_unchecked (&writer, 15);
/* colour specification box */
gst_byte_writer_put_uint32_be_unchecked (&writer, 15);
- gst_byte_writer_put_uint32_le_unchecked (&writer, GST_MAKE_FOURCC ('c', 'o',
- 'l', 'r'));
+ gst_byte_writer_put_uint32_le_unchecked (&writer, FOURCC_colr);
/* specification method: enumerated */
gst_byte_writer_put_uint8_unchecked (&writer, 0x1);
/* specification method: enumerated */
gst_byte_writer_put_uint8_unchecked (&writer, 0x1);
if (cmap_array) {
gst_byte_writer_put_uint32_be_unchecked (&writer, cmap_size);
if (cmap_array) {
gst_byte_writer_put_uint32_be_unchecked (&writer, cmap_size);
- gst_byte_writer_put_uint32_le_unchecked (&writer,
- GST_MAKE_FOURCC ('c', 'm', 'a', 'p'));
+ gst_byte_writer_put_uint32_le_unchecked (&writer, FOURCC_cmap);
for (i = 0; i < cmap_array_size; i++) {
const GValue *item;
gint value;
for (i = 0; i < cmap_array_size; i++) {
const GValue *item;
gint value;
if (cdef_array) {
gst_byte_writer_put_uint32_be_unchecked (&writer, cdef_size);
if (cdef_array) {
gst_byte_writer_put_uint32_be_unchecked (&writer, cdef_size);
- gst_byte_writer_put_uint32_le_unchecked (&writer,
- GST_MAKE_FOURCC ('c', 'd', 'e', 'f'));
+ gst_byte_writer_put_uint32_le_unchecked (&writer, FOURCC_cdef);
gst_byte_writer_put_uint16_be_unchecked (&writer, cdef_array_size);
for (i = 0; i < cdef_array_size; i++) {
const GValue *item;
gst_byte_writer_put_uint16_be_unchecked (&writer, cdef_array_size);
for (i = 0; i < cdef_array_size; i++) {
const GValue *item;
GST_WRITE_UINT8 (ext + 8, 1);
buf = GST_BUFFER_NEW_READONLY (ext, sizeof (ext));
GST_WRITE_UINT8 (ext + 8, 1);
buf = GST_BUFFER_NEW_READONLY (ext, sizeof (ext));
- res = build_codec_data_extension (GST_MAKE_FOURCC ('d', 'a', 'm', 'r'), buf);
+ res = build_codec_data_extension (FOURCC_damr, buf);
gst_buffer_unref (buf);
return res;
}
gst_buffer_unref (buf);
return res;
}
GST_WRITE_UINT8 (ext + 6, 0);
buf = GST_BUFFER_NEW_READONLY (ext, sizeof (ext));
GST_WRITE_UINT8 (ext + 6, 0);
buf = GST_BUFFER_NEW_READONLY (ext, sizeof (ext));
- res = build_codec_data_extension (GST_MAKE_FOURCC ('d', '2', '6', '3'), buf);
+ res = build_codec_data_extension (FOURCC_d263, buf);
gst_buffer_unref (buf);
return res;
}
gst_buffer_unref (buf);
return res;
}
#define FOURCC_ctab GST_MAKE_FOURCC('c','t','a','b')
#define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s')
#define FOURCC_cslg GST_MAKE_FOURCC('c','s','l','g')
#define FOURCC_ctab GST_MAKE_FOURCC('c','t','a','b')
#define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s')
#define FOURCC_cslg GST_MAKE_FOURCC('c','s','l','g')
+#define FOURCC_d263 GST_MAKE_FOURCC('d','2','6','3')
#define FOURCC_dac3 GST_MAKE_FOURCC('d','a','c','3')
#define FOURCC_dac3 GST_MAKE_FOURCC('d','a','c','3')
+#define FOURCC_damr GST_MAKE_FOURCC('d','a','m','r')
#define FOURCC_data GST_MAKE_FOURCC('d','a','t','a')
#define FOURCC_dcom GST_MAKE_FOURCC('d','c','o','m')
#define FOURCC_desc GST_MAKE_FOURCC('d','e','s','c')
#define FOURCC_data GST_MAKE_FOURCC('d','a','t','a')
#define FOURCC_dcom GST_MAKE_FOURCC('d','c','o','m')
#define FOURCC_desc GST_MAKE_FOURCC('d','e','s','c')
#define FOURCC_dref GST_MAKE_FOURCC('d','r','e','f')
#define FOURCC_drmi GST_MAKE_FOURCC('d','r','m','i')
#define FOURCC_drms GST_MAKE_FOURCC('d','r','m','s')
#define FOURCC_dref GST_MAKE_FOURCC('d','r','e','f')
#define FOURCC_drmi GST_MAKE_FOURCC('d','r','m','i')
#define FOURCC_drms GST_MAKE_FOURCC('d','r','m','s')
+#define FOURCC_dvcp GST_MAKE_FOURCC('d','v','c','p')
+#define FOURCC_dvc_ GST_MAKE_FOURCC('d','v','c',' ')
+#define FOURCC_dv5p GST_MAKE_FOURCC('d','v','5','p')
+#define FOURCC_dv5n GST_MAKE_FOURCC('d','v','5','n')
#define FOURCC_edts GST_MAKE_FOURCC('e','d','t','s')
#define FOURCC_elst GST_MAKE_FOURCC('e','l','s','t')
#define FOURCC_enda GST_MAKE_FOURCC('e','n','d','a')
#define FOURCC_edts GST_MAKE_FOURCC('e','d','t','s')
#define FOURCC_elst GST_MAKE_FOURCC('e','l','s','t')
#define FOURCC_enda GST_MAKE_FOURCC('e','n','d','a')
switch (version) {
case 25:
if (pal)
switch (version) {
case 25:
if (pal)
- entry.fourcc = GST_MAKE_FOURCC ('d', 'v', 'c', 'p');
+ entry.fourcc = FOURCC_dvcp;
- entry.fourcc = GST_MAKE_FOURCC ('d', 'v', 'c', ' ');
+ entry.fourcc = FOURCC_dvc_;
- entry.fourcc = GST_MAKE_FOURCC ('d', 'v', '5', 'p');
+ entry.fourcc = FOURCC_dv5p;
- entry.fourcc = GST_MAKE_FOURCC ('d', 'v', '5', 'n');
+ entry.fourcc = FOURCC_dv5n;
break;
default:
GST_WARNING_OBJECT (qtmux, "unrecognized dv version");
break;
default:
GST_WARNING_OBJECT (qtmux, "unrecognized dv version");
variant = gst_structure_get_string (structure, "format");
if (!variant || !g_strcmp0 (variant, "standard"))
variant = gst_structure_get_string (structure, "format");
if (!variant || !g_strcmp0 (variant, "standard"))
- entry.fourcc = GST_MAKE_FOURCC ('a', 'p', 'c', 'n');
+ entry.fourcc = FOURCC_apcn;
else if (!g_strcmp0 (variant, "lt"))
else if (!g_strcmp0 (variant, "lt"))
- entry.fourcc = GST_MAKE_FOURCC ('a', 'p', 'c', 's');
+ entry.fourcc = FOURCC_apcs;
else if (!g_strcmp0 (variant, "hq"))
else if (!g_strcmp0 (variant, "hq"))
- entry.fourcc = GST_MAKE_FOURCC ('a', 'p', 'c', 'h');
+ entry.fourcc = FOURCC_apch;
else if (!g_strcmp0 (variant, "proxy"))
else if (!g_strcmp0 (variant, "proxy"))
- entry.fourcc = GST_MAKE_FOURCC ('a', 'p', '4', 'h');
+ entry.fourcc = FOURCC_ap4h;