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

Side by Side Diff: webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

Issue 2989323002: Revert of Break peerconnection_jni.cc into multiple files, in "pc" directory. (Closed)
Patch Set: Created 3 years, 4 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
(...skipping 24 matching lines...) Expand all
35 #include "webrtc/rtc_base/checks.h" 35 #include "webrtc/rtc_base/checks.h"
36 #include "webrtc/rtc_base/logging.h" 36 #include "webrtc/rtc_base/logging.h"
37 #include "webrtc/rtc_base/random.h" 37 #include "webrtc/rtc_base/random.h"
38 #include "webrtc/rtc_base/sequenced_task_checker.h" 38 #include "webrtc/rtc_base/sequenced_task_checker.h"
39 #include "webrtc/rtc_base/task_queue.h" 39 #include "webrtc/rtc_base/task_queue.h"
40 #include "webrtc/rtc_base/thread.h" 40 #include "webrtc/rtc_base/thread.h"
41 #include "webrtc/rtc_base/timeutils.h" 41 #include "webrtc/rtc_base/timeutils.h"
42 #include "webrtc/rtc_base/weak_ptr.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/jni_helpers.h"
46 #include "webrtc/sdk/android/src/jni/native_handle_impl.h" 45 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
47 #include "webrtc/system_wrappers/include/field_trial.h" 46 #include "webrtc/system_wrappers/include/field_trial.h"
48 47
49 using rtc::Bind; 48 using rtc::Bind;
50 using rtc::Thread; 49 using rtc::Thread;
51 using rtc::ThreadManager; 50 using rtc::ThreadManager;
52 51
53 using webrtc::CodecSpecificInfo; 52 using webrtc::CodecSpecificInfo;
54 using webrtc::EncodedImage; 53 using webrtc::EncodedImage;
55 using webrtc::VideoFrame; 54 using webrtc::VideoFrame;
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 } 1366 }
1368 } 1367 }
1369 1368
1370 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( 1369 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
1371 webrtc::VideoEncoder* encoder) { 1370 webrtc::VideoEncoder* encoder) {
1372 ALOGD << "Destroy video encoder."; 1371 ALOGD << "Destroy video encoder.";
1373 delete encoder; 1372 delete encoder;
1374 } 1373 }
1375 1374
1376 } // namespace webrtc_jni 1375 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidmediacodeccommon.h ('k') | webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698