Bug 776062: Add support for recording video on gonk. r=cjones,double,ikumar,mikeh sr=sicking (6d9d08d1) · Commits · Tommy Webb / Tor Browser

configure.in

+2 −1

Original line number	Diff line number	Diff line

		dnl -- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; --
		dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
		dnl This Source Code Form is subject to the terms of the Mozilla Public
		@@ -197,7 +198,7 @@ if test -n "$gonkdir" ; then
		;;
		esac

		CPPFLAGS="-DANDROID -isystem $gonkdir/bionic/libc/$ARCH_DIR/include -isystem $gonkdir/bionic/libc/include/ -isystem $gonkdir/bionic/libc/kernel/common -isystem $gonkdir/bionic/libc/kernel/$ARCH_DIR -isystem $gonkdir/bionic/libm/include -I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/hardware/libhardware/include -I$gonkdir/hardware/libhardware_legacy/include -I$gonkdir/system -I$gonkdir/system/core/include -isystem $gonkdir/bionic -I$gonkdir/frameworks/base/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib $CPPFLAGS -I$gonkdir/frameworks/base/services/sensorservice -I$gonkdir/frameworks/base/services/camera -I$gonkdir/system/media/wilhelm/include"
		CPPFLAGS="-DANDROID -isystem $gonkdir/bionic/libc/$ARCH_DIR/include -isystem $gonkdir/bionic/libc/include/ -isystem $gonkdir/bionic/libc/kernel/common -isystem $gonkdir/bionic/libc/kernel/$ARCH_DIR -isystem $gonkdir/bionic/libm/include -I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/hardware/libhardware/include -I$gonkdir/hardware/libhardware_legacy/include -I$gonkdir/system -I$gonkdir/system/core/include -isystem $gonkdir/bionic -I$gonkdir/frameworks/base/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib $CPPFLAGS -I$gonkdir/frameworks/base/services/sensorservice -I$gonkdir/frameworks/base/services/camera -I$gonkdir/system/media/wilhelm/include -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/dalvik/libnativehelper/include/nativehelper"
		CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
		CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions -Wno-psabi $CXXFLAGS $STLPORT_CPPFLAGS"
		dnl Add -llog by default, since we use it all over the place.

dom/camera/AudioParameter.cpp

0 → 100644

