diff options
author | Diederick Niehorster <dcnieho@gmail.com> | 2022-01-02 10:49:40 +0100 |
---|---|---|
committer | Gyan Doshi <ffmpeg@gyani.pro> | 2022-01-04 17:41:05 +0530 |
commit | e84d8ba44141b55f2b28e0ad3b597d2e7d422336 (patch) | |
tree | b478731db3bf27f1f35fa67fbe2a1a251409fecd | |
parent | 25518f2aa6821cd37bb20b53853eb1b2ef95b755 (diff) | |
download | ffmpeg-e84d8ba44141b55f2b28e0ad3b597d2e7d422336.tar.gz |
avdevice/dshow: ensure pin's default format is set
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>
-rw-r--r-- | libavdevice/dshow.c | 88 |
1 files changed, 54 insertions, 34 deletions
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index f2d95fa470..a435ae1807 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -758,6 +758,31 @@ static struct dshow_format_info *dshow_get_format_info(AM_MEDIA_TYPE *type) 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, * 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); if (use_default && pformat_set) { - HRESULT hr; - // get default - 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) - 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; - } + dshow_get_default_format(pin, config, devtype, &type); + if (!type) + // this pin does not expose any formats of the expected type + goto end; if (type) { // interrogate default format, so we know what to search for below @@ -1040,15 +1044,31 @@ next: CoTaskMemFree(type); type = NULL; } - // previously found a matching VIDEOINFOHEADER format and stored - // it for safe keeping. Searching further for a matching - // VIDEOINFOHEADER2 format yielded nothing. So set the pin's - // format based on the VIDEOINFOHEADER format. - // NB: this never applies to an audio format because - // previous_match_type always NULL in that case - if (pformat_set && !format_set && previous_match_type) { - if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) - format_set = 1; + + // set the pin's format, if wanted + if (pformat_set && !format_set) { + if (previous_match_type) { + // previously found a matching VIDEOINFOHEADER format and stored + // it for safe keeping. Searching further for a matching + // VIDEOINFOHEADER2 format yielded nothing. So set the pin's + // format based on the VIDEOINFOHEADER format. + // 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: |