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

Side by Side Diff: talk/app/webrtc/java/jni/native_handle_impl.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 2015 Google Inc. 3 * Copyright 2015 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 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/java/jni/native_handle_impl.h" 28 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
29 29
30 #include "talk/app/webrtc/java/jni/jni_helpers.h" 30 #include "talk/app/webrtc/java/jni/jni_helpers.h"
31 #include "webrtc/base/bind.h" 31 #include "webrtc/base/bind.h"
32 #include "webrtc/base/checks.h" 32 #include "webrtc/base/checks.h"
33 #include "webrtc/base/keep_ref_until_done.h" 33 #include "webrtc/base/keep_ref_until_done.h"
34 #include "webrtc/base/logging.h"
34 #include "webrtc/base/scoped_ptr.h" 35 #include "webrtc/base/scoped_ptr.h"
35 #include "webrtc/base/scoped_ref_ptr.h" 36 #include "webrtc/base/scoped_ref_ptr.h"
36 #include "webrtc/base/logging.h"
37 37
38 using webrtc::NativeHandleBuffer; 38 using webrtc::NativeHandleBuffer;
39 39
40 namespace { 40 namespace {
41 41
42 void RotateMatrix(float a[16], webrtc::VideoRotation rotation) { 42 void RotateMatrix(float a[16], webrtc::VideoRotation rotation) {
43 // Texture coordinates are in the range 0 to 1. The transformation of the last 43 // Texture coordinates are in the range 0 to 1. The transformation of the last
44 // row in each rotation matrix is needed for proper translation, e.g, to 44 // row in each rotation matrix is needed for proper translation, e.g, to
45 // mirror x, we don't replace x by -x, but by 1-x. 45 // mirror x, we don't replace x by -x, but by 1-x.
46 switch (rotation) { 46 switch (rotation) {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 rtc::scoped_refptr<AndroidTextureBuffer> buffer( 177 rtc::scoped_refptr<AndroidTextureBuffer> buffer(
178 new rtc::RefCountedObject<AndroidTextureBuffer>( 178 new rtc::RefCountedObject<AndroidTextureBuffer>(
179 rotated_width, rotated_height, native_handle_, 179 rotated_width, rotated_height, native_handle_,
180 surface_texture_helper_, rtc::KeepRefUntilDone(this))); 180 surface_texture_helper_, rtc::KeepRefUntilDone(this)));
181 181
182 RotateMatrix(buffer->native_handle_.sampling_matrix, rotation); 182 RotateMatrix(buffer->native_handle_.sampling_matrix, rotation);
183 return buffer; 183 return buffer;
184 } 184 }
185 185
186 } // namespace webrtc_jni 186 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/classreferenceholder.h ('k') | talk/app/webrtc/java/jni/peerconnection_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698