media/media.gyp - Issue 23903032: Move NV21 colorspace treatment from VideoCapture java to C++

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/media.gyp

Issue 23903032: Move NV21 colorspace treatment from VideoCapture java to C++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added ImageFormat.java automatic generation to android_webview/Android.mk, missed before. Created 7 years, 3 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

« media/base/android/java/src/org/chromium/media/VideoCapture.java ('K') | « media/base/android/java/src/org/chromium/media/VideoCapture.java ('k') | media/video/capture/android/imageformat_list.h » ('j') | media/video/capture/android/video_capture_device_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 706f60682c02ba3abc50df4c9879c6bb30ce4fdd..a9835d4f98fdd2fa1df2474c0fff7478339ad48b 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1428,6 +1428,7 @@

'type': 'none',

'dependencies': [

'../base/base.gyp:base',

+ 'media_android_imageformat_list',

'export_dependent_settings': [

'../base/base.gyp:base',

@@ -1437,7 +1438,18 @@

'includes': ['../build/java.gypi'],

+ {

+ 'target_name': 'media_android_imageformat_list',

+ 'type': 'none',

+ 'sources': [

+ 'base/android/java/src/org/chromium/media/ImageFormat.template',

+ ],

+ 'variables': {

+ 'package_name': 'org/chromium/media',

+ 'template_deps': ['video/capture/android/imageformat_list.h'],

+ },

+ 'includes': [ '../build/android/java_cpp_template.gypi' ],

+ },

}],

['media_use_ffmpeg==1', {