Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Unified Diff: webrtc/video/BUILD.gn

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
« no previous file with comments | « webrtc/transport.h ('k') | webrtc/video/call_stats.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/BUILD.gn
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index e35772e22c44d5f2b110d7c7744227ac8bb44c6e..9db0dfcc97f52ba47ef0147c78d127aa9aa3e770 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -10,24 +10,34 @@ import("../build/webrtc.gni")
source_set("video") {
sources = [
- "call_stats.cc",
- "call_stats.h",
+ "../video_engine/call_stats.cc",
+ "../video_engine/call_stats.h",
+ "../video_engine/encoder_state_feedback.cc",
+ "../video_engine/encoder_state_feedback.h",
+ "../video_engine/overuse_frame_detector.cc",
+ "../video_engine/overuse_frame_detector.h",
+ "../video_engine/payload_router.cc",
+ "../video_engine/payload_router.h",
+ "../video_engine/report_block_stats.cc",
+ "../video_engine/report_block_stats.h",
+ "../video_engine/stream_synchronization.cc",
+ "../video_engine/stream_synchronization.h",
+ "../video_engine/vie_channel.cc",
+ "../video_engine/vie_channel.h",
+ "../video_engine/vie_encoder.cc",
+ "../video_engine/vie_encoder.h",
+ "../video_engine/vie_receiver.cc",
+ "../video_engine/vie_receiver.h",
+ "../video_engine/vie_remb.cc",
+ "../video_engine/vie_remb.h",
+ "../video_engine/vie_sync_module.cc",
+ "../video_engine/vie_sync_module.h",
"encoded_frame_callback_adapter.cc",
"encoded_frame_callback_adapter.h",
- "encoder_state_feedback.cc",
- "encoder_state_feedback.h",
- "overuse_frame_detector.cc",
- "overuse_frame_detector.h",
- "payload_router.cc",
- "payload_router.h",
"receive_statistics_proxy.cc",
"receive_statistics_proxy.h",
- "report_block_stats.cc",
- "report_block_stats.h",
"send_statistics_proxy.cc",
"send_statistics_proxy.h",
- "stream_synchronization.cc",
- "stream_synchronization.h",
"video_capture_input.cc",
"video_capture_input.h",
"video_decoder.cc",
@@ -36,16 +46,6 @@ source_set("video") {
"video_receive_stream.h",
"video_send_stream.cc",
"video_send_stream.h",
- "vie_channel.cc",
- "vie_channel.h",
- "vie_encoder.cc",
- "vie_encoder.h",
- "vie_receiver.cc",
- "vie_receiver.h",
- "vie_remb.cc",
- "vie_remb.h",
- "vie_sync_module.cc",
- "vie_sync_module.h",
]
configs += [ "..:common_config" ]
@@ -69,7 +69,7 @@ source_set("video") {
"../modules/video_coding",
"../modules/video_processing",
"../modules/video_render:video_render_module",
- "../system_wrappers",
"../voice_engine",
+ "../system_wrappers",
]
}
« no previous file with comments | « webrtc/transport.h ('k') | webrtc/video/call_stats.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698