OLD | NEW |
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 18 matching lines...) Expand all Loading... |
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 <string> | 33 #include <string> |
34 | 34 |
35 #include "talk/app/webrtc/java/jni/classreferenceholder.h" | 35 #include "talk/app/webrtc/java/jni/classreferenceholder.h" |
36 #include "talk/app/webrtc/java/jni/jni_helpers.h" | 36 #include "talk/app/webrtc/java/jni/jni_helpers.h" |
37 #include "webrtc/base/thread.h" | 37 #include "webrtc/base/thread.h" |
38 #include "webrtc/base/logging.h" | 38 #include "webrtc/base/logging.h" |
| 39 #include "webrtc/base/thread.h" |
39 #include "webrtc/system_wrappers/include/tick_util.h" | 40 #include "webrtc/system_wrappers/include/tick_util.h" |
40 | 41 |
41 namespace webrtc_jni { | 42 namespace webrtc_jni { |
42 | 43 |
43 // Uncomment this define to enable verbose logging for every encoded/decoded | 44 // Uncomment this define to enable verbose logging for every encoded/decoded |
44 // video frame. | 45 // video frame. |
45 //#define TRACK_BUFFER_TIMING | 46 //#define TRACK_BUFFER_TIMING |
46 | 47 |
47 #define TAG_COMMON "MediaCodecVideo" | 48 #define TAG_COMMON "MediaCodecVideo" |
48 | 49 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 jni->ExceptionDescribe(); | 104 jni->ExceptionDescribe(); |
104 jni->ExceptionClear(); | 105 jni->ExceptionClear(); |
105 return true; | 106 return true; |
106 } | 107 } |
107 return false; | 108 return false; |
108 } | 109 } |
109 | 110 |
110 } // namespace webrtc_jni | 111 } // namespace webrtc_jni |
111 | 112 |
112 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ | 113 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_ |
OLD | NEW |