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

Side by Side Diff: talk/app/webrtc/java/jni/androidmediaencoder_jni.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
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 "talk/app/webrtc/java/jni/androidmediaencoder_jni.h" 29 #include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h"
30 // NOTICE: androidmediaencoder_jni.h must be included before
31 // androidmediacodeccommon.h to avoid build errors.
32 #include "talk/app/webrtc/java/jni/androidmediacodeccommon.h"
30 #include "talk/app/webrtc/java/jni/classreferenceholder.h" 33 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
31 #include "talk/app/webrtc/java/jni/androidmediacodeccommon.h"
32 #include "talk/app/webrtc/java/jni/native_handle_impl.h" 34 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
35 #include "third_party/libyuv/include/libyuv/convert.h"
36 #include "third_party/libyuv/include/libyuv/convert_from.h"
37 #include "third_party/libyuv/include/libyuv/video_common.h"
33 #include "webrtc/base/bind.h" 38 #include "webrtc/base/bind.h"
34 #include "webrtc/base/checks.h" 39 #include "webrtc/base/checks.h"
35 #include "webrtc/base/logging.h" 40 #include "webrtc/base/logging.h"
36 #include "webrtc/base/thread.h" 41 #include "webrtc/base/thread.h"
37 #include "webrtc/base/thread_checker.h" 42 #include "webrtc/base/thread_checker.h"
38 #include "webrtc/common_types.h" 43 #include "webrtc/common_types.h"
39 #include "webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.h" 44 #include "webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.h"
40 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 45 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
41 #include "webrtc/modules/video_coding/utility/quality_scaler.h" 46 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
42 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" 47 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
43 #include "webrtc/system_wrappers/include/field_trial.h" 48 #include "webrtc/system_wrappers/include/field_trial.h"
44 #include "webrtc/system_wrappers/include/logcat_trace_context.h" 49 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
45 #include "third_party/libyuv/include/libyuv/convert.h"
46 #include "third_party/libyuv/include/libyuv/convert_from.h"
47 #include "third_party/libyuv/include/libyuv/video_common.h"
48 50
49 using rtc::Bind; 51 using rtc::Bind;
50 using rtc::Thread; 52 using rtc::Thread;
51 using rtc::ThreadManager; 53 using rtc::ThreadManager;
52 using rtc::scoped_ptr; 54 using rtc::scoped_ptr;
53 55
54 using webrtc::CodecSpecificInfo; 56 using webrtc::CodecSpecificInfo;
55 using webrtc::EncodedImage; 57 using webrtc::EncodedImage;
56 using webrtc::VideoFrame; 58 using webrtc::VideoFrame;
57 using webrtc::RTPFragmentationHeader; 59 using webrtc::RTPFragmentationHeader;
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1253 } 1255 }
1254 1256
1255 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( 1257 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
1256 webrtc::VideoEncoder* encoder) { 1258 webrtc::VideoEncoder* encoder) {
1257 ALOGD << "Destroy video encoder."; 1259 ALOGD << "Destroy video encoder.";
1258 delete encoder; 1260 delete encoder;
1259 } 1261 }
1260 1262
1261 } // namespace webrtc_jni 1263 } // namespace webrtc_jni
1262 1264
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.h ('k') | talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698