talk/app/webrtc/java/jni/peerconnection_jni.cc - Issue 1587193006: Move talk/media to webrtc/media

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: talk/app/webrtc/java/jni/peerconnection_jni.cc

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

Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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: talk/app/webrtc/java/jni/peerconnection_jni.cc

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

index 6059623daa753293b21477e20202c927ddbb084d..500768b5ebbee26f6107c325d8c58a828cba1309 100644

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

+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc

@@ -59,20 +59,15 @@

#include <limits>

#include <utility>

+#include "talk/app/webrtc/dtlsidentitystore.h"

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

#include "talk/app/webrtc/java/jni/jni_helpers.h"

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

-#include "talk/app/webrtc/dtlsidentitystore.h"

#include "talk/app/webrtc/mediaconstraintsinterface.h"

#include "talk/app/webrtc/peerconnectioninterface.h"

#include "talk/app/webrtc/rtpreceiverinterface.h"

#include "talk/app/webrtc/rtpsenderinterface.h"

#include "talk/app/webrtc/videosourceinterface.h"

-#include "talk/media/base/videocapturer.h"

-#include "talk/media/base/videorenderer.h"

-#include "talk/media/devices/videorendererfactory.h"

-#include "talk/media/webrtc/webrtcvideodecoderfactory.h"

-#include "talk/media/webrtc/webrtcvideoencoderfactory.h"

#include "webrtc/base/bind.h"

#include "webrtc/base/checks.h"

#include "webrtc/base/event_tracer.h"

@@ -82,6 +77,11 @@

#include "webrtc/base/networkmonitor.h"

#include "webrtc/base/ssladapter.h"

#include "webrtc/base/stringutils.h"

+#include "webrtc/media/base/videocapturer.h"

+#include "webrtc/media/base/videorenderer.h"

+#include "webrtc/media/devices/videorendererfactory.h"

+#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"

+#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"

#include "webrtc/system_wrappers/include/field_trial_default.h"

#include "webrtc/system_wrappers/include/trace.h"

#include "webrtc/voice_engine/include/voe_base.h"

@@ -90,8 +90,8 @@

#include "talk/app/webrtc/androidvideocapturer.h"

#include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"

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

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

#include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h"

+#include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h"

#include "webrtc/modules/video_render/video_render_internal.h"

#include "webrtc/system_wrappers/include/logcat_trace_context.h"

using webrtc::LogcatTraceContext;

« no previous file with comments | « talk/app/webrtc/java/jni/native_handle_impl.cc ('k') | talk/app/webrtc/jsepicecandidate.h » ('j') | talk/build/common.gypi » ('J')