gecko-dev/dom/camera
Wes Kocher 48b8d407c8 Merge inbound to central, a=merge
a=release to get around the webidl hook for a comment-only change

--HG--
extra : amend_source : f7e57101e1a25d3cf3536a256898ec2a21c54b38
2016-08-16 17:05:30 -07:00
..
test Bug 1292999 - Replace Iterator() in dom/; r=arai 2016-08-11 22:05:49 -04:00
AutoRwLock.h
CameraCommon.h Bug 1219478: Replace PRLogModuleInfo usage with LazyLogModule in dom folders except media.r=amerchesini 2015-11-23 11:09:25 -08:00
CameraControlImpl.cpp Bug 1293603 (part 2) - Make Run() declarations consistent. r=erahm. 2016-08-08 12:18:10 +10:00
CameraControlImpl.h Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
CameraControlListener.h Bug 1187364 - Part 1. Add ability for camera to pause/resume recording. r=dhylands,bz 2015-08-17 15:20:28 -04:00
CameraPreferences.cpp
CameraPreferences.h
CameraPreviewMediaStream.cpp Bug 1201363 - Let MediaStreamVideoSink bind with particular video track. r=jesup 2016-05-27 14:33:50 +08:00
CameraPreviewMediaStream.h Bug 1201363 - Let MediaStreamVideoSink bind with particular video track. r=jesup 2016-05-27 14:33:50 +08:00
CameraTestHardware.js
CameraTestHardware.manifest
DOMCameraCapabilities.cpp Bug 1293117 (part 4) - Change many NS_IMETHODIMP occurrences to NS_IMETHOD. r=froydnj. 2016-08-08 10:54:47 +10:00
DOMCameraCapabilities.h Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
DOMCameraControl.cpp Bug 1292091 - Part 2 - replace MaybeResolve(JS::UndefinedHandleValue) with MaybeResolveWithUndefined(); r=bz 2016-08-09 17:15:13 +08:00
DOMCameraControl.h Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
DOMCameraControlListener.cpp Bug 1265927: Move nsRunnable to mozilla::Runnable, CancelableRunnable to mozilla::CancelableRunnable. r=froydnj 2016-04-25 17:23:21 -07:00
DOMCameraControlListener.h Bug 1175656 - Implement generation of recording posters in Gecko. r=dhylands,bz 2015-06-16 20:35:00 -04:00
DOMCameraDetectedFace.cpp Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
DOMCameraDetectedFace.h Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
DOMCameraManager.cpp Bug 1294620 - Use infallible XPIDL attribute getters more. r=erahm. 2016-08-12 15:19:29 +10:00
DOMCameraManager.h Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
FallbackCameraControl.cpp Bug 1182996 - Fix and add missing namespace comments. rs=ehsan 2015-07-13 08:25:42 -07:00
FallbackCameraManager.cpp
FallbackCameraPlatform.cpp
FallbackCameraPlatform.h Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
GonkCameraControl.cpp Bug 1293117 (part 4) - Change many NS_IMETHODIMP occurrences to NS_IMETHOD. r=froydnj. 2016-08-08 10:54:47 +10:00
GonkCameraControl.h Bug 1186808 - Replace nsBaseHashtable::EnumerateRead() calls in dom/camera/ with iterators. r=mikeh. 2015-11-22 14:39:01 -08:00
GonkCameraHwMgr.cpp Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
GonkCameraHwMgr.h Bug 1171374 - Permit software video codecs with the emulated camera. r=sotaro 2015-06-18 17:12:06 -04:00
GonkCameraListener.h
GonkCameraManager.cpp Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
GonkCameraParameters.cpp Bug 1186808 - Replace nsBaseHashtable::EnumerateRead() calls in dom/camera/ with iterators. r=mikeh. 2015-11-22 14:39:01 -08:00
GonkCameraParameters.h Bug 1186808 - Replace nsBaseHashtable::EnumerateRead() calls in dom/camera/ with iterators. r=mikeh. 2015-11-22 14:39:01 -08:00
GonkCameraSource.cpp
GonkCameraSource.h
GonkRecorder.cpp Bug 1187364 - Part 2. Ensure that recording is resumed with a key frame. r=mchiang 2015-08-17 15:20:35 -04:00
GonkRecorder.h Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 2015-10-18 01:24:48 -04:00
GonkRecorderProfiles.cpp Bug 1186808 - Replace nsBaseHashtable::EnumerateRead() calls in dom/camera/ with iterators. r=mikeh. 2015-11-22 14:39:01 -08:00
GonkRecorderProfiles.def Bug 1179726 - Prefer lower resolutions than 4kuhd as the default video recording profile. r=dhylands 2015-10-29 16:06:46 -04:00
GonkRecorderProfiles.h Bug 1186808 - Replace nsBaseHashtable::EnumerateRead() calls in dom/camera/ with iterators. r=mikeh. 2015-11-22 14:39:01 -08:00
ICameraControl.h Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
README
TestGonkCameraControl.cpp
TestGonkCameraControl.h
TestGonkCameraHardware.cpp Bug 1293603 (part 2) - Make Run() declarations consistent. r=erahm. 2016-08-08 12:18:10 +10:00
TestGonkCameraHardware.h Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
moz.build Bug 1286877 - do not set c-basic-offset for python-mode; r=gps 2016-07-14 10:16:42 -06:00
nsICameraTestHardware.idl
update.patch
update.sh
update2.patch

README

This README file details from where some of the camcorder source files were derived from and how to apply the provided patch file to get the updated files for B2G.
---------------------------------

Following is the list of B2G files which were derived from an android ics_chocolate build. It also shows the corresponding locations where the original source files can be found:

GonkRecoder.cpp:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=media/libmediaplayerservice/StagefrightRecorder.cpp;hb=ef1672482a9c2b88d8017927df68144fee42626c

GonkRecorder.h:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=media/libmediaplayerservice/StagefrightRecorder.h;hb=e3682213bcd3fe43b059e00f0fe4dbebc3f3c35d

GonkCameraSource.cpp:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=media/libstagefright/CameraSource.cpp;hb=7fa677babfee9c241a131b22c9c1c5ab512ef2d2

GonkCameraSource.h:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=include/media/stagefright/CameraSource.h;hb=96af14d9b013496accf40a85a66fefcba3ac0111

AudioParameter.cpp:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=media/libmedia/AudioParameter.cpp;hb=4dc22e77cfd2a1c3671e5646ee87c5e4c15596a0

GonkCameraListener.h:
https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=blob;f=include/camera/Camera.h;hb=796f35e408d9dca386f90d8fbde80471ac011fa6

There were quite a few changes done to the above listed sources to support camcorder on B2G platform.
update.patch lists the changes on top of the original files.
update.sh shell script copies the files from an android tree and applies the patch to get updated files for B2G.