v4l2: videodec: choose format from caps

https://bugzilla.gnome.org/show_bug.cgi?id=733827
This commit is contained in:
Philipp Zabel 2015-03-25 16:32:55 +01:00 committed by Nicolas Dufresne
parent cf29e6c0b7
commit c75a69d415

View file

@ -465,6 +465,8 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
GstVideoInfo info; GstVideoInfo info;
GstVideoCodecState *output_state; GstVideoCodecState *output_state;
GstBuffer *codec_data; GstBuffer *codec_data;
GstCaps *acquired_caps, *caps, *filter;
GstStructure *st;
GST_DEBUG_OBJECT (self, "Sending header"); GST_DEBUG_OBJECT (self, "Sending header");
@ -506,6 +508,34 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
if (!gst_v4l2_object_acquire_format (self->v4l2capture, &info)) if (!gst_v4l2_object_acquire_format (self->v4l2capture, &info))
goto not_negotiated; goto not_negotiated;
/* Create caps from the acquired format, remove the format field */
acquired_caps = gst_video_info_to_caps (&info);
st = gst_caps_get_structure (acquired_caps, 0);
gst_structure_remove_field (st, "format");
/* Probe currently available pixel formats */
filter = gst_v4l2_object_probe_caps (self->v4l2capture, acquired_caps);
gst_caps_unref (acquired_caps);
caps = gst_pad_peer_query_caps (decoder->srcpad, filter);
gst_caps_unref (filter);
GST_DEBUG_OBJECT (self, "Possible decoded caps: %" GST_PTR_FORMAT,
caps);
if (gst_caps_is_empty (caps)) {
gst_caps_unref (caps);
goto not_negotiated;
}
/* Fixate pixel format */
caps = gst_caps_fixate(caps);
GST_DEBUG_OBJECT (self, "Chosen decoded caps: %" GST_PTR_FORMAT, caps);
/* Try to set negotiated format, on success replace acquired format */
if (gst_v4l2_object_set_format (self->v4l2capture, caps))
gst_video_info_from_caps (&info, caps);
gst_caps_unref (caps);
output_state = gst_video_decoder_set_output_state (decoder, output_state = gst_video_decoder_set_output_state (decoder,
info.finfo->format, info.width, info.height, self->input_state); info.finfo->format, info.width, info.height, self->input_state);