Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 ], 1421 ],
1422 'include_dirs': [ 1422 'include_dirs': [
1423 '<(SHARED_INTERMEDIATE_DIR)/media', 1423 '<(SHARED_INTERMEDIATE_DIR)/media',
1424 ], 1424 ],
1425 }, 1425 },
1426 { 1426 {
1427 'target_name': 'media_java', 1427 'target_name': 'media_java',
1428 'type': 'none', 1428 'type': 'none',
1429 'dependencies': [ 1429 'dependencies': [
1430 '../base/base.gyp:base', 1430 '../base/base.gyp:base',
1431 'media_android_imageformat_list',
1431 ], 1432 ],
1432 'export_dependent_settings': [ 1433 'export_dependent_settings': [
1433 '../base/base.gyp:base', 1434 '../base/base.gyp:base',
1434 ], 1435 ],
1435 'variables': { 1436 'variables': {
1436 'java_in_dir': 'base/android/java', 1437 'java_in_dir': 'base/android/java',
1437 }, 1438 },
1438 'includes': ['../build/java.gypi'], 1439 'includes': ['../build/java.gypi'],
1439 }, 1440 },
1440 1441 {
1442 'target_name': 'media_android_imageformat_list',
1443 'type': 'none',
1444 'sources': [
1445 'base/android/java/src/org/chromium/media/ImageFormat.template',
1446 ],
1447 'variables': {
1448 'package_name': 'org/chromium/media',
1449 'template_deps': ['video/capture/android/imageformat_list.h'],
1450 },
1451 'includes': [ '../build/android/java_cpp_template.gypi' ],
1452 },
1441 ], 1453 ],
1442 }], 1454 }],
1443 ['media_use_ffmpeg==1', { 1455 ['media_use_ffmpeg==1', {
1444 'targets': [ 1456 'targets': [
1445 { 1457 {
1446 'target_name': 'ffmpeg_unittests', 1458 'target_name': 'ffmpeg_unittests',
1447 'type': 'executable', 1459 'type': 'executable',
1448 'dependencies': [ 1460 'dependencies': [
1449 '../base/base.gyp:base', 1461 '../base/base.gyp:base',
1450 '../base/base.gyp:base_i18n', 1462 '../base/base.gyp:base_i18n',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 ], 1515 ],
1504 }], 1516 }],
1505 ], 1517 ],
1506 }], 1518 }],
1507 ], 1519 ],
1508 }, 1520 },
1509 ], 1521 ],
1510 }], 1522 }],
1511 ], 1523 ],
1512 } 1524 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698