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

Side by Side Diff: webrtc/sdk/android/src/jni/video_jni.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <jni.h> 11 #include <jni.h>
12 12
13 #include "webrtc/api/videosourceproxy.h" 13 #include "webrtc/api/videosourceproxy.h"
14 #include "webrtc/base/logging.h"
15 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 14 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
16 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 15 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
16 #include "webrtc/rtc_base/logging.h"
17 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" 17 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
18 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" 18 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
19 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" 19 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
20 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 20 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
21 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h" 21 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
22 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" 22 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
23 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h" 23 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
24 24
25 namespace webrtc_jni { 25 namespace webrtc_jni {
26 26
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 encoder_factory->SetEGLContext(jni, local_egl_context); 109 encoder_factory->SetEGLContext(jni, local_egl_context);
110 } 110 }
111 111
112 if (media_codec_decoder_factory) { 112 if (media_codec_decoder_factory) {
113 LOG(LS_INFO) << "Set EGL context for HW decoding."; 113 LOG(LS_INFO) << "Set EGL context for HW decoding.";
114 media_codec_decoder_factory->SetEGLContext(jni, remote_egl_context); 114 media_codec_decoder_factory->SetEGLContext(jni, remote_egl_context);
115 } 115 }
116 } 116 }
117 117
118 } // namespace webrtc_jni 118 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/video_jni.h ('k') | webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698