Re: [FFmpeg-devel] [PATCH] avdevice/avfoundation: replace AVCaptureDevice with new api

Tue, 05 Dec 2023 01:43:15 -0800 

Thank you for your suggestion.
I will adapt the judgment condition, and submit again.


------------------ Original ------------------
From:                                                                           
                                             "FFmpeg development discussions 
and patches"                                                                    
                <ffmpeg-devel@ffmpeg.org&gt;;
Date:&nbsp;Mon, Dec 4, 2023 09:55 PM
To:&nbsp;"ffmpeg-devel"<ffmpeg-devel@ffmpeg.org&gt;;
Cc:&nbsp;"Thilo Borgmann"<thilo.borgm...@mail.de&gt;;
Subject:&nbsp;Re: [FFmpeg-devel] [PATCH] avdevice/avfoundation: replace 
AVCaptureDevice with new api



Am 04.12.23 um 13:47 schrieb xufuji456 via ffmpeg-devel:
&gt; Building with iOS platform, the compiler has a warning: 
"'devicesWithMediaType:' is deprecated: first deprecated in iOS 10.0 - Use 
AVCaptureDeviceDiscoverySession instead"
&gt; 
&gt; Signed-off-by: xufuji456 <839789...@qq.com&gt;
&gt; ---
&gt;&nbsp;&nbsp; libavdevice/avfoundation.m | 81 
+++++++++++++++++++++++++++++++++++---
&gt;&nbsp;&nbsp; 1 file changed, 76 insertions(+), 5 deletions(-)
&gt; 
&gt; diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
&gt; index 36ad834753..668c726eb7 100644
&gt; --- a/libavdevice/avfoundation.m
&gt; +++ b/libavdevice/avfoundation.m
&gt; @@ -770,8 +770,38 @@ static int avf_read_header(AVFormatContext *s)
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AVCaptureDevice *video_device = nil;
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AVCaptureDevice *audio_device = nil;
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Find capture device
&gt; -&nbsp;&nbsp;&nbsp; NSArray *devices = [AVCaptureDevice 
devicesWithMediaType:AVMediaTypeVideo];
&gt; -&nbsp;&nbsp;&nbsp; NSArray *devices_muxed = [AVCaptureDevice 
devicesWithMediaType:AVMediaTypeMuxed];
&gt; +&nbsp;&nbsp;&nbsp; NSArray *devices = nil;
&gt; +&nbsp;&nbsp;&nbsp; NSArray *devices_muxed = nil;
&gt; +


&gt; +&nbsp;&nbsp;&nbsp; if (TARGET_OS_IPHONE) {
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (@available(iOS 10.0, *)) {

The preprocessor directives should be more reliable especially on older 
machines.
See other parts of the code which are handled that way and adopt for your case.


&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession =
&gt; 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [AVCaptureDeviceDiscoverySession
&gt; 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]
&gt; 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 mediaType:AVMediaTypeVideo
&gt; 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 position:AVCaptureDevicePositionUnspecified];
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
devices = [captureDeviceDiscoverySession devices];

&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } else {
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
&gt; +&nbsp;&nbsp;&nbsp; } else {
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; devices = [AVCaptureDevice 
devicesWithMediaType:AVMediaTypeVideo];
&gt; +&nbsp;&nbsp;&nbsp; }

Here and in other chunks you can join the if() conditions into one and avoid 
the duplication of the old code.


-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@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-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to