| OLD | NEW |
| 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 <memory> | 12 #include <memory> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 // NOTICE: androidmediadecoder_jni.h must be included before | 15 // NOTICE: androidmediadecoder_jni.h must be included before |
| 16 // androidmediacodeccommon.h to avoid build errors. | 16 // androidmediacodeccommon.h to avoid build errors. |
| 17 #include "webrtc/api/android/jni/androidmediadecoder_jni.h" | 17 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" |
| 18 | 18 |
| 19 #include "third_party/libyuv/include/libyuv/convert.h" | 19 #include "third_party/libyuv/include/libyuv/convert.h" |
| 20 #include "third_party/libyuv/include/libyuv/convert_from.h" | 20 #include "third_party/libyuv/include/libyuv/convert_from.h" |
| 21 #include "third_party/libyuv/include/libyuv/video_common.h" | 21 #include "third_party/libyuv/include/libyuv/video_common.h" |
| 22 #include "webrtc/api/android/jni/androidmediacodeccommon.h" | 22 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" |
| 23 #include "webrtc/api/android/jni/classreferenceholder.h" | 23 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" |
| 24 #include "webrtc/api/android/jni/native_handle_impl.h" | 24 #include "webrtc/sdk/android/src/jni/native_handle_impl.h" |
| 25 #include "webrtc/api/android/jni/surfacetexturehelper_jni.h" | 25 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" |
| 26 #include "webrtc/base/bind.h" | 26 #include "webrtc/base/bind.h" |
| 27 #include "webrtc/base/checks.h" | 27 #include "webrtc/base/checks.h" |
| 28 #include "webrtc/base/logging.h" | 28 #include "webrtc/base/logging.h" |
| 29 #include "webrtc/base/scoped_ref_ptr.h" | 29 #include "webrtc/base/scoped_ref_ptr.h" |
| 30 #include "webrtc/base/thread.h" | 30 #include "webrtc/base/thread.h" |
| 31 #include "webrtc/base/timeutils.h" | 31 #include "webrtc/base/timeutils.h" |
| 32 #include "webrtc/common_video/include/i420_buffer_pool.h" | 32 #include "webrtc/common_video/include/i420_buffer_pool.h" |
| 33 #include "webrtc/modules/video_coding/include/video_codec_interface.h" | 33 #include "webrtc/modules/video_coding/include/video_codec_interface.h" |
| 34 #include "webrtc/system_wrappers/include/logcat_trace_context.h" | 34 #include "webrtc/system_wrappers/include/logcat_trace_context.h" |
| 35 | 35 |
| (...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 webrtc::VideoDecoder* decoder) { | 980 webrtc::VideoDecoder* decoder) { |
| 981 ALOGD << "Destroy video decoder."; | 981 ALOGD << "Destroy video decoder."; |
| 982 delete decoder; | 982 delete decoder; |
| 983 } | 983 } |
| 984 | 984 |
| 985 const char* MediaCodecVideoDecoder::ImplementationName() const { | 985 const char* MediaCodecVideoDecoder::ImplementationName() const { |
| 986 return "MediaCodec"; | 986 return "MediaCodec"; |
| 987 } | 987 } |
| 988 | 988 |
| 989 } // namespace webrtc_jni | 989 } // namespace webrtc_jni |
| OLD | NEW |