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

Side by Side Diff: webrtc/sdk/android/src/jni/androidmediaencoder_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 // NOTICE: androidmediaencoder_jni.h must be included before 11 // NOTICE: androidmediaencoder_jni.h must be included before
12 // androidmediacodeccommon.h to avoid build errors. 12 // androidmediacodeccommon.h to avoid build errors.
13 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" 13 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
14 14
15 #include <algorithm> 15 #include <algorithm>
16 #include <list> 16 #include <list>
17 #include <memory> 17 #include <memory>
18 #include <string> 18 #include <string>
19 #include <utility> 19 #include <utility>
20 20
21 #include "third_party/libyuv/include/libyuv/convert.h" 21 #include "third_party/libyuv/include/libyuv/convert.h"
22 #include "third_party/libyuv/include/libyuv/convert_from.h" 22 #include "third_party/libyuv/include/libyuv/convert_from.h"
23 #include "third_party/libyuv/include/libyuv/video_common.h" 23 #include "third_party/libyuv/include/libyuv/video_common.h"
24 #include "webrtc/api/video_codecs/video_encoder.h" 24 #include "webrtc/api/video_codecs/video_encoder.h"
25 #include "webrtc/base/bind.h"
26 #include "webrtc/base/checks.h"
27 #include "webrtc/base/logging.h"
28 #include "webrtc/base/random.h"
29 #include "webrtc/base/sequenced_task_checker.h"
30 #include "webrtc/base/task_queue.h"
31 #include "webrtc/base/thread.h"
32 #include "webrtc/base/timeutils.h"
33 #include "webrtc/base/weak_ptr.h"
34 #include "webrtc/common_types.h" 25 #include "webrtc/common_types.h"
35 #include "webrtc/common_video/h264/h264_bitstream_parser.h" 26 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
36 #include "webrtc/common_video/h264/h264_common.h" 27 #include "webrtc/common_video/h264/h264_common.h"
37 #include "webrtc/common_video/h264/profile_level_id.h" 28 #include "webrtc/common_video/h264/profile_level_id.h"
38 #include "webrtc/media/engine/internalencoderfactory.h" 29 #include "webrtc/media/engine/internalencoderfactory.h"
39 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 30 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
40 #include "webrtc/modules/video_coding/utility/quality_scaler.h" 31 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
41 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h" 32 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
42 #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h" 33 #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
34 #include "webrtc/rtc_base/bind.h"
35 #include "webrtc/rtc_base/checks.h"
36 #include "webrtc/rtc_base/logging.h"
37 #include "webrtc/rtc_base/random.h"
38 #include "webrtc/rtc_base/sequenced_task_checker.h"
39 #include "webrtc/rtc_base/task_queue.h"
40 #include "webrtc/rtc_base/thread.h"
41 #include "webrtc/rtc_base/timeutils.h"
42 #include "webrtc/rtc_base/weak_ptr.h"
43 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h" 43 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
44 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 44 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
45 #include "webrtc/sdk/android/src/jni/native_handle_impl.h" 45 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
46 #include "webrtc/system_wrappers/include/field_trial.h" 46 #include "webrtc/system_wrappers/include/field_trial.h"
47 47
48 using rtc::Bind; 48 using rtc::Bind;
49 using rtc::Thread; 49 using rtc::Thread;
50 using rtc::ThreadManager; 50 using rtc::ThreadManager;
51 51
52 using webrtc::CodecSpecificInfo; 52 using webrtc::CodecSpecificInfo;
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 } 1366 }
1367 } 1367 }
1368 1368
1369 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( 1369 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
1370 webrtc::VideoEncoder* encoder) { 1370 webrtc::VideoEncoder* encoder) {
1371 ALOGD << "Destroy video encoder."; 1371 ALOGD << "Destroy video encoder.";
1372 delete encoder; 1372 delete encoder;
1373 } 1373 }
1374 1374
1375 } // namespace webrtc_jni 1375 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc ('k') | webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698