зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1060708 - Detect user and environment cameras on Android. r=gcp,blassey,snorp
This commit is contained in:
Родитель
228f2f2e11
Коммит
a8cadf5ca3
|
@ -388,13 +388,27 @@ VideoDevice::VideoDevice(MediaEngineVideoSource* aSource)
|
|||
mFacingMode = dom::VideoFacingModeEnum::User;
|
||||
}
|
||||
#endif // MOZ_B2G_CAMERA
|
||||
#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
|
||||
// Names are generated. Example: "Camera 0, Facing back, Orientation 90"
|
||||
//
|
||||
// See media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/
|
||||
// webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
|
||||
|
||||
if (mName.Find(NS_LITERAL_STRING("Facing back")) != kNotFound) {
|
||||
mHasFacingMode = true;
|
||||
mFacingMode = dom::VideoFacingModeEnum::Environment;
|
||||
} else if (mName.Find(NS_LITERAL_STRING("Facing front")) != kNotFound) {
|
||||
mHasFacingMode = true;
|
||||
mFacingMode = dom::VideoFacingModeEnum::User;
|
||||
}
|
||||
#endif // ANDROID
|
||||
#ifdef XP_MACOSX
|
||||
// Kludge to test user-facing cameras on OSX.
|
||||
if (mName.Find(NS_LITERAL_STRING("Face")) != -1) {
|
||||
mHasFacingMode = true;
|
||||
mFacingMode = dom::VideoFacingModeEnum::User;
|
||||
}
|
||||
|
||||
#endif
|
||||
mMediaSource = aSource->GetMediaSource();
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче