Merge remote-tracking branch 'rdp/dshow_crossbar'
* rdp/dshow_crossbar: dshow: fix docu escapes dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name. dshow: add options for allowing filter popup configuration dialogs to be presented to the user dshow: introduce support for crossbar [multiple input selectable] devices dshow: drop initial audio packets with weird timestamps dshow: use non deprecated api dshow: miscellaneous tweaks dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
76241c9115
2
configure
vendored
2
configure
vendored
@ -2487,7 +2487,7 @@ decklink_outdev_extralibs="-lstdc++"
|
||||
decklink_indev_deps="decklink pthreads"
|
||||
decklink_indev_extralibs="-lstdc++"
|
||||
dshow_indev_deps="IBaseFilter"
|
||||
dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
|
||||
dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32"
|
||||
dv1394_indev_deps="dv1394"
|
||||
dv1394_indev_select="dv_demuxer"
|
||||
fbdev_indev_deps="linux_fb_h"
|
||||
|
||||
@ -167,7 +167,7 @@ The input name should be in the format:
|
||||
@end example
|
||||
|
||||
where @var{TYPE} can be either @var{audio} or @var{video},
|
||||
and @var{NAME} is the device's name.
|
||||
and @var{NAME} is the device's name or alternative name..
|
||||
|
||||
@subsection Options
|
||||
|
||||
@ -220,6 +220,39 @@ Setting this value too low can degrade performance.
|
||||
See also
|
||||
@url{http://msdn.microsoft.com/en-us/library/windows/desktop/dd377582(v=vs.85).aspx}
|
||||
|
||||
@item video_pin_name
|
||||
Select video capture pin to use by name or alternative name.
|
||||
|
||||
@item audio_pin_name
|
||||
Select audio capture pin to use by name or alternative name.
|
||||
|
||||
@item crossbar_video_input_pin_number
|
||||
Select video input pin number for crossbar device. This will be
|
||||
routed to the crossbar device's Video Decoder output pin.
|
||||
|
||||
@item crossbar_audio_input_pin_number
|
||||
Select audio input pin number for crossbar device. This will be
|
||||
routed to the crossbar device's Audio Decoder output pin.
|
||||
|
||||
@item show_video_device_dialog
|
||||
If set to @option{true}, before capture starts, popup a display dialog
|
||||
to the end user, allowing them to change video filter properties
|
||||
and configurations manually.
|
||||
Note that for crossbar devices, this may be needed at times to toggle
|
||||
between PAL and NTSC input frame rates and sizes, etc. Possibly
|
||||
enabling different scan rates/frame rates and avoiding green bars at
|
||||
the bottom, etc.
|
||||
|
||||
@item show_audio_device_dialog
|
||||
If set to @option{true}, before capture starts, popup a display dialog
|
||||
to the end user, allowing them to change audio filter properties
|
||||
and configurations manually.
|
||||
|
||||
@item show_crossbar_connection_dialog
|
||||
If set to @option{true}, before capture starts, popup a display
|
||||
dialog to the end user, allowing them to manually
|
||||
modify crossbar pin routings.
|
||||
|
||||
@end table
|
||||
|
||||
@subsection Examples
|
||||
@ -256,6 +289,19 @@ Print the list of supported options in selected device and exit:
|
||||
$ ffmpeg -list_options true -f dshow -i video="Camera"
|
||||
@end example
|
||||
|
||||
@item
|
||||
Specify pin names to capture by name or alternative name, specify alternative device name:
|
||||
@example
|
||||
$ ffmpeg -f dshow -audio_pin_name "Audio Out" -video_pin_name 2 -i video=video="@@device_pnp_\\?\pci#ven_1a0a&dev_6200&subsys_62021461&rev_01#4&e2c7dd6&0&00e1#@{65e8773d-8f56-11d0-a3b9-00a0c9223196@}\@{ca465100-deb0-4d59-818f-8c477184adf6@}":audio="Microphone"
|
||||
@end example
|
||||
|
||||
@item
|
||||
Configure a crossbar device, specifying crossbar pins, allow user to adjust video capture properties at startup:
|
||||
@example
|
||||
$ ffmpeg -f dshow -show_video_device_dialog true -crossbar_video_input_pin_number 0
|
||||
-crossbar_audio_input_pin_number 3 -i video="AVerMedia BDA Analog Capture":audio="AVerMedia BDA Analog Capture"
|
||||
@end example
|
||||
|
||||
@end itemize
|
||||
|
||||
@section dv1394
|
||||
|
||||
@ -19,7 +19,7 @@ OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
|
||||
OBJS-$(CONFIG_CACA_OUTDEV) += caca.o
|
||||
OBJS-$(CONFIG_DECKLINK_OUTDEV) += decklink_enc.o decklink_enc_c.o decklink_common.o
|
||||
OBJS-$(CONFIG_DECKLINK_INDEV) += decklink_dec.o decklink_dec_c.o decklink_common.o
|
||||
OBJS-$(CONFIG_DSHOW_INDEV) += dshow.o dshow_enummediatypes.o \
|
||||
OBJS-$(CONFIG_DSHOW_INDEV) += dshow_crossbar.o dshow.o dshow_enummediatypes.o \
|
||||
dshow_enumpins.o dshow_filter.o \
|
||||
dshow_pin.o dshow_common.o
|
||||
OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
|
||||
|
||||
@ -28,49 +28,6 @@
|
||||
#include "avdevice.h"
|
||||
#include "libavcodec/raw.h"
|
||||
|
||||
struct dshow_ctx {
|
||||
const AVClass *class;
|
||||
|
||||
IGraphBuilder *graph;
|
||||
|
||||
char *device_name[2];
|
||||
int video_device_number;
|
||||
int audio_device_number;
|
||||
|
||||
int list_options;
|
||||
int list_devices;
|
||||
int audio_buffer_size;
|
||||
|
||||
IBaseFilter *device_filter[2];
|
||||
IPin *device_pin[2];
|
||||
libAVFilter *capture_filter[2];
|
||||
libAVPin *capture_pin[2];
|
||||
|
||||
HANDLE mutex;
|
||||
HANDLE event[2]; /* event[0] is set by DirectShow
|
||||
* event[1] is set by callback() */
|
||||
AVPacketList *pktl;
|
||||
|
||||
int eof;
|
||||
|
||||
int64_t curbufsize[2];
|
||||
unsigned int video_frame_num;
|
||||
|
||||
IMediaControl *control;
|
||||
IMediaEvent *media_event;
|
||||
|
||||
enum AVPixelFormat pixel_format;
|
||||
enum AVCodecID video_codec_id;
|
||||
char *framerate;
|
||||
|
||||
int requested_width;
|
||||
int requested_height;
|
||||
AVRational requested_framerate;
|
||||
|
||||
int sample_rate;
|
||||
int sample_size;
|
||||
int channels;
|
||||
};
|
||||
|
||||
static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount)
|
||||
{
|
||||
@ -160,7 +117,7 @@ dshow_read_close(AVFormatContext *s)
|
||||
pktl = ctx->pktl;
|
||||
while (pktl) {
|
||||
AVPacketList *next = pktl->next;
|
||||
av_destruct_packet(&pktl->pkt);
|
||||
av_free_packet(&pktl->pkt);
|
||||
av_free(pktl);
|
||||
pktl = next;
|
||||
}
|
||||
@ -186,10 +143,12 @@ static int shall_we_drop(AVFormatContext *s, int index, enum dshowDeviceType dev
|
||||
static const uint8_t dropscore[] = {62, 75, 87, 100};
|
||||
const int ndropscores = FF_ARRAY_ELEMS(dropscore);
|
||||
unsigned int buffer_fullness = (ctx->curbufsize[index]*100)/s->max_picture_buffer;
|
||||
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio";
|
||||
|
||||
if(dropscore[++ctx->video_frame_num%ndropscores] <= buffer_fullness) {
|
||||
av_log(s, AV_LOG_ERROR,
|
||||
"real-time buffer[%s] too full (%d%% of size: %d)! frame dropped!\n", ctx->device_name[devtype], buffer_fullness, s->max_picture_buffer);
|
||||
"real-time buffer [%s] [%s input] too full or near too full (%d%% of size: %d [rtbufsize parameter])! frame dropped!\n",
|
||||
ctx->device_name[devtype], devtypename, buffer_fullness, s->max_picture_buffer);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -244,7 +203,7 @@ fail:
|
||||
*/
|
||||
static int
|
||||
dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
enum dshowDeviceType devtype, IBaseFilter **pfilter)
|
||||
enum dshowDeviceType devtype, enum dshowSourceFilterType sourcetype, IBaseFilter **pfilter)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
IBaseFilter *device_filter = NULL;
|
||||
@ -257,20 +216,43 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
|
||||
const GUID *device_guid[2] = { &CLSID_VideoInputDeviceCategory,
|
||||
&CLSID_AudioInputDeviceCategory };
|
||||
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio";
|
||||
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio only";
|
||||
const char *sourcetypename = (sourcetype == VideoSourceDevice) ? "video" : "audio";
|
||||
|
||||
r = ICreateDevEnum_CreateClassEnumerator(devenum, device_guid[devtype],
|
||||
r = ICreateDevEnum_CreateClassEnumerator(devenum, device_guid[sourcetype],
|
||||
(IEnumMoniker **) &classenum, 0);
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not enumerate %s devices.\n",
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not enumerate %s devices (or none found).\n",
|
||||
devtypename);
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
|
||||
while (!device_filter && IEnumMoniker_Next(classenum, 1, &m, NULL) == S_OK) {
|
||||
IPropertyBag *bag = NULL;
|
||||
char *buf = NULL;
|
||||
char *friendly_name = NULL;
|
||||
char *unique_name = NULL;
|
||||
VARIANT var;
|
||||
IBindCtx *bind_ctx = NULL;
|
||||
LPOLESTR olestr = NULL;
|
||||
LPMALLOC co_malloc = NULL;
|
||||
int i;
|
||||
|
||||
r = CoGetMalloc(1, &co_malloc);
|
||||
if (r = S_OK)
|
||||
goto fail1;
|
||||
r = CreateBindCtx(0, &bind_ctx);
|
||||
if (r != S_OK)
|
||||
goto fail1;
|
||||
/* GetDisplayname works for both video and audio, DevicePath doesn't */
|
||||
r = IMoniker_GetDisplayName(m, bind_ctx, NULL, &olestr);
|
||||
if (r != S_OK)
|
||||
goto fail1;
|
||||
unique_name = dup_wchar_to_utf8(olestr);
|
||||
/* replace ':' with '_' since we use : to delineate between sources */
|
||||
for (i = 0; i < strlen(unique_name); i++) {
|
||||
if (unique_name[i] == ':')
|
||||
unique_name[i] = '_';
|
||||
}
|
||||
|
||||
r = IMoniker_BindToStorage(m, 0, 0, &IID_IPropertyBag, (void *) &bag);
|
||||
if (r != S_OK)
|
||||
@ -280,21 +262,31 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
r = IPropertyBag_Read(bag, L"FriendlyName", &var, NULL);
|
||||
if (r != S_OK)
|
||||
goto fail1;
|
||||
|
||||
buf = dup_wchar_to_utf8(var.bstrVal);
|
||||
friendly_name = dup_wchar_to_utf8(var.bstrVal);
|
||||
|
||||
if (pfilter) {
|
||||
if (strcmp(device_name, buf))
|
||||
if (strcmp(device_name, friendly_name) && strcmp(device_name, unique_name))
|
||||
goto fail1;
|
||||
|
||||
if (!skip--)
|
||||
IMoniker_BindToObject(m, 0, 0, &IID_IBaseFilter, (void *) &device_filter);
|
||||
if (!skip--) {
|
||||
r = IMoniker_BindToObject(m, 0, 0, &IID_IBaseFilter, (void *) &device_filter);
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to BindToObject for %s\n", device_name);
|
||||
goto fail1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
av_log(avctx, AV_LOG_INFO, " \"%s\"\n", buf);
|
||||
av_log(avctx, AV_LOG_INFO, " \"%s\"\n", friendly_name);
|
||||
av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name);
|
||||
}
|
||||
|
||||
fail1:
|
||||
av_free(buf);
|
||||
if (olestr && co_malloc)
|
||||
IMalloc_Free(co_malloc, olestr);
|
||||
if (bind_ctx)
|
||||
IBindCtx_Release(bind_ctx);
|
||||
av_free(friendly_name);
|
||||
av_free(unique_name);
|
||||
if (bag)
|
||||
IPropertyBag_Release(bag);
|
||||
IMoniker_Release(m);
|
||||
@ -304,8 +296,8 @@ fail1:
|
||||
|
||||
if (pfilter) {
|
||||
if (!device_filter) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not find %s device.\n",
|
||||
devtypename);
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not find %s device with name [%s] among source devices of type %s.\n",
|
||||
devtypename, device_name, sourcetypename);
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
*pfilter = device_filter;
|
||||
@ -329,7 +321,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
AM_MEDIA_TYPE *type = NULL;
|
||||
int format_set = 0;
|
||||
void *caps = NULL;
|
||||
int i, n, size;
|
||||
int i, n, size, r;
|
||||
|
||||
if (IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **) &config) != S_OK)
|
||||
return;
|
||||
@ -341,8 +333,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
goto end;
|
||||
|
||||
for (i = 0; i < n && !format_set; i++) {
|
||||
IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps);
|
||||
|
||||
r = IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps);
|
||||
if (r != S_OK)
|
||||
goto next;
|
||||
#if DSHOWDEBUG
|
||||
ff_print_AM_MEDIA_TYPE(type);
|
||||
#endif
|
||||
@ -507,6 +500,53 @@ end:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pops up a user dialog allowing them to adjust properties for the given filter, if possible.
|
||||
*/
|
||||
void
|
||||
dshow_show_filter_properties(IBaseFilter *device_filter, AVFormatContext *avctx) {
|
||||
ISpecifyPropertyPages *property_pages = NULL;
|
||||
IUnknown *device_filter_iunknown = NULL;
|
||||
HRESULT hr;
|
||||
FILTER_INFO filter_info = {0}; /* a warning on this line is false positive GCC bug 53119 AFAICT */
|
||||
CAUUID ca_guid = {0};
|
||||
|
||||
hr = IBaseFilter_QueryInterface(device_filter, &IID_ISpecifyPropertyPages, (void **)&property_pages);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_WARNING, "requested filter does not have a property page to show");
|
||||
goto end;
|
||||
}
|
||||
hr = IBaseFilter_QueryFilterInfo(device_filter, &filter_info);
|
||||
if (hr != S_OK) {
|
||||
goto fail;
|
||||
}
|
||||
hr = IBaseFilter_QueryInterface(device_filter, &IID_IUnknown, (void **)&device_filter_iunknown);
|
||||
if (hr != S_OK) {
|
||||
goto fail;
|
||||
}
|
||||
hr = ISpecifyPropertyPages_GetPages(property_pages, &ca_guid);
|
||||
if (hr != S_OK) {
|
||||
goto fail;
|
||||
}
|
||||
hr = OleCreatePropertyFrame(NULL, 0, 0, filter_info.achName, 1, &device_filter_iunknown, ca_guid.cElems,
|
||||
ca_guid.pElems, 0, 0, NULL);
|
||||
if (hr != S_OK) {
|
||||
goto fail;
|
||||
}
|
||||
goto end;
|
||||
fail:
|
||||
av_log(avctx, AV_LOG_ERROR, "Failure showing property pages for filter");
|
||||
end:
|
||||
if (property_pages)
|
||||
ISpecifyPropertyPages_Release(property_pages);
|
||||
if (device_filter_iunknown)
|
||||
IUnknown_Release(device_filter_iunknown);
|
||||
if (filter_info.pGraph)
|
||||
IFilterGraph_Release(filter_info.pGraph);
|
||||
if (ca_guid.pElems)
|
||||
CoTaskMemFree(ca_guid.pElems);
|
||||
}
|
||||
|
||||
/**
|
||||
* Cycle through available pins using the device_filter device, of type
|
||||
* devtype, retrieve the first output pin and return the pointer to the
|
||||
@ -515,7 +555,7 @@ end:
|
||||
*/
|
||||
static int
|
||||
dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
IBaseFilter *device_filter, IPin **ppin)
|
||||
enum dshowSourceFilterType sourcetype, IBaseFilter *device_filter, IPin **ppin)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
IEnumPins *pins = 0;
|
||||
@ -524,7 +564,8 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
int r;
|
||||
|
||||
const GUID *mediatype[2] = { &MEDIATYPE_Video, &MEDIATYPE_Audio };
|
||||
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio";
|
||||
const char *devtypename = (devtype == VideoDevice) ? "video" : "audio only";
|
||||
const char *sourcetypename = (sourcetype == VideoSourceDevice) ? "video" : "audio";
|
||||
|
||||
int set_format = (devtype == VideoDevice && (ctx->framerate ||
|
||||
(ctx->requested_width && ctx->requested_height) ||
|
||||
@ -532,6 +573,10 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO))
|
||||
|| (devtype == AudioDevice && (ctx->channels || ctx->sample_rate));
|
||||
int format_set = 0;
|
||||
int should_show_properties = (devtype == VideoDevice) ? ctx->show_video_device_dialog : ctx->show_audio_device_dialog;
|
||||
|
||||
if (should_show_properties)
|
||||
dshow_show_filter_properties(device_filter, avctx);
|
||||
|
||||
r = IBaseFilter_EnumPins(device_filter, &pins);
|
||||
if (r != S_OK) {
|
||||
@ -540,9 +585,10 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
}
|
||||
|
||||
if (!ppin) {
|
||||
av_log(avctx, AV_LOG_INFO, "DirectShow %s device options\n",
|
||||
devtypename);
|
||||
av_log(avctx, AV_LOG_INFO, "DirectShow %s device options (from %s devices)\n",
|
||||
devtypename, sourcetypename);
|
||||
}
|
||||
|
||||
while (!device_pin && IEnumPins_Next(pins, 1, &pin, NULL) == S_OK) {
|
||||
IKsPropertySet *p = NULL;
|
||||
IEnumMediaTypes *types = NULL;
|
||||
@ -550,6 +596,10 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
AM_MEDIA_TYPE *type;
|
||||
GUID category;
|
||||
DWORD r2;
|
||||
char *name_buf = NULL;
|
||||
wchar_t *pin_id = NULL;
|
||||
char *pin_buf = NULL;
|
||||
char *desired_pin_name = devtype == VideoDevice ? ctx->video_pin_name : ctx->audio_pin_name;
|
||||
|
||||
IPin_QueryPinInfo(pin, &info);
|
||||
IBaseFilter_Release(info.pFilter);
|
||||
@ -563,14 +613,29 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
goto next;
|
||||
if (!IsEqualGUID(&category, &PIN_CATEGORY_CAPTURE))
|
||||
goto next;
|
||||
name_buf = dup_wchar_to_utf8(info.achName);
|
||||
|
||||
r = IPin_QueryId(pin, &pin_id);
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not query pin id\n");
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
pin_buf = dup_wchar_to_utf8(pin_id);
|
||||
|
||||
if (!ppin) {
|
||||
char *buf = dup_wchar_to_utf8(info.achName);
|
||||
av_log(avctx, AV_LOG_INFO, " Pin \"%s\"\n", buf);
|
||||
av_free(buf);
|
||||
av_log(avctx, AV_LOG_INFO, " Pin \"%s\" (alternative pin name \"%s\")\n", name_buf, pin_buf);
|
||||
dshow_cycle_formats(avctx, devtype, pin, NULL);
|
||||
goto next;
|
||||
}
|
||||
|
||||
if (desired_pin_name) {
|
||||
if(strcmp(name_buf, desired_pin_name) && strcmp(pin_buf, desired_pin_name)) {
|
||||
av_log(avctx, AV_LOG_DEBUG, "skipping pin \"%s\" (\"%s\") != requested \"%s\"\n",
|
||||
name_buf, pin_buf, desired_pin_name);
|
||||
goto next;
|
||||
}
|
||||
}
|
||||
|
||||
if (set_format) {
|
||||
dshow_cycle_formats(avctx, devtype, pin, &format_set);
|
||||
if (!format_set) {
|
||||
@ -587,9 +652,11 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype,
|
||||
goto next;
|
||||
|
||||
IEnumMediaTypes_Reset(types);
|
||||
/* in case format_set was not called, just verify the majortype */
|
||||
while (!device_pin && IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK) {
|
||||
if (IsEqualGUID(&type->majortype, mediatype[devtype])) {
|
||||
device_pin = pin;
|
||||
av_log(avctx, AV_LOG_DEBUG, "Selecting pin %s on %s\n", name_buf, devtypename);
|
||||
goto next;
|
||||
}
|
||||
CoTaskMemFree(type);
|
||||
@ -602,6 +669,10 @@ next:
|
||||
IKsPropertySet_Release(p);
|
||||
if (device_pin != pin)
|
||||
IPin_Release(pin);
|
||||
av_free(name_buf);
|
||||
av_free(pin_buf);
|
||||
if (pin_id)
|
||||
CoTaskMemFree(pin_id);
|
||||
}
|
||||
|
||||
IEnumPins_Release(pins);
|
||||
@ -623,22 +694,22 @@ next:
|
||||
}
|
||||
|
||||
/**
|
||||
* List options for device with type devtype.
|
||||
* List options for device with type devtype, source filter type sourcetype
|
||||
*
|
||||
* @param devenum device enumerator used for accessing the device
|
||||
*/
|
||||
static int
|
||||
dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
enum dshowDeviceType devtype)
|
||||
enum dshowDeviceType devtype, enum dshowSourceFilterType sourcetype)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
IBaseFilter *device_filter = NULL;
|
||||
int r;
|
||||
|
||||
if ((r = dshow_cycle_devices(avctx, devenum, devtype, &device_filter)) < 0)
|
||||
if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter)) < 0)
|
||||
return r;
|
||||
ctx->device_filter[devtype] = device_filter;
|
||||
if ((r = dshow_cycle_pins(avctx, devtype, device_filter, NULL)) < 0)
|
||||
if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0)
|
||||
return r;
|
||||
|
||||
return 0;
|
||||
@ -646,7 +717,7 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
|
||||
static int
|
||||
dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
enum dshowDeviceType devtype)
|
||||
enum dshowDeviceType devtype, enum dshowSourceFilterType sourcetype)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
IBaseFilter *device_filter = NULL;
|
||||
@ -654,12 +725,13 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
IPin *device_pin = NULL;
|
||||
libAVPin *capture_pin = NULL;
|
||||
libAVFilter *capture_filter = NULL;
|
||||
ICaptureGraphBuilder2 *graph_builder2 = NULL;
|
||||
int ret = AVERROR(EIO);
|
||||
int r;
|
||||
|
||||
const wchar_t *filter_name[2] = { L"Audio capture filter", L"Video capture filter" };
|
||||
|
||||
if ((r = dshow_cycle_devices(avctx, devenum, devtype, &device_filter)) < 0) {
|
||||
if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter)) < 0) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
@ -672,10 +744,11 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
goto error;
|
||||
}
|
||||
|
||||
if ((r = dshow_cycle_pins(avctx, devtype, device_filter, &device_pin)) < 0) {
|
||||
if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, &device_pin)) < 0) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
|
||||
ctx->device_pin[devtype] = device_pin;
|
||||
|
||||
capture_filter = libAVFilter_Create(avctx, callback, devtype);
|
||||
@ -696,15 +769,39 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
|
||||
capture_pin = capture_filter->pin;
|
||||
ctx->capture_pin[devtype] = capture_pin;
|
||||
|
||||
r = IGraphBuilder_ConnectDirect(graph, device_pin, (IPin *) capture_pin, NULL);
|
||||
r = CoCreateInstance(&CLSID_CaptureGraphBuilder2, NULL, CLSCTX_INPROC_SERVER,
|
||||
&IID_ICaptureGraphBuilder2, (void **) &graph_builder2);
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not connect pins\n");
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not create CaptureGraphBuilder2\n");
|
||||
goto error;
|
||||
}
|
||||
ICaptureGraphBuilder2_SetFiltergraph(graph_builder2, graph);
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not set graph for CaptureGraphBuilder2\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
r = ICaptureGraphBuilder2_RenderStream(graph_builder2, NULL, NULL, (IUnknown *) device_pin, NULL /* no intermediate filter */,
|
||||
(IBaseFilter *) capture_filter); /* connect pins, optionally insert intermediate filters like crossbar if necessary */
|
||||
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not RenderStream to connect pins\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
r = dshow_try_setup_crossbar_options(graph_builder2, device_filter, devtype, avctx);
|
||||
|
||||
if (r != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Could not setup CrossBar\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
|
||||
error:
|
||||
if (graph_builder2 != NULL)
|
||||
ICaptureGraphBuilder2_Release(graph_builder2);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -914,36 +1011,53 @@ static int dshow_read_header(AVFormatContext *avctx)
|
||||
}
|
||||
|
||||
if (ctx->list_devices) {
|
||||
av_log(avctx, AV_LOG_INFO, "DirectShow video devices\n");
|
||||
dshow_cycle_devices(avctx, devenum, VideoDevice, NULL);
|
||||
av_log(avctx, AV_LOG_INFO, "DirectShow video devices (some may be both video and audio devices)\n");
|
||||
dshow_cycle_devices(avctx, devenum, VideoDevice, VideoSourceDevice, NULL);
|
||||
av_log(avctx, AV_LOG_INFO, "DirectShow audio devices\n");
|
||||
dshow_cycle_devices(avctx, devenum, AudioDevice, NULL);
|
||||
dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL);
|
||||
ret = AVERROR_EXIT;
|
||||
goto error;
|
||||
}
|
||||
if (ctx->list_options) {
|
||||
if (ctx->device_name[VideoDevice])
|
||||
dshow_list_device_options(avctx, devenum, VideoDevice);
|
||||
if (ctx->device_name[AudioDevice])
|
||||
dshow_list_device_options(avctx, devenum, AudioDevice);
|
||||
ret = AVERROR_EXIT;
|
||||
if ((r = dshow_list_device_options(avctx, devenum, VideoDevice, VideoSourceDevice))) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (ctx->device_name[AudioDevice]) {
|
||||
if (dshow_list_device_options(avctx, devenum, AudioDevice, AudioSourceDevice)) {
|
||||
/* show audio options from combined video+audio sources as fallback */
|
||||
if ((r = dshow_list_device_options(avctx, devenum, AudioDevice, VideoSourceDevice))) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ctx->device_name[VideoDevice]) {
|
||||
if ((r = dshow_open_device(avctx, devenum, VideoDevice)) < 0 ||
|
||||
if ((r = dshow_open_device(avctx, devenum, VideoDevice, VideoSourceDevice)) < 0 ||
|
||||
(r = dshow_add_device(avctx, VideoDevice)) < 0) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
if (ctx->device_name[AudioDevice]) {
|
||||
if ((r = dshow_open_device(avctx, devenum, AudioDevice)) < 0 ||
|
||||
if ((r = dshow_open_device(avctx, devenum, AudioDevice, AudioSourceDevice)) < 0 ||
|
||||
(r = dshow_add_device(avctx, AudioDevice)) < 0) {
|
||||
av_log(avctx, AV_LOG_INFO, "Searching for audio device within video devices %s\n", ctx->device_name[AudioDevice]);
|
||||
/* see if there's a video source with an audio pin with the given audio name */
|
||||
if ((r = dshow_open_device(avctx, devenum, AudioDevice, VideoSourceDevice)) < 0 ||
|
||||
(r = dshow_add_device(avctx, AudioDevice)) < 0) {
|
||||
ret = r;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ctx->list_options) {
|
||||
/* allow it to list crossbar options in dshow_open_device */
|
||||
ret = AVERROR_EXIT;
|
||||
goto error;
|
||||
}
|
||||
ctx->curbufsize[0] = 0;
|
||||
ctx->curbufsize[1] = 0;
|
||||
ctx->mutex = CreateMutex(NULL, 0, NULL);
|
||||
@ -1066,6 +1180,7 @@ static const AVOption options[] = {
|
||||
{ "sample_rate", "set audio sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "sample_size", "set audio sample size", OFFSET(sample_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 16, DEC },
|
||||
{ "channels", "set number of audio channels, such as 1 or 2", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "audio_buffer_size", "set audio device buffer latency size in milliseconds (default is the device's default)", OFFSET(audio_buffer_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "list_devices", "list available devices", OFFSET(list_devices), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, DEC, "list_devices" },
|
||||
{ "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "list_devices" },
|
||||
{ "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "list_devices" },
|
||||
@ -1074,7 +1189,19 @@ static const AVOption options[] = {
|
||||
{ "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "list_options" },
|
||||
{ "video_device_number", "set video device number for devices with same name (starts at 0)", OFFSET(video_device_number), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "audio_device_number", "set audio device number for devices with same name (starts at 0)", OFFSET(audio_device_number), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "audio_buffer_size", "set audio device buffer latency size in milliseconds (default is the device's default)", OFFSET(audio_buffer_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
|
||||
{ "video_pin_name", "select video capture pin by name", OFFSET(video_pin_name),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
|
||||
{ "audio_pin_name", "select audio capture pin by name", OFFSET(audio_pin_name),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
|
||||
{ "crossbar_video_input_pin_number", "set video input pin number for crossbar device", OFFSET(crossbar_video_input_pin_number), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, DEC },
|
||||
{ "crossbar_audio_input_pin_number", "set audio input pin number for crossbar device", OFFSET(crossbar_audio_input_pin_number), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, DEC },
|
||||
{ "show_video_device_dialog", "display property dialog for video capture device", OFFSET(show_video_device_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC, "show_video_device_dialog" },
|
||||
{ "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "show_video_device_dialog" },
|
||||
{ "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "show_video_device_dialog" },
|
||||
{ "show_audio_device_dialog", "display property dialog for audio capture device", OFFSET(show_audio_device_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC, "show_audio_device_dialog" },
|
||||
{ "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "show_audio_device_dialog" },
|
||||
{ "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "show_audio_device_dialog" },
|
||||
{ "show_crossbar_connection_dialog", "display property dialog for crossbar connecting pins filter", OFFSET(show_crossbar_connection_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC, "show_crossbar_connection_dialog" },
|
||||
{ "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "show_crossbar_connection_dialog" },
|
||||
{ "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "show_crossbar_connection_dialog" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
|
||||
@ -65,6 +65,11 @@ enum dshowDeviceType {
|
||||
AudioDevice = 1,
|
||||
};
|
||||
|
||||
enum dshowSourceFilterType {
|
||||
VideoSourceDevice = 0,
|
||||
AudioSourceDevice = 1,
|
||||
};
|
||||
|
||||
#define DECLARE_QUERYINTERFACE(class, ...) \
|
||||
long WINAPI \
|
||||
class##_QueryInterface(class *this, const GUID *riid, void **ppvObject) \
|
||||
@ -223,7 +228,7 @@ libAVEnumPins *libAVEnumPins_Create (libAVPin *pin, libAVFilter *filter);
|
||||
* libAVEnumMediaTypes
|
||||
****************************************************************************/
|
||||
struct libAVEnumMediaTypes {
|
||||
IEnumPinsVtbl *vtbl;
|
||||
IEnumMediaTypesVtbl *vtbl;
|
||||
long ref;
|
||||
int pos;
|
||||
AM_MEDIA_TYPE type;
|
||||
@ -277,4 +282,66 @@ long WINAPI libAVFilter_QueryVendorInfo(libAVFilter *, wchar_t **);
|
||||
void libAVFilter_Destroy(libAVFilter *);
|
||||
libAVFilter *libAVFilter_Create (void *, void *, enum dshowDeviceType);
|
||||
|
||||
/*****************************************************************************
|
||||
* dshow_ctx
|
||||
****************************************************************************/
|
||||
struct dshow_ctx {
|
||||
const AVClass *class;
|
||||
|
||||
IGraphBuilder *graph;
|
||||
|
||||
char *device_name[2];
|
||||
int video_device_number;
|
||||
int audio_device_number;
|
||||
|
||||
int list_options;
|
||||
int list_devices;
|
||||
int audio_buffer_size;
|
||||
int crossbar_video_input_pin_number;
|
||||
int crossbar_audio_input_pin_number;
|
||||
char *video_pin_name;
|
||||
char *audio_pin_name;
|
||||
int show_video_device_dialog;
|
||||
int show_audio_device_dialog;
|
||||
int show_crossbar_connection_dialog;
|
||||
|
||||
IBaseFilter *device_filter[2];
|
||||
IPin *device_pin[2];
|
||||
libAVFilter *capture_filter[2];
|
||||
libAVPin *capture_pin[2];
|
||||
|
||||
HANDLE mutex;
|
||||
HANDLE event[2]; /* event[0] is set by DirectShow
|
||||
* event[1] is set by callback() */
|
||||
AVPacketList *pktl;
|
||||
|
||||
int eof;
|
||||
|
||||
int64_t curbufsize[2];
|
||||
unsigned int video_frame_num;
|
||||
|
||||
IMediaControl *control;
|
||||
IMediaEvent *media_event;
|
||||
|
||||
enum AVPixelFormat pixel_format;
|
||||
enum AVCodecID video_codec_id;
|
||||
char *framerate;
|
||||
|
||||
int requested_width;
|
||||
int requested_height;
|
||||
AVRational requested_framerate;
|
||||
|
||||
int sample_rate;
|
||||
int sample_size;
|
||||
int channels;
|
||||
};
|
||||
|
||||
/*****************************************************************************
|
||||
* CrossBar
|
||||
****************************************************************************/
|
||||
HRESULT dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
|
||||
IBaseFilter *device_filter, enum dshowDeviceType devtype, AVFormatContext *avctx);
|
||||
|
||||
void dshow_show_filter_properties(IBaseFilter *pFilter, AVFormatContext *avctx);
|
||||
|
||||
#endif /* AVDEVICE_DSHOW_H */
|
||||
|
||||
171
libavdevice/dshow_crossbar.c
Normal file
171
libavdevice/dshow_crossbar.c
Normal file
@ -0,0 +1,171 @@
|
||||
/*
|
||||
* DirectShow capture interface
|
||||
* Copyright (c) 2015 Roger Pack
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* FFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "dshow_capture.h"
|
||||
|
||||
static const char *
|
||||
GetPhysicalPinName(long pin_type)
|
||||
{
|
||||
switch (pin_type)
|
||||
{
|
||||
case PhysConn_Video_Tuner: return "Video Tuner";
|
||||
case PhysConn_Video_Composite: return "Video Composite";
|
||||
case PhysConn_Video_SVideo: return "S-Video";
|
||||
case PhysConn_Video_RGB: return "Video RGB";
|
||||
case PhysConn_Video_YRYBY: return "Video YRYBY";
|
||||
case PhysConn_Video_SerialDigital: return "Video Serial Digital";
|
||||
case PhysConn_Video_ParallelDigital: return "Video Parallel Digital";
|
||||
case PhysConn_Video_SCSI: return "Video SCSI";
|
||||
case PhysConn_Video_AUX: return "Video AUX";
|
||||
case PhysConn_Video_1394: return "Video 1394";
|
||||
case PhysConn_Video_USB: return "Video USB";
|
||||
case PhysConn_Video_VideoDecoder: return "Video Decoder";
|
||||
case PhysConn_Video_VideoEncoder: return "Video Encoder";
|
||||
|
||||
case PhysConn_Audio_Tuner: return "Audio Tuner";
|
||||
case PhysConn_Audio_Line: return "Audio Line";
|
||||
case PhysConn_Audio_Mic: return "Audio Microphone";
|
||||
case PhysConn_Audio_AESDigital: return "Audio AES/EBU Digital";
|
||||
case PhysConn_Audio_SPDIFDigital: return "Audio S/PDIF";
|
||||
case PhysConn_Audio_SCSI: return "Audio SCSI";
|
||||
case PhysConn_Audio_AUX: return "Audio AUX";
|
||||
case PhysConn_Audio_1394: return "Audio 1394";
|
||||
case PhysConn_Audio_USB: return "Audio USB";
|
||||
case PhysConn_Audio_AudioDecoder: return "Audio Decoder";
|
||||
default: return "Unknown Crossbar Pin Type—Please report!";
|
||||
}
|
||||
}
|
||||
|
||||
static HRESULT
|
||||
setup_crossbar_options(IAMCrossbar *cross_bar, enum dshowDeviceType devtype, AVFormatContext *avctx)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
long count_output_pins, count_input_pins;
|
||||
int i;
|
||||
int log_level = ctx->list_options ? AV_LOG_INFO : AV_LOG_DEBUG;
|
||||
int video_input_pin = ctx->crossbar_video_input_pin_number;
|
||||
int audio_input_pin = ctx->crossbar_audio_input_pin_number;
|
||||
const char *device_name = ctx->device_name[devtype];
|
||||
HRESULT hr;
|
||||
|
||||
av_log(avctx, log_level, "Crossbar Switching Information for %s:\n", device_name);
|
||||
hr = IAMCrossbar_get_PinCounts(cross_bar, &count_output_pins, &count_input_pins);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to get crossbar pin counts\n");
|
||||
return hr;
|
||||
}
|
||||
|
||||
for (i = 0; i < count_output_pins; i++)
|
||||
{
|
||||
long related_pin, pin_type, route_to_pin;
|
||||
hr = IAMCrossbar_get_CrossbarPinInfo(cross_bar, FALSE, i, &related_pin, &pin_type);
|
||||
if (pin_type == PhysConn_Video_VideoDecoder) {
|
||||
/* assume there is only one "Video (and one Audio) Decoder" output pin, and it's all we care about routing to...for now */
|
||||
if (video_input_pin != -1) {
|
||||
av_log(avctx, log_level, "Routing video input from pin %d\n", video_input_pin);
|
||||
hr = IAMCrossbar_Route(cross_bar, i, video_input_pin);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to route video input from pin %d\n", video_input_pin);
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
}
|
||||
} else if (pin_type == PhysConn_Audio_AudioDecoder) {
|
||||
if (audio_input_pin != -1) {
|
||||
av_log(avctx, log_level, "Routing audio input from pin %d\n", audio_input_pin);
|
||||
hr = IAMCrossbar_Route(cross_bar, i, audio_input_pin);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to route audio input from pin %d\n", audio_input_pin);
|
||||
return hr;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
av_log(avctx, AV_LOG_WARNING, "Unexpected output pin type, please report the type if you want to use this (%s)", GetPhysicalPinName(pin_type));
|
||||
}
|
||||
|
||||
hr = IAMCrossbar_get_IsRoutedTo(cross_bar, i, &route_to_pin);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to get crossbar is routed to from pin %d\n", i);
|
||||
return hr;
|
||||
}
|
||||
av_log(avctx, log_level, " Crossbar Output pin %d: \"%s\" related output pin: %ld ", i, GetPhysicalPinName(pin_type), related_pin);
|
||||
av_log(avctx, log_level, "current input pin: %ld ", route_to_pin);
|
||||
av_log(avctx, log_level, "compatible input pins: ");
|
||||
|
||||
for (int j = 0; j < count_input_pins; j++)
|
||||
{
|
||||
hr = IAMCrossbar_CanRoute(cross_bar, i, j);
|
||||
if (hr == S_OK)
|
||||
av_log(avctx, log_level ,"%d ", j);
|
||||
}
|
||||
av_log(avctx, log_level, "\n");
|
||||
}
|
||||
|
||||
for (i = 0; i < count_input_pins; i++)
|
||||
{
|
||||
long related_pin, pin_type;
|
||||
hr = IAMCrossbar_get_CrossbarPinInfo(cross_bar, TRUE, i, &related_pin, &pin_type);
|
||||
if (hr != S_OK) {
|
||||
av_log(avctx, AV_LOG_ERROR, "unable to get crossbar info audio input from pin %d\n", i);
|
||||
return hr;
|
||||
}
|
||||
av_log(avctx, log_level, " Crossbar Input pin %d - \"%s\" ", i, GetPhysicalPinName(pin_type));
|
||||
av_log(avctx, log_level, "related input pin: %ld\n", related_pin);
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a fully constructed graph, check if there is a cross bar filter, and configure its pins if so.
|
||||
*/
|
||||
HRESULT
|
||||
dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
|
||||
IBaseFilter *device_filter, enum dshowDeviceType devtype, AVFormatContext *avctx)
|
||||
{
|
||||
struct dshow_ctx *ctx = avctx->priv_data;
|
||||
IAMCrossbar *cross_bar = NULL;
|
||||
IBaseFilter *cross_bar_filter = NULL;
|
||||
HRESULT hr;
|
||||
|
||||
hr = ICaptureGraphBuilder2_FindInterface(graph_builder2, &LOOK_UPSTREAM_ONLY, (const GUID *) NULL,
|
||||
(IBaseFilter *) device_filter, &IID_IAMCrossbar, (void**) &cross_bar);
|
||||
if (hr != S_OK) {
|
||||
/* no crossbar found */
|
||||
hr = S_OK;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (ctx->show_crossbar_connection_dialog) {
|
||||
hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_filter);
|
||||
if (hr != S_OK)
|
||||
goto end;
|
||||
dshow_show_filter_properties(cross_bar_filter, avctx);
|
||||
}
|
||||
hr = setup_crossbar_options(cross_bar, devtype, avctx);
|
||||
if (hr != S_OK)
|
||||
goto end;
|
||||
|
||||
end:
|
||||
if (cross_bar)
|
||||
IAMCrossbar_Release(cross_bar);
|
||||
if (cross_bar_filter)
|
||||
IBaseFilter_Release(cross_bar_filter);
|
||||
return hr;
|
||||
}
|
||||
@ -320,6 +320,14 @@ libAVMemInputPin_Receive(libAVMemInputPin *this, IMediaSample *sample)
|
||||
} else {
|
||||
int64_t dummy;
|
||||
IMediaSample_GetTime(sample, &curtime, &dummy);
|
||||
if(curtime > 400000000000000000LL) {
|
||||
/* initial frames sometimes start < 0 (shown as a very large number here,
|
||||
like 437650244077016960 which FFmpeg doesn't like.
|
||||
TODO figure out math. For now just drop them. */
|
||||
av_log(NULL, AV_LOG_DEBUG,
|
||||
"dshow dropping initial (or ending) audio frame with odd PTS too high %"PRId64"\n", curtime);
|
||||
return S_OK;
|
||||
}
|
||||
curtime += pin->filter->start_time;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user