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

Side by Side Diff: webrtc/sdk/android/src/jni/androidmediadecoder_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 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 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 <algorithm> 11 #include <algorithm>
12 #include <deque> 12 #include <deque>
13 #include <memory> 13 #include <memory>
14 #include <vector> 14 #include <vector>
15 15
16 // NOTICE: androidmediadecoder_jni.h must be included before 16 // NOTICE: androidmediadecoder_jni.h must be included before
17 // androidmediacodeccommon.h to avoid build errors. 17 // androidmediacodeccommon.h to avoid build errors.
18 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" 18 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
19 19
20 #include "third_party/libyuv/include/libyuv/convert.h" 20 #include "third_party/libyuv/include/libyuv/convert.h"
21 #include "third_party/libyuv/include/libyuv/convert_from.h" 21 #include "third_party/libyuv/include/libyuv/convert_from.h"
22 #include "third_party/libyuv/include/libyuv/video_common.h" 22 #include "third_party/libyuv/include/libyuv/video_common.h"
23 #include "webrtc/base/bind.h"
24 #include "webrtc/base/checks.h"
25 #include "webrtc/base/logging.h"
26 #include "webrtc/base/scoped_ref_ptr.h"
27 #include "webrtc/base/thread.h"
28 #include "webrtc/base/timeutils.h"
29 #include "webrtc/common_video/h264/h264_bitstream_parser.h" 23 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
30 #include "webrtc/common_video/include/i420_buffer_pool.h" 24 #include "webrtc/common_video/include/i420_buffer_pool.h"
31 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 25 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
32 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" 26 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
27 #include "webrtc/rtc_base/bind.h"
28 #include "webrtc/rtc_base/checks.h"
29 #include "webrtc/rtc_base/logging.h"
30 #include "webrtc/rtc_base/scoped_ref_ptr.h"
31 #include "webrtc/rtc_base/thread.h"
32 #include "webrtc/rtc_base/timeutils.h"
33 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" 33 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
34 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 34 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
35 #include "webrtc/sdk/android/src/jni/native_handle_impl.h" 35 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
36 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" 36 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
37 37
38 using rtc::Bind; 38 using rtc::Bind;
39 using rtc::Thread; 39 using rtc::Thread;
40 using rtc::ThreadManager; 40 using rtc::ThreadManager;
41 41
42 using webrtc::CodecSpecificInfo; 42 using webrtc::CodecSpecificInfo;
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 webrtc::VideoDecoder* decoder) { 1025 webrtc::VideoDecoder* decoder) {
1026 ALOGD << "Destroy video decoder."; 1026 ALOGD << "Destroy video decoder.";
1027 delete decoder; 1027 delete decoder;
1028 } 1028 }
1029 1029
1030 const char* MediaCodecVideoDecoder::ImplementationName() const { 1030 const char* MediaCodecVideoDecoder::ImplementationName() const {
1031 return "MediaCodec"; 1031 return "MediaCodec";
1032 } 1032 }
1033 1033
1034 } // namespace webrtc_jni 1034 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidmediacodeccommon.h ('k') | webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698