[FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
The search of the current DirectShow device list has been customized so that audio devices are always found even if no video device is connected. Signed-off-by: Jens Frederich --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 403e56fe13..57d8e1c0af 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -645,7 +645,7 @@ static int dshow_get_device_list(AVFormatContext *avctx, AVDeviceInfoList *devic } ret = dshow_cycle_devices(avctx, devenum, VideoDevice, VideoSourceDevice, NULL, NULL, &device_list); -if (ret < S_OK) +if (ret < S_OK && ret != AVERROR(EIO)) goto error; ret = dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL, NULL, &device_list); -- 2.43.0 ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
-Original Message- From: ffmpeg-devel On Behalf Of Roger Pack Sent: Wednesday, July 17, 2024 3:03 AM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present > LGTM I also need this fix in 5.1 release branch, is this possible? Jens On Mon, Jul 15, 2024 at 12:51 AM patches via ffmpeg-devel wrote: > > The search of the current DirectShow device list has been customized > so that audio devices are always found even if no video device is connected. > > Signed-off-by: Jens Frederich > --- > libavdevice/dshow.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index > 403e56fe13..57d8e1c0af 100644 > --- a/libavdevice/dshow.c > +++ b/libavdevice/dshow.c > @@ -645,7 +645,7 @@ static int dshow_get_device_list(AVFormatContext *avctx, > AVDeviceInfoList *devic > } > > ret = dshow_cycle_devices(avctx, devenum, VideoDevice, > VideoSourceDevice, NULL, NULL, &device_list); > -if (ret < S_OK) > +if (ret < S_OK && ret != AVERROR(EIO)) > goto error; > ret = dshow_cycle_devices(avctx, devenum, AudioDevice, > AudioSourceDevice, NULL, NULL, &device_list); > > -- > 2.43.0 > > ___ > ffmpeg-devel mailing list > [email protected] > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > [email protected] with subject "unsubscribe". ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe". ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
Good morning, can someone merge this little fix? Best Jens -Original Message- From: ffmpeg-devel On Behalf Of Roger Pack Sent: Wednesday, July 17, 2024 3:03 AM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present [You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] LGTM On Mon, Jul 15, 2024 at 12:51 AM patches via ffmpeg-devel wrote: > > The search of the current DirectShow device list has been customized > so that audio devices are always found even if no video device is connected. > > Signed-off-by: Jens Frederich > --- > libavdevice/dshow.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index > 403e56fe13..57d8e1c0af 100644 > --- a/libavdevice/dshow.c > +++ b/libavdevice/dshow.c > @@ -645,7 +645,7 @@ static int dshow_get_device_list(AVFormatContext *avctx, > AVDeviceInfoList *devic > } > > ret = dshow_cycle_devices(avctx, devenum, VideoDevice, > VideoSourceDevice, NULL, NULL, &device_list); > -if (ret < S_OK) > +if (ret < S_OK && ret != AVERROR(EIO)) > goto error; > ret = dshow_cycle_devices(avctx, devenum, AudioDevice, > AudioSourceDevice, NULL, NULL, &device_list); > > -- > 2.43.0 > > ___ > ffmpeg-devel mailing list > [email protected] > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > [email protected] with subject "unsubscribe". ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe". ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
-Original Message- From: Roger Pack Sent: Monday, July 22, 2024 5:52 PM To: patches Cc: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present On Wed, Jul 17, 2024 at 1:43 AM patches wrote: > > -Original Message- > From: ffmpeg-devel On Behalf Of > Roger Pack > Sent: Wednesday, July 17, 2024 3:03 AM > To: FFmpeg development discussions and patches > > Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio > devices if no video device is present > > > LGTM > > I also need this fix in 5.1 release branch, is this possible? > Not sure how backports work, but you could make your own fork with it in it? No, that's why we are submitting the fix, so that we don't have to do this. ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
-Original Message- From: Roger Pack Sent: Monday, July 22, 2024 5:52 PM To: patches Cc: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present On Wed, Jul 17, 2024 at 1:43 AM patches wrote: > > -Original Message- > From: ffmpeg-devel On Behalf Of > Roger Pack > Sent: Wednesday, July 17, 2024 3:03 AM > To: FFmpeg development discussions and patches > > Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio > devices if no video device is present > > > LGTM > > I also need this fix in 5.1 release branch, is this possible? > Not sure how backports work, but you could make your own fork with it in it? Can someone at least commit the fix on the main line? ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present
-Original Message- From: Michael Niedermayer Sent: Tuesday, July 23, 2024 10:22 PM To: FFmpeg development discussions and patches Cc: patches Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if no video device is present On Tue, Jul 23, 2024 at 08:21:31AM +0000, patches via ffmpeg-devel wrote: > > -Original Message- > From: Roger Pack > Sent: Monday, July 22, 2024 5:52 PM > To: patches > Cc: FFmpeg development discussions and patches > > Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio > devices if no video device is present > > On Wed, Jul 17, 2024 at 1:43 AM patches wrote: > > > > -Original Message- > > From: ffmpeg-devel On Behalf Of > > Roger Pack > > Sent: Wednesday, July 17, 2024 3:03 AM > > To: FFmpeg development discussions and patches > > > > Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio > > devices if no video device is present > > > > > LGTM > > > > I also need this fix in 5.1 release branch, is this possible? > > > Not sure how backports work, but you could make your own fork with it in it? > > Can someone at least commit the fix on the main line? > What should be put in the "Author" metadata for this ? > I can put "patches " in it if thats really intended but > it looks like it may be unintended, so iam asking Please use "Jens Frederich". We have a general mailbox for patches at Vector and I can't put a name there, I'll see if I can do better next time when I create a patch. Michael, will there be another 5.x release? If so, is it possible to apply the patch there? We are currently using 5.1 and the changeover to 6.x or 7.x is not foreseeable. ___ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
