media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java - Issue 667433003: Fix a crash when cameraInfo is NULL

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java

Issue 667433003: Fix a crash when cameraInfo is NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java ('k') | media/video/capture/android/video_capture_device_factory_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java

diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java

index 015031639f15ffcbfa4c997754ad873a0ae03d69..32eeb3fe639ca51aeb5f7f7b7c6829c636799954 100644

--- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java

+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java

@@ -108,11 +108,6 @@ class VideoCaptureFactory {

}

@CalledByNative

- static String getDeviceId(int id) {

- return Integer.toString(id);

- }

- @CalledByNative

static VideoCapture.CaptureFormat[] getDeviceSupportedFormats(int id) {

return ChromiumCameraInfo.isSpecialCamera(id) ?

VideoCaptureTango.getDeviceSupportedFormats(