mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: Also detect 0x000001 as H264 byte-stream start code in codec_data

Browse source 
This works around some AVI files storing byte-stream data in the
codec_data. The previous workaround was only checking for
0x00000001 (4 bytes) instead of 0x000001 (3 bytes).

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1072>
This commit is contained in:
Sebastian Dröge 2021-09-02 08:38:54 +03:00 committed by GStreamer Marge Bot
parent ab6cb4c2c7
commit fedd6c2a28
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/avi/gstavidemux.c
View file

@ -1968,10 +1968,7 @@ gst_avi_demux_check_caps (GstAviDemux * avi, GstAviStream * stream,
gst_structure_remove_field (s, "palette_data"); gst_structure_remove_field (s, "palette_data");
return caps; return caps;
} }
} else if (!gst_structure_has_name (s, "video/x-h264")) { } else if (gst_structure_has_name (s, "video/x-h264")) {
return caps;
}
GST_DEBUG_OBJECT (avi, "checking caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (avi, "checking caps %" GST_PTR_FORMAT, caps);
/* some muxers put invalid bytestream stuff in h264 extra data */ /* some muxers put invalid bytestream stuff in h264 extra data */
@ -1986,8 +1983,9 @@ gst_avi_demux_check_caps (GstAviDemux * avi, GstAviStream * stream,
size = map.size; size = map.size;
if (size >= 4) { if (size >= 4) {
guint32 h = GST_READ_UINT32_BE (data); guint32 h = GST_READ_UINT32_BE (data);
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
if (h == 0x01) { if (h == 0x01 || (h >> 8) == 0x01) {
/* can hardly be valid AVC codec data */ /* can hardly be valid AVC codec data */
GST_DEBUG_OBJECT (avi, GST_DEBUG_OBJECT (avi,
"discarding invalid codec_data containing byte-stream"); "discarding invalid codec_data containing byte-stream");
@ -2001,6 +1999,7 @@ gst_avi_demux_check_caps (GstAviDemux * avi, GstAviStream * stream,
gst_buffer_unmap (buf, &map); gst_buffer_unmap (buf, &map);
} }
} }
}
return caps; return caps;
} }