Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avfoundation: Fix building on iOS

Browse source 
Apparently the changes from 3c9185bf3a
aren't enough; even with that in place, I got errors like this
when trying to build for iOS:

src/libavdevice/avfoundation.m:135:5: error:
      'AVCaptureDeviceTransportControlsPlaybackMode' is unavailable: not
      available on iOS
    AVCaptureDeviceTransportControlsPlaybackMode observed_mode;
    ^
This commit is contained in:
Martin Storsjö 2020-04-30 13:34:13 +03:00 • committed by Thilo Borgmann
parent 0a181c2cb1
commit c810a9502c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libavdevice/avfoundation.m
View file

@ -132,7 +132,9 @@ typedef struct
CMSampleBufferRef current_audio_frame; CMSampleBufferRef current_audio_frame;
AVCaptureDevice *observed_device; AVCaptureDevice *observed_device;
#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
AVCaptureDeviceTransportControlsPlaybackMode observed_mode; AVCaptureDeviceTransportControlsPlaybackMode observed_mode;
#endif
int observed_quit; int observed_quit;
} AVFContext; } AVFContext;
@ -200,6 +202,7 @@ static void unlock_frames(AVFContext* ctx)
change:(NSDictionary *)change change:(NSDictionary *)change
context:(void *)context { context:(void *)context {
if (context == _context) { if (context == _context) {
#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
AVCaptureDeviceTransportControlsPlaybackMode mode = AVCaptureDeviceTransportControlsPlaybackMode mode =
[change[NSKeyValueChangeNewKey] integerValue]; [change[NSKeyValueChangeNewKey] integerValue];
@ -209,6 +212,7 @@ static void unlock_frames(AVFContext* ctx)
} }
_context->observed_mode = mode; _context->observed_mode = mode;
} }
#endif
} else { } else {
[super observeValueForKeyPath: keyPath [super observeValueForKeyPath: keyPath
ofObject: object ofObject: object