webrtc/video/encoder_state_feedback_unittest.cc - Issue 1510183002: Reland 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/encoder_state_feedback_unittest.cc

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

Patch Set: rebase 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/encoder_state_feedback_unittest.cc

diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc

similarity index 97%

rename from webrtc/video_engine/encoder_state_feedback_unittest.cc

rename to webrtc/video/encoder_state_feedback_unittest.cc

index 6024790c7686cc46b2f43cf27cfca4bc1da759c3..834447e513e79c06f29be9c5a9324381f7049e51 100644

--- a/webrtc/video_engine/encoder_state_feedback_unittest.cc

+++ b/webrtc/video/encoder_state_feedback_unittest.cc

@@ -10,7 +10,7 @@

// This file includes unit tests for EncoderStateFeedback.

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

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

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -22,8 +22,8 @@

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

#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"

#include "webrtc/modules/utility/include/mock/mock_process_thread.h"

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

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

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

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

using ::testing::NiceMock;

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