webrtc/media/engine/webrtcvideoengine.cc - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

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/media/engine/webrtcvideoengine.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)

Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 6 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/media/engine/webrtcvideoengine.cc

diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc

index e592740bb9260b3c6594514930a1793dca4c96af..c5d49f50a3c2fb7445ff3a51ca564d1e727996a5 100644

--- a/webrtc/media/engine/webrtcvideoengine.cc

+++ b/webrtc/media/engine/webrtcvideoengine.cc

@@ -19,23 +19,23 @@

#include "webrtc/api/video/i420_buffer.h"

#include "webrtc/api/video_codecs/video_decoder.h"

#include "webrtc/api/video_codecs/video_encoder.h"

-#include "webrtc/base/copyonwritebuffer.h"

-#include "webrtc/base/logging.h"

-#include "webrtc/base/stringutils.h"

-#include "webrtc/base/timeutils.h"

-#include "webrtc/base/trace_event.h"

#include "webrtc/call/call.h"

#include "webrtc/common_video/h264/profile_level_id.h"

#include "webrtc/media/engine/constants.h"

-#include "webrtc/media/engine/internalencoderfactory.h"

#include "webrtc/media/engine/internaldecoderfactory.h"

+#include "webrtc/media/engine/internalencoderfactory.h"

#include "webrtc/media/engine/simulcast.h"

-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"

#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"

+#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"

#include "webrtc/media/engine/webrtcmediaengine.h"

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

#include "webrtc/media/engine/webrtcvoiceengine.h"

#include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"

+#include "webrtc/rtc_base/copyonwritebuffer.h"

+#include "webrtc/rtc_base/logging.h"

+#include "webrtc/rtc_base/stringutils.h"

+#include "webrtc/rtc_base/timeutils.h"

+#include "webrtc/rtc_base/trace_event.h"

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

using DegradationPreference = webrtc::VideoSendStream::DegradationPreference;