diff -r 000000000000 -r 6474c204b198 dom/camera/GonkCameraControl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/camera/GonkCameraControl.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2012-2014 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DOM_CAMERA_GONKCAMERACONTROL_H
+#define DOM_CAMERA_GONKCAMERACONTROL_H
+
+#include "base/basictypes.h"
+#include <media/MediaProfiles.h>
+#include "mozilla/ReentrantMonitor.h"
+#include "DeviceStorage.h"
+#include "CameraControlImpl.h"
+#include "CameraCommon.h"
+#include "GonkRecorder.h"
+#include "GonkCameraHwMgr.h"
+#include "GonkCameraParameters.h"
+
+namespace android {
+  class GonkCameraHardware;
+  class MediaProfiles;
+  class GonkRecorder;
+}
+
+namespace mozilla {
+
+namespace layers {
+  class TextureClient;
+  class ImageContainer;
+}
+
+class GonkRecorderProfile;
+class GonkRecorderProfileManager;
+
+class nsGonkCameraControl : public CameraControlImpl
+{
+public:
+  nsGonkCameraControl(uint32_t aCameraId);
+
+  void OnAutoFocusComplete(bool aSuccess);
+  void OnFacesDetected(camera_frame_metadata_t* aMetaData);
+  void OnTakePictureComplete(uint8_t* aData, uint32_t aLength);
+  void OnTakePictureError();
+  void OnNewPreviewFrame(layers::TextureClient* aBuffer);
+  void OnRecorderEvent(int msg, int ext1, int ext2);
+  void OnError(CameraControlListener::CameraErrorContext aWhere,
+               CameraControlListener::CameraError aError);
+
+  virtual nsresult Set(uint32_t aKey, const nsAString& aValue) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, nsAString& aValue) MOZ_OVERRIDE;
+  virtual nsresult Set(uint32_t aKey, double aValue) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, double& aValue) MOZ_OVERRIDE;
+  virtual nsresult Set(uint32_t aKey, int32_t aValue) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, int32_t& aValue) MOZ_OVERRIDE;
+  virtual nsresult Set(uint32_t aKey, int64_t aValue) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, int64_t& aValue) MOZ_OVERRIDE;
+  virtual nsresult Set(uint32_t aKey, const Size& aValue) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, Size& aValue) MOZ_OVERRIDE;
+  virtual nsresult Set(uint32_t aKey, const nsTArray<Region>& aRegions) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, nsTArray<Region>& aRegions) MOZ_OVERRIDE;
+
+  virtual nsresult SetLocation(const Position& aLocation) MOZ_OVERRIDE;
+
+  virtual nsresult Get(uint32_t aKey, nsTArray<Size>& aSizes) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, nsTArray<nsString>& aValues) MOZ_OVERRIDE;
+  virtual nsresult Get(uint32_t aKey, nsTArray<double>& aValues) MOZ_OVERRIDE;
+
+  nsresult PushParameters();
+  nsresult PullParameters();
+
+protected:
+  ~nsGonkCameraControl();
+
+  using CameraControlImpl::OnNewPreviewFrame;
+  using CameraControlImpl::OnAutoFocusComplete;
+  using CameraControlImpl::OnFacesDetected;
+  using CameraControlImpl::OnTakePictureComplete;
+  using CameraControlImpl::OnConfigurationChange;
+  using CameraControlImpl::OnError;
+
+  virtual void BeginBatchParameterSet() MOZ_OVERRIDE;
+  virtual void EndBatchParameterSet() MOZ_OVERRIDE;
+
+  virtual nsresult StartImpl(const Configuration* aInitialConfig = nullptr) MOZ_OVERRIDE;
+  virtual nsresult StopImpl() MOZ_OVERRIDE;
+  nsresult Initialize();
+
+  virtual nsresult SetConfigurationImpl(const Configuration& aConfig) MOZ_OVERRIDE;
+  nsresult SetConfigurationInternal(const Configuration& aConfig);
+  nsresult SetPictureConfiguration(const Configuration& aConfig);
+  nsresult SetVideoConfiguration(const Configuration& aConfig);
+
+  template<class T> nsresult SetAndPush(uint32_t aKey, const T& aValue);
+
+  virtual nsresult StartPreviewImpl() MOZ_OVERRIDE;
+  virtual nsresult StopPreviewImpl() MOZ_OVERRIDE;
+  virtual nsresult AutoFocusImpl() MOZ_OVERRIDE;
+  virtual nsresult StartFaceDetectionImpl() MOZ_OVERRIDE;
+  virtual nsresult StopFaceDetectionImpl() MOZ_OVERRIDE;
+  virtual nsresult TakePictureImpl() MOZ_OVERRIDE;
+  virtual nsresult StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescriptor,
+                                      const StartRecordingOptions* aOptions = nullptr) MOZ_OVERRIDE;
+  virtual nsresult StopRecordingImpl() MOZ_OVERRIDE;
+  virtual nsresult ResumeContinuousFocusImpl() MOZ_OVERRIDE;
+  virtual nsresult PushParametersImpl() MOZ_OVERRIDE;
+  virtual nsresult PullParametersImpl() MOZ_OVERRIDE;
+  virtual already_AddRefed<RecorderProfileManager> GetRecorderProfileManagerImpl() MOZ_OVERRIDE;
+  already_AddRefed<GonkRecorderProfileManager> GetGonkRecorderProfileManager();
+
+  nsresult SetupRecording(int aFd, int aRotation, int64_t aMaxFileSizeBytes,
+                          int64_t aMaxVideoLengthMs);
+  nsresult SetupRecordingFlash(bool aAutoEnableLowLightTorch);
+  nsresult SetupVideoMode(const nsAString& aProfile);
+  nsresult SetPreviewSize(const Size& aSize);
+  nsresult SetVideoSize(const Size& aSize);
+  nsresult PausePreview();
+  nsresult GetSupportedSize(const Size& aSize, const nsTArray<Size>& supportedSizes, Size& best);
+
+  friend class SetPictureSize;
+  friend class SetThumbnailSize;
+  nsresult SetPictureSize(const Size& aSize);
+  nsresult SetPictureSizeImpl(const Size& aSize);
+  nsresult SetThumbnailSize(const Size& aSize);
+  nsresult UpdateThumbnailSize();
+  nsresult SetThumbnailSizeImpl(const Size& aSize);
+
+  int32_t RationalizeRotation(int32_t aRotation);
+
+  android::sp<android::GonkCameraHardware> mCameraHw;
+
+  Size                      mLastPictureSize;
+  Size                      mLastThumbnailSize;
+  Size                      mLastRecorderSize;
+  uint32_t                  mPreviewFps;
+  bool                      mResumePreviewAfterTakingPicture;
+  bool                      mFlashSupported;
+  bool                      mLuminanceSupported;
+  bool                      mAutoFlashModeOverridden;
+  Atomic<uint32_t>          mDeferConfigUpdate;
+  GonkCameraParameters      mParams;
+
+  nsRefPtr<mozilla::layers::ImageContainer> mImageContainer;
+
+  android::MediaProfiles*   mMediaProfiles;
+  nsRefPtr<android::GonkRecorder> mRecorder;
+
+  // Camcorder profile settings for the desired quality level
+  nsRefPtr<GonkRecorderProfileManager> mProfileManager;
+  nsRefPtr<GonkRecorderProfile> mRecorderProfile;
+
+  nsRefPtr<DeviceStorageFile> mVideoFile;
+  nsString                  mFileFormat;
+
+  // Guards against calling StartPreviewImpl() while in OnTakePictureComplete().
+  ReentrantMonitor          mReentrantMonitor;
+
+private:
+  nsGonkCameraControl(const nsGonkCameraControl&) MOZ_DELETE;
+  nsGonkCameraControl& operator=(const nsGonkCameraControl&) MOZ_DELETE;
+};
+
+// camera driver callbacks
+void OnTakePictureComplete(nsGonkCameraControl* gc, uint8_t* aData, uint32_t aLength);
+void OnTakePictureError(nsGonkCameraControl* gc);
+void OnAutoFocusComplete(nsGonkCameraControl* gc, bool aSuccess);
+void OnAutoFocusMoving(nsGonkCameraControl* gc, bool aIsMoving);
+void OnFacesDetected(nsGonkCameraControl* gc, camera_frame_metadata_t* aMetaData);
+void OnNewPreviewFrame(nsGonkCameraControl* gc, layers::TextureClient* aBuffer);
+void OnShutter(nsGonkCameraControl* gc);
+void OnClosed(nsGonkCameraControl* gc);
+void OnError(nsGonkCameraControl* gc, CameraControlListener::CameraError aError,
+             int32_t aArg1, int32_t aArg2);
+
+} // namespace mozilla
+
+#endif // DOM_CAMERA_GONKCAMERACONTROL_H