mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Do not fail media check when fields are related to (decoding) elements

Browse source 
In the case of h264 the stream might very well be in `nal` format but the decoder
might not accept it thus the parser converts to `byte-stream`, leading
to a correct stream detection but a failure in the validate-media-check
tool.
This commit is contained in:
Thibault Saunier 2017-02-06 15:51:57 -03:00
parent 823ce95d70
commit 9790823d2a
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
validate/gst/validate/media-descriptor.c
View file

@ -406,24 +406,48 @@ compare_frames_list (GstValidateMediaDescriptor * ref,
return TRUE; return TRUE;
} }
static GstCaps *
_caps_cleanup_format_specific_fields (GstCaps * caps)
{
gint i;
GstCaps *res = gst_caps_copy (caps);
for (i = 0; i < gst_caps_get_size (res); i++) {
GstStructure *s = gst_caps_get_structure (res, i);
if (gst_structure_has_name (s, "video/x-h264")) {
gst_structure_remove_fields (s, "stream-format", "codec_data", NULL);
}
}
return res;
}
/* Return -1 if not found 1 if OK 0 if an error occured */ /* Return -1 if not found 1 if OK 0 if an error occured */
static gint static gint
compare_streams (GstValidateMediaDescriptor * ref, compare_streams (GstValidateMediaDescriptor * ref,
GstValidateMediaStreamNode * rstream, GstValidateMediaStreamNode * cstream) GstValidateMediaStreamNode * rstream, GstValidateMediaStreamNode * cstream)
{ {
if (stream_id_is_equal (ref->filenode->uri, rstream->id, cstream->id)) { if (stream_id_is_equal (ref->filenode->uri, rstream->id, cstream->id)) {
if (!gst_caps_is_equal (rstream->caps, cstream->caps)) { GstCaps *rcaps = _caps_cleanup_format_specific_fields (rstream->caps),
gchar *rcaps = gst_caps_to_string (rstream->caps), *ccaps = _caps_cleanup_format_specific_fields (cstream->caps);
*ccaps = gst_caps_to_string (cstream->caps); gchar *rcaps_str = gst_caps_to_string (rcaps),
*ccaps_str = gst_caps_to_string (ccaps);
if (!gst_caps_is_equal (rcaps, ccaps)) {
GST_VALIDATE_REPORT (ref, FILE_PROFILE_INCORRECT, GST_VALIDATE_REPORT (ref, FILE_PROFILE_INCORRECT,
"Reference descriptor for stream %s has caps: %s" "Reference descriptor for stream %s has caps: %s"
" but compared stream %s has caps: %s", " but compared stream %s has caps: %s",
rstream->id, rcaps, cstream->id, ccaps); rstream->id, rcaps_str, cstream->id, ccaps_str);
g_free (rcaps); gst_caps_unref (rcaps);
g_free (ccaps); gst_caps_unref (ccaps);
g_free (rcaps_str);
g_free (ccaps_str);
return 0; return 0;
} }
gst_caps_unref (rcaps);
gst_caps_unref (ccaps);
/* We ignore the return value on purpose as this is not critical */ /* We ignore the return value on purpose as this is not critical */
compare_tags (ref, rstream, cstream); compare_tags (ref, rstream, cstream);