Index: webrtc/sdk/android/src/jni/video_renderer_jni.cc |
diff --git a/webrtc/sdk/android/src/jni/video_renderer_jni.cc b/webrtc/sdk/android/src/jni/video_renderer_jni.cc |
index 7156fceee8a3bb54528d4eeca75341fae631fc3c..07244bc6a864666a92404e44b025c9857223e44a 100644 |
--- a/webrtc/sdk/android/src/jni/video_renderer_jni.cc |
+++ b/webrtc/sdk/android/src/jni/video_renderer_jni.cc |
@@ -16,12 +16,12 @@ |
#include "webrtc/sdk/android/src/jni/jni_helpers.h" |
#include "webrtc/sdk/android/src/jni/native_handle_impl.h" |
-namespace webrtc_jni { |
+namespace webrtc { |
+namespace jni { |
// Wrapper dispatching rtc::VideoSinkInterface to a Java VideoRenderer |
// instance. |
-class JavaVideoRendererWrapper |
- : public rtc::VideoSinkInterface<webrtc::VideoFrame> { |
+class JavaVideoRendererWrapper : public rtc::VideoSinkInterface<VideoFrame> { |
public: |
JavaVideoRendererWrapper(JNIEnv* jni, jobject j_callbacks) |
: j_callbacks_(jni, j_callbacks), |
@@ -44,12 +44,12 @@ class JavaVideoRendererWrapper |
virtual ~JavaVideoRendererWrapper() {} |
- void OnFrame(const webrtc::VideoFrame& video_frame) override { |
+ void OnFrame(const VideoFrame& video_frame) override { |
ScopedLocalRefFrame local_ref_frame(jni()); |
jobject j_frame; |
if (video_frame.video_frame_buffer()->type() == |
- webrtc::VideoFrameBuffer::Type::kNative) { |
+ VideoFrameBuffer::Type::kNative) { |
AndroidVideoFrameBuffer* android_buffer = |
static_cast<AndroidVideoFrameBuffer*>( |
video_frame.video_frame_buffer().get()); |
@@ -77,15 +77,15 @@ class JavaVideoRendererWrapper |
// Make a shallow copy of |frame| to be used with Java. The callee has |
// ownership of the frame, and the frame should be released with |
// VideoRenderer.releaseNativeFrame(). |
- static jlong javaShallowCopy(const webrtc::VideoFrame* frame) { |
- return jlongFromPointer(new webrtc::VideoFrame(*frame)); |
+ static jlong javaShallowCopy(const VideoFrame* frame) { |
+ return jlongFromPointer(new VideoFrame(*frame)); |
} |
// Return a VideoRenderer.I420Frame referring to the data in |frame|. |
- jobject ToJavaI420Frame(const webrtc::VideoFrame* frame) { |
+ jobject ToJavaI420Frame(const VideoFrame* frame) { |
jintArray strides = jni()->NewIntArray(3); |
jint* strides_array = jni()->GetIntArrayElements(strides, NULL); |
- rtc::scoped_refptr<webrtc::I420BufferInterface> i420_buffer = |
+ rtc::scoped_refptr<I420BufferInterface> i420_buffer = |
frame->video_frame_buffer()->ToI420(); |
strides_array[0] = i420_buffer->StrideY(); |
strides_array[1] = i420_buffer->StrideU(); |
@@ -113,7 +113,7 @@ class JavaVideoRendererWrapper |
} |
// Return a VideoRenderer.I420Frame referring texture object in |frame|. |
- jobject ToJavaTextureFrame(const webrtc::VideoFrame* frame) { |
+ jobject ToJavaTextureFrame(const VideoFrame* frame) { |
NativeHandleImpl handle = |
static_cast<AndroidTextureBuffer*>(frame->video_frame_buffer().get()) |
->native_handle_impl(); |
@@ -148,7 +148,7 @@ JNI_FUNCTION_DECLARATION(void, |
JNIEnv* jni, |
jclass, |
jlong j_frame_ptr) { |
- delete reinterpret_cast<const webrtc::VideoFrame*>(j_frame_ptr); |
+ delete reinterpret_cast<const VideoFrame*>(j_frame_ptr); |
} |
JNI_FUNCTION_DECLARATION(jlong, |
@@ -194,4 +194,5 @@ JNI_FUNCTION_DECLARATION(void, |
} |
} |
-} // namespace webrtc_jni |
+} // namespace jni |
+} // namespace webrtc |