mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1578073 - Move android video capture code to dom/media/systemservices; r=jib 

Although originally part of webrtc.org, this code has subsequently been
removed by upstream. Moving it to under dom/media should make it clearer that
this is code that we are maintaining and simplify future upstream merges.

Differential Revision: https://phabricator.services.mozilla.com/D61850

--HG--
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc => dom/media/systemservices/android_video_capture/device_info_android.cc
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h => dom/media/systemservices/android_video_capture/device_info_android.h
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java => dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java => dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java => dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc => dom/media/systemservices/android_video_capture/video_capture_android.cc
rename : media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.h => dom/media/systemservices/android_video_capture/video_capture_android.h
extra : moz-landing-system : lando
This commit is contained in:
Dan Minor 2020-02-11 17:03:13 +00:00
Родитель 90a9c5e77e
Коммит 8d69b72363
7 изменённых файлов: 63 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

87
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc → dom/media/systemservices/android_video_capture/device_info_android.cc
Просмотреть файл

@ -113,15 +113,15 @@ void DeviceInfoAndroid::BuildDeviceList() {
g_camera_info = new std::vector<AndroidCameraInfo>();
jclass j_info_class = mozilla::jni::GetClassRef(
jni, "org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid");
jni, "org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid");
jclass j_cap_class = mozilla::jni::GetClassRef(
jni, "org/webrtc/videoengine/CaptureCapabilityAndroid");
jni, "org/webrtc/videoengine/CaptureCapabilityAndroid");
assert(j_info_class);
jmethodID j_initialize = jni->GetStaticMethodID(
j_info_class, "getDeviceInfo",
"()[Lorg/webrtc/videoengine/CaptureCapabilityAndroid;");
j_info_class, "getDeviceInfo",
"()[Lorg/webrtc/videoengine/CaptureCapabilityAndroid;");
jarray j_camera_caps = static_cast<jarray>(
jni->CallStaticObjectMethod(j_info_class, j_initialize));
jni->CallStaticObjectMethod(j_info_class, j_initialize));
const jsize capLength = jni->GetArrayLength(j_camera_caps);
@ -133,46 +133,42 @@ void DeviceInfoAndroid::BuildDeviceList() {
jfieldID frontFacingField = jni->GetFieldID(j_cap_class, "frontFacing", "Z");
jfieldID nameField =
jni->GetFieldID(j_cap_class, "name", "Ljava/lang/String;");
if (widthField == NULL
|| heightField == NULL
|| maxFpsField == NULL
|| minFpsField == NULL
|| orientationField == NULL
|| frontFacingField == NULL
|| nameField == NULL) {
if (widthField == NULL || heightField == NULL || maxFpsField == NULL ||
minFpsField == NULL || orientationField == NULL ||
frontFacingField == NULL || nameField == NULL) {
RTC_LOG(LS_INFO) << __FUNCTION__ << ": Failed to get field Id.";
return;
}
for (jsize i = 0; i < capLength; i++) {
jobject capabilityElement = jni->GetObjectArrayElement(
(jobjectArray) j_camera_caps,
i);
jobject capabilityElement =
jni->GetObjectArrayElement((jobjectArray)j_camera_caps, i);
AndroidCameraInfo info;
jstring camName = static_cast<jstring>(jni->GetObjectField(capabilityElement,
nameField));
jstring camName =
static_cast<jstring>(jni->GetObjectField(capabilityElement, nameField));
const char* camChars = jni->GetStringUTFChars(camName, nullptr);
info.name = std::string(camChars);
jni->ReleaseStringUTFChars(camName, camChars);
info.orientation = jni->GetIntField(capabilityElement, orientationField);
info.front_facing = jni->GetBooleanField(capabilityElement, frontFacingField);
info.front_facing =
jni->GetBooleanField(capabilityElement, frontFacingField);
jint min_mfps = jni->GetIntField(capabilityElement, minFpsField);
jint max_mfps = jni->GetIntField(capabilityElement, maxFpsField);
jintArray widthResArray =
static_cast<jintArray>(jni->GetObjectField(capabilityElement, widthField));
jintArray heightResArray =
static_cast<jintArray>(jni->GetObjectField(capabilityElement, heightField));
jintArray widthResArray = static_cast<jintArray>(
jni->GetObjectField(capabilityElement, widthField));
jintArray heightResArray = static_cast<jintArray>(
jni->GetObjectField(capabilityElement, heightField));
const jsize numRes = jni->GetArrayLength(widthResArray);
jint *widths = jni->GetIntArrayElements(widthResArray, nullptr);
jint *heights = jni->GetIntArrayElements(heightResArray, nullptr);
jint* widths = jni->GetIntArrayElements(widthResArray, nullptr);
jint* heights = jni->GetIntArrayElements(heightResArray, nullptr);
for (jsize j = 0; j < numRes; ++j) {
info.resolutions.push_back(std::make_pair(widths[j], heights[j]));
info.resolutions.push_back(std::make_pair(widths[j], heights[j]));
}
info.mfpsRanges.push_back(std::make_pair(min_mfps, max_mfps));
@ -204,21 +200,16 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() {
return new videocapturemodule::DeviceInfoAndroid();
}
DeviceInfoAndroid::DeviceInfoAndroid() :
DeviceInfoImpl() {
}
DeviceInfoAndroid::DeviceInfoAndroid() : DeviceInfoImpl() {}
DeviceInfoAndroid::~DeviceInfoAndroid() {
}
DeviceInfoAndroid::~DeviceInfoAndroid() {}
bool DeviceInfoAndroid::FindCameraIndex(const char* deviceUniqueIdUTF8,
size_t* index) {
return FindCameraIndexByName(deviceUniqueIdUTF8, index);
}
int32_t DeviceInfoAndroid::Init() {
return 0;
}
int32_t DeviceInfoAndroid::Init() { return 0; }
uint32_t DeviceInfoAndroid::NumberOfDevices() {
Refresh();
@ -226,13 +217,9 @@ uint32_t DeviceInfoAndroid::NumberOfDevices() {
}
int32_t DeviceInfoAndroid::GetDeviceName(
uint32_t deviceNumber,
char* deviceNameUTF8,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
uint32_t deviceUniqueIdUTF8Length,
char* /*productUniqueIdUTF8*/,
uint32_t /*productUniqueIdUTF8Length*/,
uint32_t deviceNumber, char* deviceNameUTF8, uint32_t deviceNameLength,
char* deviceUniqueIdUTF8, uint32_t deviceUniqueIdUTF8Length,
char* /*productUniqueIdUTF8*/, uint32_t /*productUniqueIdUTF8Length*/,
pid_t* /*pid*/) {
if (deviceNumber >= g_camera_info->size()) {
return -1;
@ -247,8 +234,7 @@ int32_t DeviceInfoAndroid::GetDeviceName(
return 0;
}
int32_t DeviceInfoAndroid::CreateCapabilityMap(
const char* deviceUniqueIdUTF8) {
int32_t DeviceInfoAndroid::CreateCapabilityMap(const char* deviceUniqueIdUTF8) {
_captureCapabilities.clear();
const AndroidCameraInfo* info = FindCameraInfoByName(deviceUniqueIdUTF8);
if (info == NULL) {
@ -273,17 +259,16 @@ int32_t DeviceInfoAndroid::CreateCapabilityMap(
int32_t DeviceInfoAndroid::GetOrientation(const char* deviceUniqueIdUTF8,
VideoRotation& orientation) {
const AndroidCameraInfo* info = FindCameraInfoByName(deviceUniqueIdUTF8);
if (info == NULL ||
VideoCaptureImpl::RotationFromDegrees(info->orientation,
&orientation) != 0) {
if (info == NULL || VideoCaptureImpl::RotationFromDegrees(
info->orientation, &orientation) != 0) {
return -1;
}
return 0;
}
void DeviceInfoAndroid::GetMFpsRange(const char* deviceUniqueIdUTF8,
int max_fps_to_match,
int* min_mfps, int* max_mfps) {
int max_fps_to_match, int* min_mfps,
int* max_mfps) {
const AndroidCameraInfo* info = FindCameraInfoByName(deviceUniqueIdUTF8);
if (info == NULL) {
return;
@ -293,11 +278,13 @@ void DeviceInfoAndroid::GetMFpsRange(const char* deviceUniqueIdUTF8,
RTC_LOG(LS_INFO) << "Search for best target mfps " << desired_mfps;
// Search for best fps range with preference shifted to constant fps modes.
for (size_t i = 0; i < info->mfpsRanges.size(); ++i) {
int diff_mfps = abs(info->mfpsRanges[i].first - desired_mfps) +
int diff_mfps =
abs(info->mfpsRanges[i].first - desired_mfps) +
abs(info->mfpsRanges[i].second - desired_mfps) +
(info->mfpsRanges[i].second - info->mfpsRanges[i].first) / 2;
RTC_LOG(LS_INFO) << "Fps range " << info->mfpsRanges[i].first << ":" <<
info->mfpsRanges[i].second << ". Distance: " << diff_mfps;
RTC_LOG(LS_INFO) << "Fps range " << info->mfpsRanges[i].first << ":"
<< info->mfpsRanges[i].second
<< ". Distance: " << diff_mfps;
if (i == 0 || diff_mfps < best_diff_mfps) {
best_diff_mfps = diff_mfps;
*min_mfps = info->mfpsRanges[i].first;

49
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h → dom/media/systemservices/android_video_capture/device_info_android.h
Просмотреть файл

@ -16,13 +16,13 @@
#include "modules/video_capture/device_info_impl.h"
#include "modules/video_capture/video_capture_impl.h"
#define AndroidJavaCaptureDeviceInfoClass "org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid"
#define AndroidJavaCaptureCapabilityClass "org/webrtc/videoengine/CaptureCapabilityAndroid"
#define AndroidJavaCaptureDeviceInfoClass \
"org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid"
#define AndroidJavaCaptureCapabilityClass \
"org/webrtc/videoengine/CaptureCapabilityAndroid"
namespace webrtc
{
namespace videocapturemodule
{
namespace webrtc {
namespace videocapturemodule {
class DeviceInfoAndroid : public DeviceInfoImpl {
public:
@ -39,39 +39,34 @@ class DeviceInfoAndroid : public DeviceInfoImpl {
virtual int32_t Init();
virtual uint32_t NumberOfDevices();
virtual int32_t Refresh();
virtual int32_t GetDeviceName(
uint32_t deviceNumber,
char* deviceNameUTF8,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
uint32_t deviceUniqueIdUTF8Length,
char* productUniqueIdUTF8 = 0,
uint32_t productUniqueIdUTF8Length = 0,
pid_t* pid = 0);
virtual int32_t GetDeviceName(uint32_t deviceNumber, char* deviceNameUTF8,
uint32_t deviceNameLength,
char* deviceUniqueIdUTF8,
uint32_t deviceUniqueIdUTF8Length,
char* productUniqueIdUTF8 = 0,
uint32_t productUniqueIdUTF8Length = 0,
pid_t* pid = 0);
virtual int32_t CreateCapabilityMap(const char* deviceUniqueIdUTF8);
virtual int32_t DisplayCaptureSettingsDialogBox(
const char* /*deviceUniqueIdUTF8*/,
const char* /*dialogTitleUTF8*/,
void* /*parentWindow*/,
uint32_t /*positionX*/,
uint32_t /*positionY*/) { return -1; }
const char* /*deviceUniqueIdUTF8*/, const char* /*dialogTitleUTF8*/,
void* /*parentWindow*/, uint32_t /*positionX*/, uint32_t /*positionY*/) {
return -1;
}
virtual int32_t GetOrientation(const char* deviceUniqueIdUTF8,
VideoRotation& orientation);
// Populate |min_mfps| and |max_mfps| with the closest supported range of the
// device to |max_fps_to_match|.
void GetMFpsRange(const char* deviceUniqueIdUTF8,
int max_fps_to_match,
int* min_mfps,
int* max_mfps);
void GetMFpsRange(const char* deviceUniqueIdUTF8, int max_fps_to_match,
int* min_mfps, int* max_mfps);
private:
enum { kExpectedCaptureDelay = 190};
static void BuildDeviceList();
enum { kExpectedCaptureDelay = 190 };
static void BuildDeviceList();
};
} // namespace videocapturemodule
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_

0
media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java → dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java
Просмотреть файл

0
media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java → dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
Просмотреть файл

0
media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java → dom/media/systemservices/android_video_capture/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
Просмотреть файл

0
media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc → dom/media/systemservices/android_video_capture/video_capture_android.cc
Просмотреть файл

10
media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.h → dom/media/systemservices/android_video_capture/video_capture_android.h
Просмотреть файл

@ -30,16 +30,14 @@ class VideoCaptureAndroid : public VideoCaptureImpl {
virtual int32_t CaptureSettings(VideoCaptureCapability& settings);
virtual int32_t SetCaptureRotation(VideoRotation rotation);
int32_t OnIncomingFrame(uint8_t* videoFrame,
size_t videoFrameLength,
int32_t degrees,
int64_t captureTime = 0);
int32_t OnIncomingFrame(uint8_t* videoFrame, size_t videoFrameLength,
int32_t degrees, int64_t captureTime = 0);
protected:
virtual ~VideoCaptureAndroid();
DeviceInfoAndroid _deviceInfo;
jobject _jCapturer; // Global ref to Java VideoCaptureAndroid object.
jobject _jCapturer; // Global ref to Java VideoCaptureAndroid object.
VideoCaptureCapability _captureCapability;
VideoRotation _rotation;
bool _captureStarted;
@ -47,4 +45,4 @@ class VideoCaptureAndroid : public VideoCaptureImpl {
} // namespace videocapturemodule
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_VIDEO_CAPTURE_ANDROID_H_
#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_VIDEO_CAPTURE_ANDROID_H_