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

Unified Diff: webrtc/sdk/android/src/jni/androidvideotracksource.h

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/android/src/jni/androidvideotracksource.h
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.h b/webrtc/sdk/android/src/jni/androidvideotracksource.h
index 92bc71b24a1b33edcdb7e4a879464b55d6f47751..3608d0274705dd726a7762209fa4dd0ec7cb0238 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource.h
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource.h
@@ -24,6 +24,7 @@
#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
namespace webrtc {
+namespace jni {
class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
public:
@@ -59,7 +60,7 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
int height,
VideoRotation rotation,
int64_t timestamp_ns,
- const webrtc_jni::NativeHandleImpl& handle);
+ const NativeHandleImpl& handle);
void OnFrameCaptured(JNIEnv* jni,
int width,
@@ -70,8 +71,7 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
void OnOutputFormatRequest(int width, int height, int fps);
- rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper>
- surface_texture_helper() {
+ rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper() {
return surface_texture_helper_;
}
@@ -83,13 +83,14 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
rtc::TimestampAligner timestamp_aligner_;
NV12ToI420Scaler nv12toi420_scaler_;
I420BufferPool buffer_pool_;
- rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_;
- webrtc_jni::AndroidVideoBufferFactory video_buffer_factory_;
+ rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper_;
+ AndroidVideoBufferFactory video_buffer_factory_;
const bool is_screencast_;
jmethodID j_crop_and_scale_id_;
};
+} // namespace jni
} // namespace webrtc
#endif // WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
« no previous file with comments | « webrtc/sdk/android/src/jni/androidmetrics_jni.cc ('k') | webrtc/sdk/android/src/jni/androidvideotracksource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698