webrtc/api/java/jni/androidmediaencoder_jni.cc - Issue 1610243002: Move talk/app/webrtc to webrtc/api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/jni/androidmediaencoder_jni.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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:

Index: webrtc/api/java/jni/androidmediaencoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc

similarity index 99%

rename from talk/app/webrtc/java/jni/androidmediaencoder_jni.cc

rename to webrtc/api/java/jni/androidmediaencoder_jni.cc

index aade95ba46a4eaad5ad409455accbd7de476dee2..a06b026c846856fa00c5c04563f3c6e18cc4f257 100644

--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc

+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc

@@ -26,15 +26,16 @@

-#include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h"

// NOTICE: androidmediaencoder_jni.h must be included before

// androidmediacodeccommon.h to avoid build errors.

-#include "talk/app/webrtc/java/jni/androidmediacodeccommon.h"

-#include "talk/app/webrtc/java/jni/classreferenceholder.h"

-#include "talk/app/webrtc/java/jni/native_handle_impl.h"

+#include "webrtc/api/java/jni/androidmediaencoder_jni.h"

#include "third_party/libyuv/include/libyuv/convert.h"

#include "third_party/libyuv/include/libyuv/convert_from.h"

#include "third_party/libyuv/include/libyuv/video_common.h"

+#include "webrtc/api/java/jni/androidmediacodeccommon.h"

+#include "webrtc/api/java/jni/classreferenceholder.h"

+#include "webrtc/api/java/jni/native_handle_impl.h"

#include "webrtc/base/bind.h"

#include "webrtc/base/checks.h"

#include "webrtc/base/logging.h"