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

Side by Side Diff: talk/app/webrtc/java/jni/androidmediacodeccommon.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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 13 matching lines...) Expand all
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 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ 29 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
30 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ 30 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
31 31
32 #include <android/log.h> 32 #include <android/log.h>
33 #include "talk/app/webrtc/java/jni/classreferenceholder.h" 33 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
34 #include "webrtc/base/logging.h"
34 #include "webrtc/base/thread.h" 35 #include "webrtc/base/thread.h"
35 #include "webrtc/base/logging.h"
36 #include "webrtc/system_wrappers/include/tick_util.h" 36 #include "webrtc/system_wrappers/include/tick_util.h"
37 37
38 namespace webrtc_jni { 38 namespace webrtc_jni {
39 39
40 // Uncomment this define to enable verbose logging for every encoded/decoded 40 // Uncomment this define to enable verbose logging for every encoded/decoded
41 // video frame. 41 // video frame.
42 //#define TRACK_BUFFER_TIMING 42 //#define TRACK_BUFFER_TIMING
43 43
44 #define TAG_COMMON "MediaCodecVideo" 44 #define TAG_COMMON "MediaCodecVideo"
45 45
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 jni->ExceptionDescribe(); 100 jni->ExceptionDescribe();
101 jni->ExceptionClear(); 101 jni->ExceptionClear();
102 return true; 102 return true;
103 } 103 }
104 return false; 104 return false;
105 } 105 }
106 106
107 } // namespace webrtc_jni 107 } // namespace webrtc_jni
108 108
109 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ 109 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698