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

Side by Side Diff: webrtc/api/java/jni/androidmediadecoder_jni.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 11 matching lines...) Expand all
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28 28
29 #include <algorithm> 29 #include <algorithm>
30 #include <vector> 30 #include <vector>
31 31
32 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"
33 // NOTICE: androidmediadecoder_jni.h must be included before 32 // NOTICE: androidmediadecoder_jni.h must be included before
34 // androidmediacodeccommon.h to avoid build errors. 33 // androidmediacodeccommon.h to avoid build errors.
35 #include "talk/app/webrtc/java/jni/androidmediacodeccommon.h" 34 #include "webrtc/api/java/jni/androidmediadecoder_jni.h"
36 #include "talk/app/webrtc/java/jni/classreferenceholder.h" 35
37 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
38 #include "talk/app/webrtc/java/jni/surfacetexturehelper_jni.h"
39 #include "third_party/libyuv/include/libyuv/convert.h" 36 #include "third_party/libyuv/include/libyuv/convert.h"
40 #include "third_party/libyuv/include/libyuv/convert_from.h" 37 #include "third_party/libyuv/include/libyuv/convert_from.h"
41 #include "third_party/libyuv/include/libyuv/video_common.h" 38 #include "third_party/libyuv/include/libyuv/video_common.h"
39 #include "webrtc/api/java/jni/androidmediacodeccommon.h"
40 #include "webrtc/api/java/jni/classreferenceholder.h"
41 #include "webrtc/api/java/jni/native_handle_impl.h"
42 #include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
42 #include "webrtc/base/bind.h" 43 #include "webrtc/base/bind.h"
43 #include "webrtc/base/checks.h" 44 #include "webrtc/base/checks.h"
44 #include "webrtc/base/logging.h" 45 #include "webrtc/base/logging.h"
45 #include "webrtc/base/scoped_ref_ptr.h" 46 #include "webrtc/base/scoped_ref_ptr.h"
46 #include "webrtc/base/thread.h" 47 #include "webrtc/base/thread.h"
47 #include "webrtc/base/timeutils.h" 48 #include "webrtc/base/timeutils.h"
48 #include "webrtc/common_video/include/i420_buffer_pool.h" 49 #include "webrtc/common_video/include/i420_buffer_pool.h"
49 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 50 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
50 #include "webrtc/system_wrappers/include/logcat_trace_context.h" 51 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
51 #include "webrtc/system_wrappers/include/tick_util.h" 52 #include "webrtc/system_wrappers/include/tick_util.h"
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 ALOGD << "Destroy video decoder."; 936 ALOGD << "Destroy video decoder.";
936 delete decoder; 937 delete decoder;
937 } 938 }
938 939
939 const char* MediaCodecVideoDecoder::ImplementationName() const { 940 const char* MediaCodecVideoDecoder::ImplementationName() const {
940 return "MediaCodec"; 941 return "MediaCodec";
941 } 942 }
942 943
943 } // namespace webrtc_jni 944 } // namespace webrtc_jni
944 945
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/androidmediadecoder_jni.h ('k') | webrtc/api/java/jni/androidmediaencoder_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698