mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Read interlacing information from 'fiel' atom

Browse source 
Read interlacing and TFF/BFF information from the 'fiel' atom and pass it
into the caps

https://bugzilla.gnome.org/show_bug.cgi?id=775414
This commit is contained in:
Vivia Nikolaidou 2016-11-30 17:56:02 +02:00 committed by Sebastian Dröge
parent 499c5139bd
commit f8bf3a84ef
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/isomp4/qtdemux.c
View file

@ -282,6 +282,8 @@ struct _QtDemuxStream
guint16 bits_per_sample; guint16 bits_per_sample;
guint16 color_table_id; guint16 color_table_id;
GstMemory *rgb8_palette; GstMemory *rgb8_palette;
guint interlace_mode;
guint field_order;
/* audio info */ /* audio info */
gdouble rate; gdouble rate;
@ -7598,6 +7600,23 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
GST_TYPE_FRACTION, stream->par_w, stream->par_h, NULL); GST_TYPE_FRACTION, stream->par_w, stream->par_h, NULL);
} }
if (stream->interlace_mode > 0) {
if (stream->interlace_mode == 1) {
gst_caps_set_simple (stream->caps, "interlace-mode", G_TYPE_STRING,
"progressive", NULL);
} else if (stream->interlace_mode == 2) {
gst_caps_set_simple (stream->caps, "interlace-mode", G_TYPE_STRING,
"interleaved", NULL);
if (stream->field_order == 9) {
gst_caps_set_simple (stream->caps, "field-order", G_TYPE_STRING,
"top-field-first", NULL);
} else if (stream->field_order == 14) {
gst_caps_set_simple (stream->caps, "field-order", G_TYPE_STRING,
"bottom-field-first", NULL);
}
}
}
/* Create incomplete colorimetry here if needed */ /* Create incomplete colorimetry here if needed */
if (stream->colorimetry.range || if (stream->colorimetry.range ||
stream->colorimetry.matrix || stream->colorimetry.matrix ||
@ -9259,6 +9278,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GNode *tref; GNode *tref;
GNode *udta; GNode *udta;
GNode *svmi; GNode *svmi;
GNode *fiel;
QtDemuxStream *stream = NULL; QtDemuxStream *stream = NULL;
gboolean new_stream = FALSE; gboolean new_stream = FALSE;
@ -9689,6 +9709,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
esds = NULL; esds = NULL;
pasp = NULL; pasp = NULL;
colr = NULL; colr = NULL;
fiel = NULL;
/* pick 'the' stsd child */ /* pick 'the' stsd child */
if (!stream->protected) if (!stream->protected)
mp4v = qtdemux_tree_get_child_by_type (stsd, fourcc); mp4v = qtdemux_tree_get_child_by_type (stsd, fourcc);
@ -9699,6 +9720,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
esds = qtdemux_tree_get_child_by_type (mp4v, FOURCC_esds); esds = qtdemux_tree_get_child_by_type (mp4v, FOURCC_esds);
pasp = qtdemux_tree_get_child_by_type (mp4v, FOURCC_pasp); pasp = qtdemux_tree_get_child_by_type (mp4v, FOURCC_pasp);
colr = qtdemux_tree_get_child_by_type (mp4v, FOURCC_colr); colr = qtdemux_tree_get_child_by_type (mp4v, FOURCC_colr);
fiel = qtdemux_tree_get_child_by_type (mp4v, FOURCC_fiel);
} }
if (pasp) { if (pasp) {
@ -9711,6 +9733,16 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->par_h = 0; stream->par_h = 0;
} }
if (fiel) {
const guint8 *fiel_data = (const guint8 *) fiel->data;
gint len = QT_UINT32 (fiel_data);
if (len == 10) {
stream->interlace_mode = GST_READ_UINT8 (fiel_data + 8);
stream->field_order = GST_READ_UINT8 (fiel_data + 9);
}
}
if (colr) { if (colr) {
const guint8 *colr_data = (const guint8 *) colr->data; const guint8 *colr_data = (const guint8 *) colr->data;
gint len = QT_UINT32 (colr_data); gint len = QT_UINT32 (colr_data);