diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-10-21 18:20:16 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-10-21 19:54:15 +0300 |
| commit | f11a3ccf9d8a99e4d577532ec26534b1678ec5b7 (patch) | |
| tree | f3e7778b86ca69608315bd3616651a34c8c69bc3 /gst/mxf | |
| parent | f7f208de7006da09dfa49f0a4db285d5f1f25825 (diff) | |
| download | gstreamer-plugins-bad-f11a3ccf9d8a99e4d577532ec26534b1678ec5b7.tar.gz | |
mxfmpeg: h264 is always byte-stream inside MXF
Diffstat (limited to 'gst/mxf')
| -rw-r--r-- | gst/mxf/mxfmpeg.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gst/mxf/mxfmpeg.c b/gst/mxf/mxfmpeg.c index c26fa993f..0b15bd838 100644 --- a/gst/mxf/mxfmpeg.c +++ b/gst/mxf/mxfmpeg.c @@ -701,8 +701,9 @@ mxf_mpeg_es_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags, } else if ((p->picture_essence_coding.u[13] >> 4) == 0x03) { /* RP 2008 */ - /* TODO: What about codec_data for AVC1 streams? */ - caps = gst_caps_new_empty_simple ("video/x-h264"); + caps = + gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING, + "byte-stream", NULL); codec_name = "h.264 Video"; t = MXF_MPEG_ESSENCE_TYPE_VIDEO_AVC; memcpy (mdata, &t, sizeof (MXFMPEGEssenceType)); @@ -890,17 +891,16 @@ mxf_mpeg_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags, } else if (f->essence_container.u[13] == 0x0f) { GST_DEBUG ("Found h264 NAL unit stream"); /* RP 2008 */ - /* TODO: What about codec_data? */ caps = gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING, - "avc", NULL); + "byte-stream", NULL); if (!*tags) *tags = gst_tag_list_new_empty (); gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC, "h.264 Video", NULL); } else if (f->essence_container.u[13] == 0x10) { - GST_DEBUG ("Found h264 byte stream stream"); + GST_DEBUG ("Found h264 byte-stream stream"); /* RP 2008 */ caps = gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING, @@ -1364,6 +1364,7 @@ static MXFEssenceElementWriter mxf_mpeg_video_essence_element_writer = { "height = " GST_VIDEO_SIZE_RANGE ", " \ "framerate = " GST_VIDEO_FPS_RANGE "; " \ "video/x-h264, " \ +"stream-format = (string) byte-stream, " \ "width = " GST_VIDEO_SIZE_RANGE ", " \ "height = " GST_VIDEO_SIZE_RANGE ", " \ "framerate = " GST_VIDEO_FPS_RANGE |