mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapiencode: h264: check for avc in set_config()

Browse source 
The check for avc stream format was done in the vaapi encoder's
vmethod get_caps(), but that is wrong since it has to be check
when encoder set_format().

https://bugzilla.gnome.org/show_bug.cgi?id=757941
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-06-21 19:30:55 +02:00
parent e7bba345de
commit b713af42a1
1 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst/vaapi/gstvaapiencode_h264.c
View file

@ -281,17 +281,33 @@ find_best_profile (GstCaps * caps)
static gboolean static gboolean
gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode) gst_vaapiencode_h264_set_config (GstVaapiEncode * base_encode)
{ {
GstVaapiEncodeH264 *const encode = GST_VAAPIENCODE_H264_CAST (base_encode);
GstVaapiEncoderH264 *const encoder = GstVaapiEncoderH264 *const encoder =
GST_VAAPI_ENCODER_H264 (base_encode->encoder); GST_VAAPI_ENCODER_H264 (base_encode->encoder);
GstCaps *allowed_caps; GstCaps *allowed_caps;
GstVaapiProfile profile; GstVaapiProfile profile;
const char *stream_format = NULL;
GstStructure *structure;
guint i, num_structures;
/* Check for the largest profile that is supported */
allowed_caps = allowed_caps =
gst_pad_get_allowed_caps (GST_VAAPI_PLUGIN_BASE_SRC_PAD (base_encode)); gst_pad_get_allowed_caps (GST_VAAPI_PLUGIN_BASE_SRC_PAD (base_encode));
if (!allowed_caps) if (!allowed_caps)
return TRUE; return TRUE;
/* Check whether "stream-format" is avcC mode */
num_structures = gst_caps_get_size (allowed_caps);
for (i = 0; !stream_format && i < num_structures; i++) {
structure = gst_caps_get_structure (allowed_caps, i);
if (!gst_structure_has_field_typed (structure, "stream-format",
G_TYPE_STRING))
continue;
stream_format = gst_structure_get_string (structure, "stream-format");
}
encode->is_avc = stream_format && strcmp (stream_format, "avc") == 0;
base_encode->need_codec_data = encode->is_avc;
/* Check for the largest profile that is supported */
profile = find_best_profile (allowed_caps); profile = find_best_profile (allowed_caps);
gst_caps_unref (allowed_caps); gst_caps_unref (allowed_caps);
if (profile) { if (profile) {
@ -307,34 +323,13 @@ static GstCaps *
gst_vaapiencode_h264_get_caps (GstVaapiEncode * base_encode) gst_vaapiencode_h264_get_caps (GstVaapiEncode * base_encode)
{ {
GstVaapiEncodeH264 *const encode = GST_VAAPIENCODE_H264_CAST (base_encode); GstVaapiEncodeH264 *const encode = GST_VAAPIENCODE_H264_CAST (base_encode);
GstCaps *caps, *allowed_caps; GstCaps *caps;
caps = gst_caps_from_string (GST_CODEC_CAPS); caps = gst_caps_from_string (GST_CODEC_CAPS);
/* Check whether "stream-format" is avcC mode */
allowed_caps =
gst_pad_get_allowed_caps (GST_VAAPI_PLUGIN_BASE_SRC_PAD (encode));
if (allowed_caps) {
const char *stream_format = NULL;
GstStructure *structure;
guint i, num_structures;
num_structures = gst_caps_get_size (allowed_caps);
for (i = 0; !stream_format && i < num_structures; i++) {
structure = gst_caps_get_structure (allowed_caps, i);
if (!gst_structure_has_field_typed (structure, "stream-format",
G_TYPE_STRING))
continue;
stream_format = gst_structure_get_string (structure, "stream-format");
}
encode->is_avc = stream_format && strcmp (stream_format, "avc") == 0;
gst_caps_unref (allowed_caps);
}
gst_caps_set_simple (caps, "stream-format", G_TYPE_STRING, gst_caps_set_simple (caps, "stream-format", G_TYPE_STRING,
encode->is_avc ? "avc" : "byte-stream", NULL); encode->is_avc ? "avc" : "byte-stream", NULL);
base_encode->need_codec_data = encode->is_avc;
/* XXX: update profile and level information */ /* XXX: update profile and level information */
return caps; return caps;
} }