| Message ID | 20211221135337.1348-2-dcnieho@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | dshow enhancements | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
These LGTM, could someone apply them for me? Thanks! On Tue, Dec 21, 2021 at 6:54 AM Diederick Niehorster <dcnieho@gmail.com> wrote: > > list_options true would crash when both a video and an audio device were > specified as input. Crash would occur on line 784 because > ctx->device_unique_name[otherDevType] would be NULL > > Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> > --- > libavdevice/dshow.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c > index ef78781865..cc0bef0474 100644 > --- a/libavdevice/dshow.c > +++ b/libavdevice/dshow.c > @@ -708,9 +708,9 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum, > if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name)) < 0) > return r; > ctx->device_filter[devtype] = device_filter; > + ctx->device_unique_name[devtype] = device_unique_name; > if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0) > return r; > - av_freep(&device_unique_name); > return 0; > } > > @@ -1143,6 +1143,7 @@ static int dshow_read_header(AVFormatContext *avctx) > } > } > } > + // don't exit yet, allow it to list crossbar options in dshow_open_device > } > if (ctx->device_name[VideoDevice]) { > if ((r = dshow_open_device(avctx, devenum, VideoDevice, VideoSourceDevice)) < 0 || > -- > 2.28.0.windows.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On 2021-12-23 10:39 am, Roger Pack wrote: > These LGTM, could someone apply them for me? > Thanks! Tomorrow, if no else does, or objects. > > On Tue, Dec 21, 2021 at 6:54 AM Diederick Niehorster <dcnieho@gmail.com> wrote: >> list_options true would crash when both a video and an audio device were >> specified as input. Crash would occur on line 784 because >> ctx->device_unique_name[otherDevType] would be NULL >> >> Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> >> --- >> libavdevice/dshow.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c >> index ef78781865..cc0bef0474 100644 >> --- a/libavdevice/dshow.c >> +++ b/libavdevice/dshow.c >> @@ -708,9 +708,9 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum, >> if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name)) < 0) >> return r; >> ctx->device_filter[devtype] = device_filter; >> + ctx->device_unique_name[devtype] = device_unique_name; >> if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0) >> return r; >> - av_freep(&device_unique_name); >> return 0; >> } >> >> @@ -1143,6 +1143,7 @@ static int dshow_read_header(AVFormatContext *avctx) >> } >> } >> } >> + // don't exit yet, allow it to list crossbar options in dshow_open_device >> } >> if (ctx->device_name[VideoDevice]) { >> if ((r = dshow_open_device(avctx, devenum, VideoDevice, VideoSourceDevice)) < 0 || >> -- >> 2.28.0.windows.1 >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On 2021-12-23 10:54 am, Gyan Doshi wrote: > > > On 2021-12-23 10:39 am, Roger Pack wrote: >> These LGTM, could someone apply them for me? >> Thanks! > > Tomorrow, if no else does, or objects. Pushed as 7b21841ce45ef4ab486c3c94a714345b878a70fd...a1c4929f65cc75b7175622a007b1e4bd37043d41 Had to correct a few trailing whitespace errors. Regards, Gyan > >> >> On Tue, Dec 21, 2021 at 6:54 AM Diederick Niehorster >> <dcnieho@gmail.com> wrote: >>> list_options true would crash when both a video and an audio device >>> were >>> specified as input. Crash would occur on line 784 because >>> ctx->device_unique_name[otherDevType] would be NULL >>> >>> Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> >>> --- >>> libavdevice/dshow.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c >>> index ef78781865..cc0bef0474 100644 >>> --- a/libavdevice/dshow.c >>> +++ b/libavdevice/dshow.c >>> @@ -708,9 +708,9 @@ dshow_list_device_options(AVFormatContext >>> *avctx, ICreateDevEnum *devenum, >>> if ((r = dshow_cycle_devices(avctx, devenum, devtype, >>> sourcetype, &device_filter, &device_unique_name)) < 0) >>> return r; >>> ctx->device_filter[devtype] = device_filter; >>> + ctx->device_unique_name[devtype] = device_unique_name; >>> if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, >>> device_filter, NULL)) < 0) >>> return r; >>> - av_freep(&device_unique_name); >>> return 0; >>> } >>> >>> @@ -1143,6 +1143,7 @@ static int dshow_read_header(AVFormatContext >>> *avctx) >>> } >>> } >>> } >>> + // don't exit yet, allow it to list crossbar options in >>> dshow_open_device >>> } >>> if (ctx->device_name[VideoDevice]) { >>> if ((r = dshow_open_device(avctx, devenum, VideoDevice, >>> VideoSourceDevice)) < 0 || >>> -- >>> 2.28.0.windows.1 >>> >>> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org >>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>> >>> To unsubscribe, visit link above, or email >>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Fri, Dec 24, 2021 at 1:50 AM Gyan Doshi <ffmpeg@gyani.pro> wrote: > > > > On 2021-12-23 10:54 am, Gyan Doshi wrote: > > > > > > On 2021-12-23 10:39 am, Roger Pack wrote: > >> These LGTM, could someone apply them for me? > >> Thanks! > > > > Tomorrow, if no else does, or objects. > > Pushed as > > 7b21841ce45ef4ab486c3c94a714345b878a70fd...a1c4929f65cc75b7175622a007b1e4bd37043d41 > > Had to correct a few trailing whitespace errors. > > Regards, > Gyan Thanks!
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index ef78781865..cc0bef0474 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -708,9 +708,9 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum, if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name)) < 0) return r; ctx->device_filter[devtype] = device_filter; + ctx->device_unique_name[devtype] = device_unique_name; if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0) return r; - av_freep(&device_unique_name); return 0; } @@ -1143,6 +1143,7 @@ static int dshow_read_header(AVFormatContext *avctx) } } } + // don't exit yet, allow it to list crossbar options in dshow_open_device } if (ctx->device_name[VideoDevice]) { if ((r = dshow_open_device(avctx, devenum, VideoDevice, VideoSourceDevice)) < 0 ||
list_options true would crash when both a video and an audio device were specified as input. Crash would occur on line 784 because ctx->device_unique_name[otherDevType] would be NULL Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> --- libavdevice/dshow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)