diff options
Diffstat (limited to 'libavdevice/dshow_crossbar.c')
| -rw-r--r-- | libavdevice/dshow_crossbar.c | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c index 9c6301977b..e3012dfe17 100644 --- a/libavdevice/dshow_crossbar.c +++ b/libavdevice/dshow_crossbar.c @@ -142,23 +142,54 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, { struct dshow_ctx *ctx = avctx->priv_data; IAMCrossbar *cross_bar = NULL; - IBaseFilter *cross_bar_filter = NULL; + IBaseFilter *cross_bar_base_filter = NULL; + IAMTVTuner *tv_tuner_filter = NULL; + IBaseFilter *tv_tuner_base_filter = NULL; + IAMAudioInputMixer *tv_audio_filter = NULL; + IBaseFilter *tv_audio_base_filter = NULL; HRESULT hr; hr = ICaptureGraphBuilder2_FindInterface(graph_builder2, &LOOK_UPSTREAM_ONLY, (const GUID *) NULL, - (IBaseFilter *) device_filter, &IID_IAMCrossbar, (void**) &cross_bar); + device_filter, &IID_IAMCrossbar, (void**) &cross_bar); if (hr != S_OK) { /* no crossbar found */ hr = S_OK; goto end; } + /* TODO some TV tuners apparently have multiple crossbars? */ if (ctx->show_crossbar_connection_dialog) { - hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_filter); + hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_base_filter); if (hr != S_OK) goto end; - dshow_show_filter_properties(cross_bar_filter, avctx); + dshow_show_filter_properties(cross_bar_base_filter, avctx); } + + if (devtype == VideoDevice && ctx->show_analog_tv_tuner_dialog) { + hr = ICaptureGraphBuilder2_FindInterface(graph_builder2, &LOOK_UPSTREAM_ONLY, NULL, + device_filter, &IID_IAMTVTuner, (void**) &tv_tuner_filter); + if (hr == S_OK) { + hr = IAMCrossbar_QueryInterface(tv_tuner_filter, &IID_IBaseFilter, (void **) &tv_tuner_base_filter); + if (hr != S_OK) + goto end; + dshow_show_filter_properties(tv_tuner_base_filter, avctx); + } else { + av_log(avctx, AV_LOG_WARNING, "unable to find a tv tuner to display dialog for!"); + } + } + if (devtype == AudioDevice && ctx->show_analog_tv_tuner_audio_dialog) { + hr = ICaptureGraphBuilder2_FindInterface(graph_builder2, &LOOK_UPSTREAM_ONLY, NULL, + device_filter, &IID_IAMTVAudio, (void**) &tv_audio_filter); + if (hr == S_OK) { + hr = IAMCrossbar_QueryInterface(tv_audio_filter, &IID_IBaseFilter, (void **) &tv_audio_base_filter); + if (hr != S_OK) + goto end; + dshow_show_filter_properties(tv_audio_base_filter, avctx); + } else { + av_log(avctx, AV_LOG_WARNING, "unable to find a tv audio tuner to display dialog for!"); + } + } + hr = setup_crossbar_options(cross_bar, devtype, avctx); if (hr != S_OK) goto end; @@ -166,7 +197,11 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, end: if (cross_bar) IAMCrossbar_Release(cross_bar); - if (cross_bar_filter) - IBaseFilter_Release(cross_bar_filter); + if (cross_bar_base_filter) + IBaseFilter_Release(cross_bar_base_filter); + if (tv_tuner_filter) + IAMTVTuner_Release(tv_tuner_filter); + if (tv_tuner_base_filter) + IBaseFilter_Release(tv_tuner_base_filter); return hr; } |