| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "talk/app/webrtc/objc/avfoundationvideocapturer.h" | 28 #include "talk/app/webrtc/objc/avfoundationvideocapturer.h" |
| 29 | 29 |
| 30 #include "webrtc/base/bind.h" | 30 #include "webrtc/base/bind.h" |
| 31 #include "webrtc/base/thread.h" |
| 31 | 32 |
| 32 #import <AVFoundation/AVFoundation.h> | 33 #import <AVFoundation/AVFoundation.h> |
| 33 #import <Foundation/Foundation.h> | 34 #import <Foundation/Foundation.h> |
| 34 #import <UIKit/UIKit.h> | 35 #import <UIKit/UIKit.h> |
| 35 | 36 |
| 36 #import "webrtc/base/objc/RTCDispatcher.h" | 37 #import "webrtc/base/objc/RTCDispatcher.h" |
| 37 #import "webrtc/base/objc/RTCLogging.h" | 38 #import "webrtc/base/objc/RTCLogging.h" |
| 38 | 39 |
| 39 // TODO(tkchin): support other formats. | 40 // TODO(tkchin): support other formats. |
| 40 static NSString* const kDefaultPreset = AVCaptureSessionPreset640x480; | 41 static NSString* const kDefaultPreset = AVCaptureSessionPreset640x480; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 452 |
| 452 void AVFoundationVideoCapturer::SignalFrameCapturedOnStartThread( | 453 void AVFoundationVideoCapturer::SignalFrameCapturedOnStartThread( |
| 453 const cricket::CapturedFrame* frame) { | 454 const cricket::CapturedFrame* frame) { |
| 454 RTC_DCHECK(_startThread->IsCurrent()); | 455 RTC_DCHECK(_startThread->IsCurrent()); |
| 455 // This will call a superclass method that will perform the frame conversion | 456 // This will call a superclass method that will perform the frame conversion |
| 456 // to I420. | 457 // to I420. |
| 457 SignalFrameCaptured(this, frame); | 458 SignalFrameCaptured(this, frame); |
| 458 } | 459 } |
| 459 | 460 |
| 460 } // namespace webrtc | 461 } // namespace webrtc |
| OLD | NEW |