mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: for dts only stream set pts=dts for intra only formats

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=745192
This commit is contained in:
Nicola Murino 2015-03-11 21:25:40 +01:00 committed by Sebastian Dröge
parent 0fad053497
commit bb3d82ef04
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/matroska/matroska-demux.c
View file

@ -433,6 +433,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux, GstEbmlRead * ebml)
context->to_offset = G_MAXINT64; context->to_offset = G_MAXINT64;
context->alignment = 1; context->alignment = 1;
context->dts_only = FALSE; context->dts_only = FALSE;
context->intra_only = FALSE;
demux->common.num_streams++; demux->common.num_streams++;
g_assert (demux->common.src->len == demux->common.num_streams); g_assert (demux->common.src->len == demux->common.num_streams);
@ -3480,10 +3481,13 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
buffer_timestamp = gst_matroska_track_get_buffer_timestamp (stream, sub); buffer_timestamp = gst_matroska_track_get_buffer_timestamp (stream, sub);
if (!stream->dts_only) if (!stream->dts_only) {
GST_BUFFER_PTS (sub) = lace_time; GST_BUFFER_PTS (sub) = lace_time;
else } else {
GST_BUFFER_DTS (sub) = lace_time; GST_BUFFER_DTS (sub) = lace_time;
if (stream->intra_only)
GST_BUFFER_PTS (sub) = lace_time;
}
if (GST_CLOCK_TIME_IS_VALID (lace_time)) { if (GST_CLOCK_TIME_IS_VALID (lace_time)) {
GstClockTime last_stop_end; GstClockTime last_stop_end;
@ -4874,6 +4878,12 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
if (caps == NULL) { if (caps == NULL) {
GST_WARNING ("Unhandled RIFF fourcc %" GST_FOURCC_FORMAT, GST_WARNING ("Unhandled RIFF fourcc %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (vids->compression)); GST_FOURCC_ARGS (vids->compression));
} else {
static GstStaticCaps intra_caps = GST_STATIC_CAPS ("image/jpeg; "
"video/x-raw; image/png; video/x-dv; video/x-huffyuv; video/x-ffv; "
"video/x-compressed-yuv");
context->intra_only =
gst_caps_can_intersect (gst_static_caps_get (&intra_caps), caps);
} }
if (buf) if (buf)
@ -4919,6 +4929,8 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
return NULL; return NULL;
} }
context->intra_only = TRUE;
gst_video_info_set_format (&info, format, videocontext->pixel_width, gst_video_info_set_format (&info, format, videocontext->pixel_width,
videocontext->pixel_height); videocontext->pixel_height);
caps = gst_video_info_to_caps (&info); caps = gst_video_info_to_caps (&info);
@ -4972,6 +4984,7 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
} else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG)) { } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MJPEG)) {
caps = gst_caps_new_empty_simple ("image/jpeg"); caps = gst_caps_new_empty_simple ("image/jpeg");
*codec_name = g_strdup ("Motion-JPEG"); *codec_name = g_strdup ("Motion-JPEG");
context->intra_only = TRUE;
} else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AVC)) { } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AVC)) {
caps = gst_caps_new_empty_simple ("video/x-h264"); caps = gst_caps_new_empty_simple ("video/x-h264");
if (data) { if (data) {

3
gst/matroska/matroska-ids.h
View file

@ -555,6 +555,9 @@ struct _GstMatroskaTrackContext {
/* for compatibility with VFW files, where timestamp represents DTS */ /* for compatibility with VFW files, where timestamp represents DTS */
gboolean dts_only; gboolean dts_only;
/* indicate that the track is raw (jpeg,raw variants) and so pts=dts */
gboolean intra_only;
}; };
typedef struct _GstMatroskaTrackVideoContext { typedef struct _GstMatroskaTrackVideoContext {