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

Side by Side Diff: webrtc/sdk/android/src/jni/videodecoderfactorywrapper.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/videodecoderfactorywrapper.h" 11 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
12 12
13 #include "webrtc/api/video_codecs/video_decoder.h" 13 #include "webrtc/api/video_codecs/video_decoder.h"
14 #include "webrtc/base/logging.h"
15 #include "webrtc/common_types.h" 14 #include "webrtc/common_types.h"
15 #include "webrtc/rtc_base/logging.h"
16 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h" 16 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
17 17
18 namespace webrtc_jni { 18 namespace webrtc_jni {
19 19
20 VideoDecoderFactoryWrapper::VideoDecoderFactoryWrapper(JNIEnv* jni, 20 VideoDecoderFactoryWrapper::VideoDecoderFactoryWrapper(JNIEnv* jni,
21 jobject decoder_factory) 21 jobject decoder_factory)
22 : decoder_factory_(jni, decoder_factory) { 22 : decoder_factory_(jni, decoder_factory) {
23 jclass decoder_factory_class = jni->GetObjectClass(*decoder_factory_); 23 jclass decoder_factory_class = jni->GetObjectClass(*decoder_factory_);
24 create_decoder_method_ = 24 create_decoder_method_ =
25 jni->GetMethodID(decoder_factory_class, "createDecoder", 25 jni->GetMethodID(decoder_factory_class, "createDecoder",
(...skipping 12 matching lines...) Expand all
38 jni->CallObjectMethod(*decoder_factory_, create_decoder_method_, name); 38 jni->CallObjectMethod(*decoder_factory_, create_decoder_method_, name);
39 return decoder != nullptr ? new VideoDecoderWrapper(jni, decoder) : nullptr; 39 return decoder != nullptr ? new VideoDecoderWrapper(jni, decoder) : nullptr;
40 } 40 }
41 41
42 void VideoDecoderFactoryWrapper::DestroyVideoDecoder( 42 void VideoDecoderFactoryWrapper::DestroyVideoDecoder(
43 webrtc::VideoDecoder* decoder) { 43 webrtc::VideoDecoder* decoder) {
44 delete decoder; 44 delete decoder;
45 } 45 }
46 46
47 } // namespace webrtc_jni 47 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/video_jni.cc ('k') | webrtc/sdk/android/src/jni/videodecoderwrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698