+179 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2006-2011 The Android Open Source Project
		*
		* 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.
		*/

		#define LOG_TAG "AudioParameter"
		//#define LOG_NDEBUG 0

		#include <utils/Log.h>

		#include <media/AudioParameter.h>

		namespace android {

		const char *AudioParameter::keyRouting = "routing";
		const char *AudioParameter::keySamplingRate = "sampling_rate";
		const char *AudioParameter::keyFormat = "format";
		const char *AudioParameter::keyChannels = "channels";
		const char *AudioParameter::keyFrameCount = "frame_count";
		const char *AudioParameter::keyInputSource = "input_source";

		AudioParameter::AudioParameter(const String8& keyValuePairs)
		{
		char *str = new char[keyValuePairs.length()+1];
		mKeyValuePairs = keyValuePairs;

		strcpy(str, keyValuePairs.string());
		char *pair = strtok(str, ";");
		while (pair != NULL) {
		if (strlen(pair) != 0) {
		size_t eqIdx = strcspn(pair, "=");
		String8 key = String8(pair, eqIdx);
		String8 value;
		if (eqIdx == strlen(pair)) {
		value = String8("");
		} else {
		value = String8(pair + eqIdx + 1);
		}
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		} else {
		mParameters.replaceValueFor(key, value);
		}
		} else {
		LOGV("AudioParameter() cstor empty key value pair");
		}
		pair = strtok(NULL, ";");
		}

		delete[] str;
		}

		AudioParameter::~AudioParameter()
		{
		mParameters.clear();
		}

		String8 AudioParameter::toString()
		{
		String8 str = String8("");

		size_t size = mParameters.size();
		for (size_t i = 0; i < size; i++) {
		str += mParameters.keyAt(i);
		str += "=";
		str += mParameters.valueAt(i);
		if (i < (size - 1)) str += ";";
		}
		return str;
		}

		status_t AudioParameter::add(const String8& key, const String8& value)
		{
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		return NO_ERROR;
		} else {
		mParameters.replaceValueFor(key, value);
		return ALREADY_EXISTS;
		}
		}

		status_t AudioParameter::addInt(const String8& key, const int value)
		{
		char str[12];
		if (snprintf(str, 12, "%d", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::addFloat(const String8& key, const float value)
		{
		char str[23];
		if (snprintf(str, 23, "%.10f", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::remove(const String8& key)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		mParameters.removeItem(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::get(const String8& key, String8& value)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		value = mParameters.valueFor(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::getInt(const String8& key, int& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		int val;
		if (sscanf(str8.string(), "%d", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getFloat(const String8& key, float& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		float val;
		if (sscanf(str8.string(), "%f", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getAt(size_t index, String8& key, String8& value)
		{
		if (mParameters.size() > index) {
		key = mParameters.keyAt(index);
		value = mParameters.valueAt(index);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		}; // namespace android

dom/camera/CameraControlImpl.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -196,9 +196,9 @@ CameraControlImpl::TakePicture(CameraSize aSize, int32_t aRotation, const nsAStr
		}

		nsresult
		CameraControlImpl::StartRecording(CameraSize aSize, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
		CameraControlImpl::StartRecording(nsIDOMDeviceStorage* aStorageArea, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
		{
		nsCOMPtr<nsIRunnable> startRecordingTask = new StartRecordingTask(this, aSize, onSuccess, onError);
		nsCOMPtr<nsIRunnable> startRecordingTask = new StartRecordingTask(this, aStorageArea, aFilename, onSuccess, onError);
		return mCameraThread->Dispatch(startRecordingTask, NS_DISPATCH_NORMAL);
		}

		@@ -223,6 +223,13 @@ CameraControlImpl::StopPreview()
		mCameraThread->Dispatch(stopPreviewTask, NS_DISPATCH_NORMAL);
		}

		nsresult
		CameraControlImpl::GetPreviewStreamVideoMode(CameraRecordingOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
		{
		nsCOMPtr<nsIRunnable> getPreviewStreamVideoModeTask = new GetPreviewStreamVideoModeTask(this, *aOptions, onSuccess, onError);
		return mCameraThread->Dispatch(getPreviewStreamVideoModeTask, NS_DISPATCH_NORMAL);
		}

		bool
		CameraControlImpl::ReceiveFrame(void* aBuffer, ImageFormat aFormat, FrameBuilder aBuilder)
		{

dom/camera/CameraControlImpl.h

+82 −13

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#include "nsCOMPtr.h"
		#include "nsDOMFile.h"
		#include "DictionaryHelpers.h"
		#include "nsIDOMDeviceStorage.h"
		#include "nsIDOMCameraManager.h"
		#include "ICameraControl.h"
		#include "CameraCommon.h"
		@@ -25,6 +26,7 @@ class StartRecordingTask;
		class StopRecordingTask;
		class SetParameterTask;
		class GetParameterTask;
		class GetPreviewStreamVideoModeTask;

		class DOMCameraPreview;

		@@ -39,6 +41,7 @@ class CameraControlImpl : public ICameraControl
		friend class StopRecordingTask;
		friend class SetParameterTask;
		friend class GetParameterTask;
		friend class GetPreviewStreamVideoModeTask;

		public:
		CameraControlImpl(uint32_t aCameraId, nsIThread* aCameraThread)
		@@ -64,8 +67,9 @@ public:
		void StopPreview();
		nsresult AutoFocus(nsICameraAutoFocusCallback* onSuccess, nsICameraErrorCallback* onError);
		nsresult TakePicture(CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError);
		nsresult StartRecording(CameraSize aSize, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
		nsresult StartRecording(nsIDOMDeviceStorage* aStorageArea, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
		nsresult StopRecording();
		nsresult GetPreviewStreamVideoMode(CameraRecordingOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);

		nsresult Set(uint32_t aKey, const nsAString& aValue);
		nsresult Get(uint32_t aKey, nsAString& aValue);
		@@ -111,6 +115,7 @@ protected:
		virtual nsresult StopRecordingImpl(StopRecordingTask* aStopRecording) = 0;
		virtual nsresult PushParametersImpl() = 0;
		virtual nsresult PullParametersImpl() = 0;
		virtual nsresult GetPreviewStreamVideoModeImpl(GetPreviewStreamVideoModeTask* aGetPreviewStreamVideoMode) = 0;

		uint32_t mCameraId;
		nsCOMPtr<nsIThread> mCameraThread;
		@@ -347,9 +352,8 @@ public:
		class StartRecordingResult : public nsRunnable
		{
		public:
		StartRecordingResult(nsIDOMMediaStream* aStream, nsICameraStartRecordingCallback* onSuccess)
		: mStream(aStream)
		, mOnSuccessCb(onSuccess)
		StartRecordingResult(nsICameraStartRecordingCallback* onSuccess)
		: mOnSuccessCb(onSuccess)
		{ }

		virtual ~StartRecordingResult() { }
		@@ -359,13 +363,12 @@ public:
		MOZ_ASSERT(NS_IsMainThread());

		if (mOnSuccessCb) {
		mOnSuccessCb->HandleEvent(mStream);
		mOnSuccessCb->HandleEvent();
		}
		return NS_OK;
		}

		protected:
		nsCOMPtr<nsIDOMMediaStream> mStream;
		nsCOMPtr<nsICameraStartRecordingCallback> mOnSuccessCb;
		};

		@@ -373,9 +376,10 @@ protected:
		class StartRecordingTask : public nsRunnable
		{
		public:
		StartRecordingTask(CameraControlImpl* aCameraControl, CameraSize aSize, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
		: mSize(aSize)
		, mCameraControl(aCameraControl)
		StartRecordingTask(CameraControlImpl* aCameraControl, nsIDOMDeviceStorage* aStorageArea, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
		: mCameraControl(aCameraControl)
		, mStorageArea(aStorageArea)
		, mFilename(aFilename)
		, mOnSuccessCb(onSuccess)
		, mOnErrorCb(onError)
		{
		@@ -391,17 +395,21 @@ public:
		{
		DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
		nsresult rv = mCameraControl->StartRecordingImpl(this);
		DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
		DOM_CAMERA_LOGT("%s:%d : result %d\n", __func__, __LINE__, rv);

		if (NS_FAILED(rv) && mOnErrorCb) {
		if (NS_SUCCEEDED(rv)) {
		if (mOnSuccessCb) {
		rv = NS_DispatchToMainThread(new StartRecordingResult(mOnSuccessCb));
		}
		} else if (mOnErrorCb) {
		rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
		NS_ENSURE_SUCCESS(rv, rv);
		}
		return rv;
		}

		CameraSize mSize;
		nsRefPtr<CameraControlImpl> mCameraControl;
		nsCOMPtr<nsIDOMDeviceStorage> mStorageArea;
		nsString mFilename;
		nsCOMPtr<nsICameraStartRecordingCallback> mOnSuccessCb;
		nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
		};
		@@ -491,6 +499,67 @@ public:
		nsRefPtr<CameraControlImpl> mCameraControl;
		};

		// Return the resulting preview stream to JS. Runs on the main thread.
		class GetPreviewStreamVideoModeResult : public nsRunnable
		{
		public:
		GetPreviewStreamVideoModeResult(nsIDOMMediaStream* aStream, nsICameraPreviewStreamCallback* onSuccess)
		: mStream(aStream)
		, mOnSuccessCb(onSuccess)
		{
		DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
		}

		virtual ~GetPreviewStreamVideoModeResult()
		{
		DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
		}

		NS_IMETHOD Run()
		{
		MOZ_ASSERT(NS_IsMainThread());

		if (mOnSuccessCb) {
		mOnSuccessCb->HandleEvent(mStream);
		}
		return NS_OK;
		}

		protected:
		nsCOMPtr<nsIDOMMediaStream> mStream;
		nsCOMPtr<nsICameraPreviewStreamCallback> mOnSuccessCb;
		};

		// Get the video mode preview stream.
		class GetPreviewStreamVideoModeTask : public nsRunnable
		{
		public:
		GetPreviewStreamVideoModeTask(CameraControlImpl* aCameraControl, CameraRecordingOptions aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
		: mCameraControl(aCameraControl)
		, mOptions(aOptions)
		, mOnSuccessCb(onSuccess)
		, mOnErrorCb(onError)
		{ }

		NS_IMETHOD Run()
		{
		DOM_CAMERA_LOGI("%s:%d -- BEFORE IMPL\n", __func__, __LINE__);
		nsresult rv = mCameraControl->GetPreviewStreamVideoModeImpl(this);
		DOM_CAMERA_LOGI("%s:%d -- AFTER IMPL : rv = %d\n", __func__, __LINE__, rv);

		if (NS_FAILED(rv) && mOnErrorCb) {
		rv = NS_DispatchToMainThread(new CameraErrorResult(mOnErrorCb, NS_LITERAL_STRING("FAILURE")));
		NS_ENSURE_SUCCESS(rv, rv);
		}
		return NS_OK;
		}

		nsRefPtr<CameraControlImpl> mCameraControl;
		CameraRecordingOptions mOptions;
		nsCOMPtr<nsICameraPreviewStreamCallback> mOnSuccessCb;
		nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
		};

		} // namespace mozilla

		#endif // DOM_CAMERA_CAMERACONTROLIMPL_H

dom/camera/DOMCameraControl.cpp

+17 −7

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		#include "nsThread.h"
		#include "mozilla/Services.h"
		#include "nsIObserverService.h"
		#include "nsIDOMDeviceStorage.h"
		#include "DOMCameraManager.h"
		#include "DOMCameraCapabilities.h"
		#include "DOMCameraControl.h"
		@@ -218,16 +219,12 @@ nsDOMCameraControl::SetOnShutter(nsICameraShutterCallback* aOnShutter)
		return NS_ERROR_NOT_IMPLEMENTED;
		}

		/* void startRecording (in jsval aOptions, in nsICameraStartRecordingCallback onSuccess, [optional] in nsICameraErrorCallback onError); */
		/* [implicit_jscontext] void startRecording (in nsIDOMDeviceStorage storageArea, in DOMString filename, in nsICameraStartRecordingCallback onSuccess, [optional] in nsICameraErrorCallback onError); */
		NS_IMETHODIMP
		nsDOMCameraControl::StartRecording(const JS::Value& aOptions, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, JSContext* cx)
		nsDOMCameraControl::StartRecording(nsIDOMDeviceStorage* storageArea, const nsAString& filename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, JSContext* cx)
		{
		NS_ENSURE_TRUE(onSuccess, NS_ERROR_INVALID_ARG);

		CameraSize size;
		nsresult rv = size.Init(cx, &aOptions);
		NS_ENSURE_SUCCESS(rv, rv);

		nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
		if (!obs) {
		NS_WARNING("Could not get the Observer service for CameraControl::StartRecording.");
		@@ -238,7 +235,7 @@ nsDOMCameraControl::StartRecording(const JS::Value& aOptions, nsICameraStartReco
		"recording-device-events",
		NS_LITERAL_STRING("starting").get());

		return mCameraControl->StartRecording(size, onSuccess, onError);
		return mCameraControl->StartRecording(storageArea, filename, onSuccess, onError);
		}

		/* void stopRecording (); */
		@@ -316,6 +313,19 @@ nsDOMCameraControl::TakePicture(const JS::Value& aOptions, nsICameraTakePictureC
		return mCameraControl->TakePicture(size, options.rotation, options.fileFormat, pos, onSuccess, onError);
		}

		/* [implicit_jscontext] void GetPreviewStreamVideoMode (in jsval aOptions, in nsICameraPreviewStreamCallback onSuccess, [optional] in nsICameraErrorCallback onError); */
		NS_IMETHODIMP
		nsDOMCameraControl::GetPreviewStreamVideoMode(const JS::Value& aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError, JSContext* cx)
		{
		NS_ENSURE_TRUE(onSuccess, NS_ERROR_INVALID_ARG);

		CameraRecordingOptions options;
		nsresult rv = options.Init(cx, &aOptions);
		NS_ENSURE_SUCCESS(rv, rv);

		return mCameraControl->GetPreviewStreamVideoMode(&options, onSuccess, onError);
		}

		class GetCameraResult : public nsRunnable
		{
		public: