mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklinkvideosrc: Fix PAL/NTSC widescreen autodetection when switching back to non-widescreen

Browse source 
Previously it would only switch to widescreen but never back.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2469>
This commit is contained in:
Sebastian Dröge 2021-08-18 09:13:45 +03:00
parent 86872b1b46
commit 751f68740f
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/decklink/gstdecklinkvideosrc.cpp
View file

@ -1265,6 +1265,11 @@ retry:
vf->input = self->input->input; vf->input = self->input->input;
vf->input->AddRef (); vf->input->AddRef ();
// Reset aspect ratio flag if the mode has changed. The new mode might not
// have AFD/Bar VANC.
if (self->caps_mode != f.mode) {
self->aspect_ratio_flag = -1;
}
// If we have a format that supports VANC and we are asked to extract CC, // If we have a format that supports VANC and we are asked to extract CC,
// then do it here. // then do it here.
if ((self->output_cc || self->output_afd_bar) if ((self->output_cc || self->output_afd_bar)
@ -1277,22 +1282,33 @@ retry:
// If there was AFD information with the aspect ratio flag set and the mode // If there was AFD information with the aspect ratio flag set and the mode
// is auto then we have to switch from normal NTSC/PAL to the widescreen // is auto then we have to switch from normal NTSC/PAL to the widescreen
// variants // variants
if (self->aspect_ratio_flag == 1 && self->mode == GST_DECKLINK_MODE_AUTO) { if (self->aspect_ratio_flag != -1 && self->mode == GST_DECKLINK_MODE_AUTO) {
switch (f.mode) { switch (f.mode) {
case GST_DECKLINK_MODE_NTSC: case GST_DECKLINK_MODE_NTSC:
f.mode = GST_DECKLINK_MODE_NTSC_WIDESCREEN; f.mode =
self->aspect_ratio_flag ==
1 ? GST_DECKLINK_MODE_NTSC_WIDESCREEN : GST_DECKLINK_MODE_NTSC;
break; break;
case GST_DECKLINK_MODE_NTSC_P: case GST_DECKLINK_MODE_NTSC_P:
f.mode = GST_DECKLINK_MODE_NTSC_P_WIDESCREEN; f.mode =
self->aspect_ratio_flag ==
1 ? GST_DECKLINK_MODE_NTSC_P_WIDESCREEN : GST_DECKLINK_MODE_NTSC_P;
break; break;
case GST_DECKLINK_MODE_NTSC2398: case GST_DECKLINK_MODE_NTSC2398:
f.mode = GST_DECKLINK_MODE_NTSC2398_WIDESCREEN; f.mode =
self->aspect_ratio_flag ==
1 ? GST_DECKLINK_MODE_NTSC2398_WIDESCREEN :
GST_DECKLINK_MODE_NTSC2398;
break; break;
case GST_DECKLINK_MODE_PAL: case GST_DECKLINK_MODE_PAL:
f.mode = GST_DECKLINK_MODE_PAL_WIDESCREEN; f.mode =
self->aspect_ratio_flag ==
1 ? GST_DECKLINK_MODE_PAL_WIDESCREEN : GST_DECKLINK_MODE_PAL;
break; break;
case GST_DECKLINK_MODE_PAL_P: case GST_DECKLINK_MODE_PAL_P:
f.mode = GST_DECKLINK_MODE_PAL_P_WIDESCREEN; f.mode =
self->aspect_ratio_flag ==
1 ? GST_DECKLINK_MODE_PAL_P_WIDESCREEN : GST_DECKLINK_MODE_PAL_P;
break; break;
default: default:
break; break;