Bug 728673: Restore call to getNumberOfCameras(). r=fabrice
authorChris Jones <jones.chris.g@gmail.com>
Sun, 19 Feb 2012 09:47:16 -0800
changeset 87157 f4010ca5f049f3dd50d9117079a89490ca13af05
parent 87156 88c69fa60ec2639cf1cedd7b8e40a55a4f08bd32
child 87158 24f2c7e26fbddeccd7790fa38eef086acc89b33c
push id22088
push usercjones@mozilla.com
push dateSun, 19 Feb 2012 17:47:36 +0000
treeherdermozilla-central@f4010ca5f049 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs728673
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 728673: Restore call to getNumberOfCameras(). r=fabrice
netwerk/protocol/device/GonkCaptureProvider.cpp
--- a/netwerk/protocol/device/GonkCaptureProvider.cpp
+++ b/netwerk/protocol/device/GonkCaptureProvider.cpp
@@ -270,17 +270,17 @@ GonkCameraInputStream::Init(nsACString& 
   if (XRE_GetProcessType() != GeckoProcessType_Default)
     return NS_ERROR_NOT_IMPLEMENTED;
 
   mContentType = aContentType;
   mWidth = aParams->width;
   mHeight = aParams->height;
   mCamera = aParams->camera;
 
-  PRUint32 maxNumCameras = 2;//getNumberOfCameras();
+  PRUint32 maxNumCameras = getNumberOfCameras();
 
   if (maxNumCameras == 0)
     return NS_ERROR_FAILURE;
 
   if (mCamera >= maxNumCameras)
     mCamera = 0;
 
   mHardware = CameraHardwareInterface::openCamera(mCamera);