Commit 69c7eea6 authored by Valeriy Van's avatar Valeriy Van

Cleans up ios stuff declaration removing not needed ivars backing properties

parent 40b87070
...@@ -41,27 +41,9 @@ ...@@ -41,27 +41,9 @@
@interface CvAbstractCamera : NSObject @interface CvAbstractCamera : NSObject
{ {
AVCaptureSession* captureSession;
AVCaptureConnection* videoCaptureConnection;
AVCaptureVideoPreviewLayer *captureVideoPreviewLayer;
UIDeviceOrientation currentDeviceOrientation; UIDeviceOrientation currentDeviceOrientation;
BOOL cameraAvailable; BOOL cameraAvailable;
BOOL captureSessionLoaded;
BOOL running;
BOOL useAVCaptureVideoPreviewLayer;
AVCaptureDevicePosition defaultAVCaptureDevicePosition;
AVCaptureVideoOrientation defaultAVCaptureVideoOrientation;
NSString *const defaultAVCaptureSessionPreset;
int defaultFPS;
UIView* parentView;
int imageWidth;
int imageHeight;
} }
@property (nonatomic, strong) AVCaptureSession* captureSession; @property (nonatomic, strong) AVCaptureSession* captureSession;
...@@ -121,14 +103,6 @@ ...@@ -121,14 +103,6 @@
dispatch_queue_t videoDataOutputQueue; dispatch_queue_t videoDataOutputQueue;
CALayer *customPreviewLayer; CALayer *customPreviewLayer;
BOOL grayscaleMode;
BOOL recordVideo;
BOOL rotateVideo;
AVAssetWriterInput* recordAssetWriterInput;
AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor;
AVAssetWriter* recordAssetWriter;
CMTime lastSampleTime; CMTime lastSampleTime;
} }
......
...@@ -183,7 +183,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;} ...@@ -183,7 +183,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
break; // leave the layer in its last known orientation break; // leave the layer in its last known orientation
} }
switch (defaultAVCaptureVideoOrientation) { switch (self.defaultAVCaptureVideoOrientation) {
case AVCaptureVideoOrientationLandscapeRight: case AVCaptureVideoOrientationLandscapeRight:
rotation_angle += 180; rotation_angle += 180;
break; break;
...@@ -249,7 +249,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;} ...@@ -249,7 +249,7 @@ static CGFloat DegreesToRadians(CGFloat degrees) {return degrees * M_PI / 180;}
break; // leave the layer in its last known orientation break; // leave the layer in its last known orientation
} }
switch (defaultAVCaptureVideoOrientation) { switch (self.defaultAVCaptureVideoOrientation) {
case AVCaptureVideoOrientationLandscapeRight: case AVCaptureVideoOrientationLandscapeRight:
rotation_angle += 180; rotation_angle += 180;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment