mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 12:41:05 +00:00
vaapidecode: always reset decoder on ::set_format().
Split GstVideoDecoder::set_format() handler to first update the sink pad caps and reset the active VA decoder instance based on those, and then update the src pad caps whenever possible, e.g. when the caps specify a valid video resolution.
This commit is contained in:
parent
09dcb1e0f7
commit
0777f357aa
1 changed files with 9 additions and 7 deletions
|
@ -151,7 +151,7 @@ gst_vaapidecode_update_src_caps(GstVaapiDecode *decode,
|
||||||
state = gst_video_decoder_set_output_state(vdec, format,
|
state = gst_video_decoder_set_output_state(vdec, format,
|
||||||
ref_state->info.width, ref_state->info.height,
|
ref_state->info.width, ref_state->info.height,
|
||||||
(GstVideoCodecState *)ref_state);
|
(GstVideoCodecState *)ref_state);
|
||||||
if (!state)
|
if (!state || state->info.width == 0 || state->info.height == 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
vi = &state->info;
|
vi = &state->info;
|
||||||
|
@ -735,15 +735,17 @@ gst_vaapidecode_set_format(GstVideoDecoder *vdec, GstVideoCodecState *state)
|
||||||
|
|
||||||
if (!gst_vaapidecode_update_sink_caps(decode, state->caps))
|
if (!gst_vaapidecode_update_sink_caps(decode, state->caps))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if (!gst_vaapidecode_update_src_caps(decode, state))
|
if (!gst_vaapi_plugin_base_set_caps(plugin, decode->sinkpad_caps, NULL))
|
||||||
return FALSE;
|
|
||||||
if (!gst_video_decoder_negotiate(vdec))
|
|
||||||
return FALSE;
|
|
||||||
if (!gst_vaapi_plugin_base_set_caps(plugin, decode->sinkpad_caps,
|
|
||||||
decode->srcpad_caps))
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if (!gst_vaapidecode_reset_full(decode, decode->sinkpad_caps, FALSE))
|
if (!gst_vaapidecode_reset_full(decode, decode->sinkpad_caps, FALSE))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
if (gst_vaapidecode_update_src_caps(decode, state)) {
|
||||||
|
if (!gst_video_decoder_negotiate(vdec))
|
||||||
|
return FALSE;
|
||||||
|
if (!gst_vaapi_plugin_base_set_caps(plugin, NULL, decode->srcpad_caps))
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue