webrtc/video/video_send_stream.cc - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

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/video/video_send_stream.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Resolved merge conflict Created 5 years 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/video/video_send_stream.cc

diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc

index 08b0f1902a3406ea892335a051a35d6fa4afdb22..3bc026cd2c9c018e9c884d4859d6e9b5faaa6461 100644

--- a/webrtc/video/video_send_stream.cc

+++ b/webrtc/video/video_send_stream.cc

@@ -22,12 +22,12 @@

#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"

#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"

#include "webrtc/modules/pacing/packet_router.h"

-#include "webrtc/video/call_stats.h"

-#include "webrtc/video/encoder_state_feedback.h"

-#include "webrtc/video/payload_router.h"

#include "webrtc/video/video_capture_input.h"

-#include "webrtc/video/vie_channel.h"

-#include "webrtc/video/vie_encoder.h"

+#include "webrtc/video_engine/call_stats.h"

+#include "webrtc/video_engine/encoder_state_feedback.h"

+#include "webrtc/video_engine/payload_router.h"

+#include "webrtc/video_engine/vie_channel.h"

+#include "webrtc/video_engine/vie_encoder.h"

#include "webrtc/video_send_stream.h"

namespace webrtc {

« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/vie_channel.h » ('j') | no next file with comments »