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

Side by Side Diff: webrtc/sdk/android/src/jni/videodecoderwrapper.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 "webrtc/sdk/android/src/jni/videodecoderwrapper.h" 11 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
12 12
13 #include "webrtc/api/video/video_frame.h" 13 #include "webrtc/api/video/video_frame.h"
14 #include "webrtc/base/logging.h"
15 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 14 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
15 #include "webrtc/rtc_base/logging.h"
16 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 16 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
17 17
18 namespace webrtc_jni { 18 namespace webrtc_jni {
19 19
20 VideoDecoderWrapper::VideoDecoderWrapper(JNIEnv* jni, jobject decoder) 20 VideoDecoderWrapper::VideoDecoderWrapper(JNIEnv* jni, jobject decoder)
21 : android_video_buffer_factory_(jni), 21 : android_video_buffer_factory_(jni),
22 decoder_(jni, decoder), 22 decoder_(jni, decoder),
23 encoded_image_class_(jni, FindClass(jni, "org/webrtc/EncodedImage")), 23 encoded_image_class_(jni, FindClass(jni, "org/webrtc/EncodedImage")),
24 frame_type_class_(jni, 24 frame_type_class_(jni,
25 FindClass(jni, "org/webrtc/EncodedImage$FrameType")), 25 FindClass(jni, "org/webrtc/EncodedImage$FrameType")),
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 jlong jnative_decoder, 248 jlong jnative_decoder,
249 jobject jframe, 249 jobject jframe,
250 jobject jdecode_time_ms, 250 jobject jdecode_time_ms,
251 jobject jqp) { 251 jobject jqp) {
252 VideoDecoderWrapper* native_decoder = 252 VideoDecoderWrapper* native_decoder =
253 reinterpret_cast<VideoDecoderWrapper*>(jnative_decoder); 253 reinterpret_cast<VideoDecoderWrapper*>(jnative_decoder);
254 native_decoder->OnDecodedFrame(jni, jframe, jdecode_time_ms, jqp); 254 native_decoder->OnDecodedFrame(jni, jframe, jdecode_time_ms, jqp);
255 } 255 }
256 256
257 } // namespace webrtc_jni 257 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc ('k') | webrtc/sdk/android/src/jni/videofilerenderer_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698