virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avdevice/dshow: ensure pin's default format is set

Browse Source 
Fixes regression in a1c4929f: there apparently are devices out there
that expose a pin default format that has parameters outside the
capabilities of any of the formats exposed on the pin (sic?). The
VirtualCam plugin (v 2.0.5) of OBS-Studio (v 27.1.3) is such a device.
Now when a default format was found, but not selected when iterating all
formats, fall back to directly setting the default format.

Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
This commit is contained in:
Diederick Niehorster 2022-01-02 10:49:40 +01:00 committed by Gyan Doshi
parent 25518f2aa6
commit e84d8ba441
1 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
libavdevice/dshow.c
View File

@ -758,6 +758,31 @@ static struct dshow_format_info *dshow_get_format_info(AM_MEDIA_TYPE *type)
return fmt_info; return fmt_info;
} }
static void dshow_get_default_format(IPin *pin, IAMStreamConfig *config, enum dshowDeviceType devtype, AM_MEDIA_TYPE **type)
{
HRESULT hr;
if ((hr = IAMStreamConfig_GetFormat(config, type)) != S_OK) {
if (hr == E_NOTIMPL || !IsEqualGUID(&(*type)->majortype, devtype == VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) {
// default not available or of wrong type,
// fall back to iterating exposed formats
// until one of the right type is found
IEnumMediaTypes* types = NULL;
if (IPin_EnumMediaTypes(pin, &types) != S_OK)
return;
IEnumMediaTypes_Reset(types);
while (IEnumMediaTypes_Next(types, 1, type, NULL) == S_OK) {
if (IsEqualGUID(&(*type)->majortype, devtype == VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) {
break;
}
CoTaskMemFree(*type);
*type = NULL;
}
IEnumMediaTypes_Release(types);
}
}
}
/** /**
* Cycle through available formats available from the specified pin, * Cycle through available formats available from the specified pin,
* try to set parameters specified through AVOptions, or the pin's * try to set parameters specified through AVOptions, or the pin's
@ -813,32 +838,11 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
use_default = !dshow_should_set_format(avctx, devtype); use_default = !dshow_should_set_format(avctx, devtype);
if (use_default && pformat_set) if (use_default && pformat_set)
{ {
HRESULT hr;
// get default // get default
if ((hr = IAMStreamConfig_GetFormat(config, &type)) != S_OK) { dshow_get_default_format(pin, config, devtype, &type);
if (hr == E_NOTIMPL || !IsEqualGUID(&type->majortype, devtype==VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) { if (!type)
// default not available or of wrong type, // this pin does not expose any formats of the expected type
// fall back to iterating exposed formats goto end;
// until one of the right type is found
IEnumMediaTypes *types = NULL;
if (IPin_EnumMediaTypes(pin, &types) != S_OK)
goto end;
IEnumMediaTypes_Reset(types);
while (IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK) {
if (IsEqualGUID(&type->majortype, devtype==VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) {
break;
}
CoTaskMemFree(type);
type = NULL;
}
IEnumMediaTypes_Release(types);
}
if (!type)
// this pin does not expose any formats of the expected type
goto end;
}
if (type) { if (type) {
// interrogate default format, so we know what to search for below // interrogate default format, so we know what to search for below
@ -1040,15 +1044,31 @@ next:
CoTaskMemFree(type); CoTaskMemFree(type);
type = NULL; type = NULL;
} }
// previously found a matching VIDEOINFOHEADER format and stored
// it for safe keeping. Searching further for a matching // set the pin's format, if wanted
// VIDEOINFOHEADER2 format yielded nothing. So set the pin's if (pformat_set && !format_set) {
// format based on the VIDEOINFOHEADER format. if (previous_match_type) {
// NB: this never applies to an audio format because // previously found a matching VIDEOINFOHEADER format and stored
// previous_match_type always NULL in that case // it for safe keeping. Searching further for a matching
if (pformat_set && !format_set && previous_match_type) { // VIDEOINFOHEADER2 format yielded nothing. So set the pin's
if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) // format based on the VIDEOINFOHEADER format.
format_set = 1; // NB: this never applies to an audio format because
// previous_match_type always NULL in that case
if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK)
format_set = 1;
}
else if (use_default) {
// default format returned by device apparently was not contained
// in the capabilities of any of the formats returned by the device
// (sic?). Fall back to directly setting the default format
dshow_get_default_format(pin, config, devtype, &type);
if (IAMStreamConfig_SetFormat(config, type) == S_OK)
format_set = 1;
if (type && type->pbFormat)
CoTaskMemFree(type->pbFormat);
CoTaskMemFree(type);
type = NULL;
}
} }
end: end: