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

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

Issue 2547483003: Move /webrtc/api/android files to /webrtc/sdk/android (Closed)
Patch Set: Move to api folder under Android instead of src Created 4 years 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_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ 11 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
12 #define WEBRTC_API_JAVA_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/base/thread.h"
18 #include "webrtc/api/android/jni/classreferenceholder.h" 18 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
19 #include "webrtc/api/android/jni/jni_helpers.h" 19 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/thread.h" 21 #include "webrtc/base/thread.h"
22 22
23 namespace webrtc_jni { 23 namespace webrtc_jni {
24 24
25 // Uncomment this define to enable verbose logging for every encoded/decoded 25 // Uncomment this define to enable verbose logging for every encoded/decoded
26 // video frame. 26 // video frame.
27 //#define TRACK_BUFFER_TIMING 27 //#define TRACK_BUFFER_TIMING
28 28
29 #define TAG_COMMON "MediaCodecVideo" 29 #define TAG_COMMON "MediaCodecVideo"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 LOG_TAG(rtc::LS_ERROR, TAG_COMMON) << "Java JNI exception."; 87 LOG_TAG(rtc::LS_ERROR, TAG_COMMON) << "Java JNI exception.";
88 jni->ExceptionDescribe(); 88 jni->ExceptionDescribe();
89 jni->ExceptionClear(); 89 jni->ExceptionClear();
90 return true; 90 return true;
91 } 91 }
92 return false; 92 return false;
93 } 93 }
94 94
95 } // namespace webrtc_jni 95 } // namespace webrtc_jni
96 96
97 #endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ 97 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidhistogram_jni.cc ('k') | webrtc/sdk/android/src/jni/androidmediadecoder_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698