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

Side by Side Diff: webrtc/sdk/android/src/jni/androidmediacodeccommon.h

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 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ 11 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
12 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ 12 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
13 13
14 #include <android/log.h> 14 #include <android/log.h>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/base/thread.h" 17 #include "webrtc/rtc_base/logging.h"
18 #include "webrtc/rtc_base/thread.h"
18 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 19 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
19 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 20 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/thread.h"
22 21
23 namespace webrtc_jni { 22 namespace webrtc_jni {
24 23
25 // Uncomment this define to enable verbose logging for every encoded/decoded 24 // Uncomment this define to enable verbose logging for every encoded/decoded
26 // video frame. 25 // video frame.
27 //#define TRACK_BUFFER_TIMING 26 //#define TRACK_BUFFER_TIMING
28 27
29 #define TAG_COMMON "MediaCodecVideo" 28 #define TAG_COMMON "MediaCodecVideo"
30 29
31 // Color formats supported by encoder or decoder - should include all 30 // Color formats supported by encoder or decoder - should include all
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 jni->ExceptionDescribe(); 87 jni->ExceptionDescribe();
89 jni->ExceptionClear(); 88 jni->ExceptionClear();
90 return true; 89 return true;
91 } 90 }
92 return false; 91 return false;
93 } 92 }
94 93
95 } // namespace webrtc_jni 94 } // namespace webrtc_jni
96 95
97 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_ 96 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
OLDNEW
« no previous file with comments | « webrtc/rtc_tools/simple_command_line_parser.h ('k') | webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698