OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/modules/video_capture/android/device_info_android.h" | 11 #include "webrtc/modules/video_capture/android/device_info_android.h" |
12 | 12 |
13 #include <algorithm> | 13 #include <algorithm> |
14 #include <sstream> | 14 #include <sstream> |
15 #include <vector> | 15 #include <vector> |
16 | 16 |
17 #include "json/json.h" | |
18 #include "unicode/unistr.h" | 17 #include "unicode/unistr.h" |
| 18 #include "webrtc/base/json.h" |
19 #include "webrtc/modules/video_capture/android/video_capture_android.h" | 19 #include "webrtc/modules/video_capture/android/video_capture_android.h" |
20 #include "webrtc/system_wrappers/interface/logging.h" | 20 #include "webrtc/system_wrappers/interface/logging.h" |
21 #include "webrtc/system_wrappers/interface/ref_count.h" | 21 #include "webrtc/system_wrappers/interface/ref_count.h" |
22 #include "webrtc/system_wrappers/interface/trace.h" | 22 #include "webrtc/system_wrappers/interface/trace.h" |
23 | 23 |
24 namespace webrtc { | 24 namespace webrtc { |
25 | 25 |
26 namespace videocapturemodule { | 26 namespace videocapturemodule { |
27 | 27 |
28 // Helper for storing lists of pairs of ints. Used e.g. for resolutions & FPS | 28 // Helper for storing lists of pairs of ints. Used e.g. for resolutions & FPS |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 if (i == 0 || diff_mfps < best_diff_mfps) { | 247 if (i == 0 || diff_mfps < best_diff_mfps) { |
248 best_diff_mfps = diff_mfps; | 248 best_diff_mfps = diff_mfps; |
249 *min_mfps = info->mfpsRanges[i].first; | 249 *min_mfps = info->mfpsRanges[i].first; |
250 *max_mfps = info->mfpsRanges[i].second; | 250 *max_mfps = info->mfpsRanges[i].second; |
251 } | 251 } |
252 } | 252 } |
253 } | 253 } |
254 | 254 |
255 } // namespace videocapturemodule | 255 } // namespace videocapturemodule |
256 } // namespace webrtc | 256 } // namespace webrtc |
OLD | NEW |