Bug 1311048 - Make it compile on android. r=jesup
authorJan-Ivar Bruaroey <jib@mozilla.com>
Fri, 04 Nov 2016 11:44:32 -0400
changeset 351357 8da036418f24571d18ad32a5b7870571e8f141a8
parent 351356 bec62243bf7e3869379b12017cd10e5ed5902296
child 351358 b8f2d6428e38806fb1ce5898ed2a16d3b7e77d3c
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1311048
milestone52.0a1
Bug 1311048 - Make it compile on android. r=jesup MozReview-Commit-ID: 7jwGgr0JVEt
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h
--- a/media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc
@@ -226,17 +226,18 @@ uint32_t DeviceInfoAndroid::NumberOfDevi
 
 int32_t DeviceInfoAndroid::GetDeviceName(
     uint32_t deviceNumber,
     char* deviceNameUTF8,
     uint32_t deviceNameLength,
     char* deviceUniqueIdUTF8,
     uint32_t deviceUniqueIdUTF8Length,
     char* /*productUniqueIdUTF8*/,
-    uint32_t /*productUniqueIdUTF8Length*/) {
+    uint32_t /*productUniqueIdUTF8Length*/,
+    pid_t* /*pid*/) {
   if (deviceNumber >= g_camera_info->size())
     return -1;
   const AndroidCameraInfo& info = g_camera_info->at(deviceNumber);
   if (info.name.length() + 1 > deviceNameLength ||
       info.name.length() + 1 > deviceUniqueIdUTF8Length) {
     return -1;
   }
   memcpy(deviceNameUTF8, info.name.c_str(), info.name.length() + 1);
--- a/media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h
@@ -41,17 +41,18 @@ class DeviceInfoAndroid : public DeviceI
   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);
+      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; }