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

Side by Side Diff: talk/libjingle.gyp

Issue 1321893003: CameraEnumerationAndroid: Add getSupportedFormats() implementation using android.hardware.camera2 (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: weaker tests Created 5 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 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'app/webrtc/java/src/org/webrtc/SessionDescription.java', 133 'app/webrtc/java/src/org/webrtc/SessionDescription.java',
134 'app/webrtc/java/src/org/webrtc/VideoCapturer.java', 134 'app/webrtc/java/src/org/webrtc/VideoCapturer.java',
135 'app/webrtc/java/src/org/webrtc/VideoRenderer.java', 135 'app/webrtc/java/src/org/webrtc/VideoRenderer.java',
136 'app/webrtc/java/src/org/webrtc/VideoSource.java', 136 'app/webrtc/java/src/org/webrtc/VideoSource.java',
137 'app/webrtc/java/src/org/webrtc/VideoTrack.java', 137 'app/webrtc/java/src/org/webrtc/VideoTrack.java',
138 ], 138 ],
139 # TODO(fischman): extract this into a webrtc gyp var that can be 139 # TODO(fischman): extract this into a webrtc gyp var that can be
140 # included here, or better yet, build a proper .jar in webrtc 140 # included here, or better yet, build a proper .jar in webrtc
141 # and include it here. 141 # and include it here.
142 'android_java_files': [ 142 'android_java_files': [
143 'app/webrtc/java/android/org/webrtc/Camera2Enumerator.java',
143 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.j ava', 144 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.j ava',
144 'app/webrtc/java/android/org/webrtc/CameraEnumerator.java', 145 'app/webrtc/java/android/org/webrtc/CameraEnumerator.java',
145 'app/webrtc/java/android/org/webrtc/EglBase.java', 146 'app/webrtc/java/android/org/webrtc/EglBase.java',
146 'app/webrtc/java/android/org/webrtc/GlRectDrawer.java', 147 'app/webrtc/java/android/org/webrtc/GlRectDrawer.java',
147 'app/webrtc/java/android/org/webrtc/GlShader.java', 148 'app/webrtc/java/android/org/webrtc/GlShader.java',
148 'app/webrtc/java/android/org/webrtc/GlUtil.java', 149 'app/webrtc/java/android/org/webrtc/GlUtil.java',
149 'app/webrtc/java/android/org/webrtc/RendererCommon.java', 150 'app/webrtc/java/android/org/webrtc/RendererCommon.java',
150 'app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java' , 151 'app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java' ,
151 'app/webrtc/java/android/org/webrtc/VideoRendererGui.java', 152 'app/webrtc/java/android/org/webrtc/VideoRendererGui.java',
152 'app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java', 153 'app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java',
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 ['OS=="android" and build_with_chromium==0', { 778 ['OS=="android" and build_with_chromium==0', {
778 'sources': [ 779 'sources': [
779 'app/webrtc/androidvideocapturer.h', 780 'app/webrtc/androidvideocapturer.h',
780 'app/webrtc/androidvideocapturer.cc', 781 'app/webrtc/androidvideocapturer.cc',
781 ], 782 ],
782 }], 783 }],
783 ], 784 ],
784 }, # target libjingle_peerconnection 785 }, # target libjingle_peerconnection
785 ], 786 ],
786 } 787 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698