FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mxfmpeg: h264 is always byte-stream inside MXF

Browse Source
This commit is contained in:
Sebastian Dröge 2015-10-21 18:20:16 +03:00
parent f7f208de70
commit f11a3ccf9d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gst/mxf/mxfmpeg.c
View File

@ -701,8 +701,9 @@ mxf_mpeg_es_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
} else if ((p->picture_essence_coding.u[13] >> 4) == 0x03) { } else if ((p->picture_essence_coding.u[13] >> 4) == 0x03) {
/* RP 2008 */ /* RP 2008 */
/* TODO: What about codec_data for AVC1 streams? */ caps =
caps = gst_caps_new_empty_simple ("video/x-h264"); gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING,
"byte-stream", NULL);
codec_name = "h.264 Video"; codec_name = "h.264 Video";
t = MXF_MPEG_ESSENCE_TYPE_VIDEO_AVC; t = MXF_MPEG_ESSENCE_TYPE_VIDEO_AVC;
memcpy (mdata, &t, sizeof (MXFMPEGEssenceType)); 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) { } else if (f->essence_container.u[13] == 0x0f) {
GST_DEBUG ("Found h264 NAL unit stream"); GST_DEBUG ("Found h264 NAL unit stream");
/* RP 2008 */ /* RP 2008 */
/* TODO: What about codec_data? */
caps = caps =
gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING, gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING,
"avc", NULL); "byte-stream", NULL);
if (!*tags) if (!*tags)
*tags = gst_tag_list_new_empty (); *tags = gst_tag_list_new_empty ();
gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC, gst_tag_list_add (*tags, GST_TAG_MERGE_APPEND, GST_TAG_VIDEO_CODEC,
"h.264 Video", NULL); "h.264 Video", NULL);
} else if (f->essence_container.u[13] == 0x10) { } else if (f->essence_container.u[13] == 0x10) {
GST_DEBUG ("Found h264 byte stream stream"); GST_DEBUG ("Found h264 byte-stream stream");
/* RP 2008 */ /* RP 2008 */
caps = caps =
gst_caps_new_simple ("video/x-h264", "stream-format", G_TYPE_STRING, 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 ", " \ "height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE "; " \ "framerate = " GST_VIDEO_FPS_RANGE "; " \
"video/x-h264, " \ "video/x-h264, " \
"stream-format = (string) byte-stream, " \
"width = " GST_VIDEO_SIZE_RANGE ", " \ "width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \ "height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE "framerate = " GST_VIDEO_FPS_RANGE