author | Mike Habicher <mikeh@mozilla.com> |
Fri, 30 Jan 2015 11:50:07 -0500 | |
changeset 226912 | d3d2d29f0f7c7f550ecfcdcb97dd9bbceb343763 |
parent 226911 | c136aa495ef34897e5e0f3d130eacc8c0909d9c7 |
child 226913 | c7a90f1a321c0e5bb09c3412edd4995236ceee7a |
push id | 54950 |
push user | philringnalda@gmail.com |
push date | Sat, 31 Jan 2015 17:14:09 +0000 |
treeherder | mozilla-inbound@37cbadfe1bc1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | aosmond |
bugs | 1103400 |
milestone | 38.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
|
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp +++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp @@ -195,16 +195,26 @@ MediaEngineGonkVideoSource::Start(Source NS_DispatchToMainThread(WrapRunnable(nsRefPtr<MediaEngineGonkVideoSource>(this), &MediaEngineGonkVideoSource::StartImpl, mCapability)); mCallbackMonitor.Wait(); if (mState != kStarted) { return NS_ERROR_FAILURE; } + nsTArray<nsString> focusModes; + mCameraControl->Get(CAMERA_PARAM_SUPPORTED_FOCUSMODES, focusModes); + for (nsTArray<nsString>::index_type i = 0; i < focusModes.Length(); ++i) { + if (focusModes[i].EqualsASCII("continuous-video")) { + mCameraControl->Set(CAMERA_PARAM_FOCUSMODE, focusModes[i]); + mCameraControl->ResumeContinuousFocus(); + break; + } + } + if (NS_FAILED(InitDirectMediaBuffer())) { return NS_ERROR_FAILURE; } return NS_OK; } nsresult @@ -419,25 +429,16 @@ MediaEngineGonkVideoSource::StartImpl(we ICameraControl::Configuration config; config.mMode = ICameraControl::kPictureMode; config.mPreviewSize.width = aCapability.width; config.mPreviewSize.height = aCapability.height; mCameraControl->Start(&config); mCameraControl->Set(CAMERA_PARAM_PICTURE_SIZE, config.mPreviewSize); - nsTArray<nsString> focusModes; - mCameraControl->Get(CAMERA_PARAM_SUPPORTED_FOCUSMODES, focusModes); - for (nsTArray<nsString>::index_type i = 0; i < focusModes.Length(); ++i) { - if (focusModes[i].EqualsASCII("continuous-video")) { - mCameraControl->Set(CAMERA_PARAM_FOCUSMODE, focusModes[i]); - break; - } - } - hal::RegisterScreenConfigurationObserver(this); } void MediaEngineGonkVideoSource::StopImpl() { MOZ_ASSERT(NS_IsMainThread()); mCameraSource->stop();