Revert of RELAND: ImageCapture: Implement takePhoto() for Mac AVFoundation

media/capture/video/mac/video_capture_device_avfoundation_mac.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
 #define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
 
 #import <Foundation/Foundation.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #import "media/base/mac/avfoundation_glue.h"
 #include "media/base/video_capture_types.h"
 #include "media/capture/video/video_capture_device.h"
 
 namespace media {
 class VideoCaptureDeviceMac;
 }
 
 @class CrAVCaptureDevice;
 @class CrAVCaptureSession;
 @class CrAVCaptureVideoDataOutput;
-@class CrAVCaptureStillImageOutput;
 
-// Class used by VideoCaptureDeviceMac (VCDM) for video and image capture using
+// Class used by VideoCaptureDeviceMac (VCDM) for video capture using
 // AVFoundation API. This class lives inside the thread created by its owner
 // VCDM.
 //
 //  * Clients (VCDM) should call +deviceNames to fetch the list of devices
 //    available in the system; this method returns the list of device names that
 //    have to be used with -setCaptureDevice:.
 //  * Previous to any use, clients (VCDM) must call -initWithFrameReceiver: to
 //    initialise an object of this class and register a |frameReceiver_|.
 //  * Frame receiver registration or removal can also happen via explicit call
 //    to -setFrameReceiver:. Re-registrations are safe and allowed, even during
@@ skipping 19 matching lines @@
 //
 //
 @interface VideoCaptureDeviceAVFoundation
     : NSObject<CrAVCaptureVideoDataOutputSampleBufferDelegate> {
  @private
   // The following attributes are set via -setCaptureHeight:width:frameRate:.
   int frameWidth_;
   int frameHeight_;
   float frameRate_;
 
-  base::Lock lock_;  // Protects concurrent setting and using |frameReceiver_|.
+  base::Lock lock_;  // Protects concurrent setting and using of frameReceiver_.
   media::VideoCaptureDeviceMac* frameReceiver_;  // weak.
 
   base::scoped_nsobject<CrAVCaptureSession> captureSession_;
 
   // |captureDevice_| is an object coming from AVFoundation, used only to be
   // plugged in |captureDeviceInput_| and to query for session preset support.
   CrAVCaptureDevice* captureDevice_;
   // |captureDeviceInput_| is owned by |captureSession_|.
   CrAVCaptureDeviceInput* captureDeviceInput_;
   base::scoped_nsobject<CrAVCaptureVideoDataOutput> captureVideoDataOutput_;
 
-  // An AVDataOutput specialized for taking pictures out of |captureSession_|.
-  base::scoped_nsobject<CrAVCaptureStillImageOutput> stillImageOutput_;
-
   base::ThreadChecker main_thread_checker_;
 }
 
 // Returns a dictionary of capture devices with friendly name and unique id.
 + (NSDictionary*)deviceNames;
 
 // Retrieve the capture supported formats for a given device |name|.
 + (void)getDevice:(const media::VideoCaptureDevice::Name&)name
     supportedFormats:(media::VideoCaptureFormats*)formats;
 
@@ skipping 20 matching lines @@
                frameRate:(float)frameRate;
 
 // Starts video capturing and register the notification listeners. Must be
 // called after setCaptureDevice:, and, eventually, also after
 // setCaptureHeight:width:frameRate:. Returns YES on success, NO otherwise.
 - (BOOL)startCapture;
 
 // Stops video capturing and stops listening to notifications.
 - (void)stopCapture;
 
-// Takes a photo. This method should only be called between -startCapture and
-// -stopCapture.
-- (void)takePhoto;
-
 @end
 
 #endif  // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_