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

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed)

Created:
5 years ago by kjellander_webrtc
Modified:
5 years ago
Reviewers:
pbos-webrtc, mflodman
CC:
webrtc-reviews_webrtc.org, interface-changes_webrtc.org, video-team_agora.io, yujie_mao (webrtc), Andrew MacDonald, zhengzhonghou_agora.io, stefan-webrtc, perkj_webrtc, tterriberry_mozilla.com, qiang.lu, niklas.enbom, mflodman, peah-webrtc, the sun, rwolff_gocast.it, andresp
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Merge webrtc/video_engine/ into webrtc/video/ (patchset #2 id:20001 of https://codereview.webrtc.org/1506773002/ ) Reason for revert: Breaks Dr Memory Light https://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/builds/4643 and all the Android Tests bots. Original issue's description: > Merge webrtc/video_engine/ into webrtc/video/ > > BUG=webrtc:1695 > R=mflodman@webrtc.org > > Committed: https://crrev.com/03ef053202bc5d5ab43460eebf5403232f157646 > Cr-Commit-Position: refs/heads/master@{#10926} TBR=mflodman@webrtc.org,pbos@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:1695 Committed: https://crrev.com/8237abf563bf4782ee104408b53cc8e55ce44518 Cr-Commit-Position: refs/heads/master@{#10937}

Patch Set 1 #

Patch Set 2 : Resolved merge conflict #

Unified diffs Side-by-side diffs Delta from patch set Stats (+207 lines, -7540 lines) Patch
M .gitignore View 1 chunk +4 lines, -0 lines 0 comments Download
M PRESUBMIT.py View 1 1 chunk +1 line, -0 lines 0 comments Download
M WATCHLISTS View 2 chunks +11 lines, -11 lines 0 comments Download
M talk/media/base/videocommon.cc View 1 1 chunk +3 lines, -0 lines 0 comments Download
M webrtc/audio/audio_send_stream_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/call/call.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/call/congestion_controller.cc View 1 chunk +4 lines, -4 lines 0 comments Download
M webrtc/test/direct_transport.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/fake_decoder.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/fake_encoder.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/frame_generator_capturer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/gl/gl_renderer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/linux/glx_renderer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/mac/video_renderer_mac.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/null_transport.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/rtp_rtcp_observer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/run_loop.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/statistics.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/vcm_capturer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/video_capturer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/video_renderer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/test/win/d3d_renderer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/transport.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/video/BUILD.gn View 1 3 chunks +23 lines, -23 lines 0 comments Download
D webrtc/video/call_stats.h View 1 chunk +0 lines, -81 lines 0 comments Download
D webrtc/video/call_stats.cc View 1 chunk +0 lines, -169 lines 0 comments Download
D webrtc/video/call_stats_unittest.cc View 1 chunk +0 lines, -203 lines 0 comments Download
D webrtc/video/encoder_state_feedback.h View 1 chunk +0 lines, -71 lines 0 comments Download
D webrtc/video/encoder_state_feedback.cc View 1 chunk +0 lines, -124 lines 0 comments Download
D webrtc/video/encoder_state_feedback_unittest.cc View 1 chunk +0 lines, -143 lines 0 comments Download
D webrtc/video/overuse_frame_detector.h View 1 chunk +0 lines, -175 lines 0 comments Download
D webrtc/video/overuse_frame_detector.cc View 1 chunk +0 lines, -385 lines 0 comments Download
D webrtc/video/overuse_frame_detector_unittest.cc View 1 chunk +0 lines, -393 lines 0 comments Download
D webrtc/video/payload_router.h View 1 chunk +0 lines, -85 lines 0 comments Download
D webrtc/video/payload_router.cc View 1 chunk +0 lines, -101 lines 0 comments Download
D webrtc/video/payload_router_unittest.cc View 1 chunk +0 lines, -209 lines 0 comments Download
M webrtc/video/receive_statistics_proxy.h View 1 chunk +2 lines, -2 lines 0 comments Download
D webrtc/video/report_block_stats.h View 1 chunk +0 lines, -62 lines 0 comments Download
D webrtc/video/report_block_stats.cc View 1 chunk +0 lines, -111 lines 0 comments Download
D webrtc/video/report_block_stats_unittest.cc View 1 chunk +0 lines, -146 lines 0 comments Download
M webrtc/video/send_statistics_proxy.h View 1 chunk +2 lines, -2 lines 0 comments Download
D webrtc/video/stream_synchronization.h View 1 chunk +0 lines, -59 lines 0 comments Download
D webrtc/video/stream_synchronization.cc View 1 chunk +0 lines, -226 lines 0 comments Download
D webrtc/video/stream_synchronization_unittest.cc View 1 chunk +0 lines, -563 lines 0 comments Download
M webrtc/video/video_capture_input.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/video/video_receive_stream.h View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/video/video_receive_stream.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/video/video_send_stream.cc View 1 chunk +5 lines, -5 lines 0 comments Download
D webrtc/video/vie_channel.h View 1 chunk +0 lines, -457 lines 0 comments Download
D webrtc/video/vie_channel.cc View 1 chunk +0 lines, -1203 lines 0 comments Download
D webrtc/video/vie_codec_unittest.cc View 1 chunk +0 lines, -230 lines 0 comments Download
D webrtc/video/vie_encoder.h View 1 chunk +0 lines, -195 lines 0 comments Download
D webrtc/video/vie_encoder.cc View 1 chunk +0 lines, -628 lines 0 comments Download
D webrtc/video/vie_receiver.h View 1 chunk +0 lines, -132 lines 0 comments Download
D webrtc/video/vie_receiver.cc View 1 chunk +0 lines, -482 lines 0 comments Download
D webrtc/video/vie_remb.h View 1 chunk +0 lines, -78 lines 0 comments Download
D webrtc/video/vie_remb.cc View 1 chunk +0 lines, -143 lines 0 comments Download
D webrtc/video/vie_remb_unittest.cc View 1 chunk +0 lines, -250 lines 0 comments Download
D webrtc/video/vie_sync_module.h View 1 chunk +0 lines, -62 lines 0 comments Download
D webrtc/video/vie_sync_module.cc View 1 chunk +0 lines, -174 lines 0 comments Download
M webrtc/video/webrtc_video.gypi View 2 chunks +22 lines, -22 lines 0 comments Download
A + webrtc/video_engine/OWNERS View 1 2 chunks +3 lines, -2 lines 0 comments Download
A + webrtc/video_engine/call_stats.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/call_stats.cc View 1 1 chunk +1 line, -3 lines 0 comments Download
A + webrtc/video_engine/call_stats_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/encoder_state_feedback.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/encoder_state_feedback.cc View 1 1 chunk +2 lines, -2 lines 0 comments Download
A + webrtc/video_engine/encoder_state_feedback_unittest.cc View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/overuse_frame_detector.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/overuse_frame_detector.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/overuse_frame_detector_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/payload_router.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/payload_router.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/payload_router_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/report_block_stats.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/report_block_stats.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/report_block_stats_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/stream_synchronization.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/stream_synchronization.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/stream_synchronization_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/vie_channel.h View 1 3 chunks +5 lines, -5 lines 0 comments Download
A + webrtc/video_engine/vie_channel.cc View 1 2 chunks +4 lines, -4 lines 0 comments Download
A + webrtc/video_engine/vie_codec_unittest.cc View 1 0 chunks +-1 lines, --1 lines 0 comments Download
A + webrtc/video_engine/vie_encoder.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/vie_encoder.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
A + webrtc/video_engine/vie_receiver.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/vie_receiver.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/vie_remb.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + webrtc/video_engine/vie_remb.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/vie_remb_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + webrtc/video_engine/vie_sync_module.h View 1 2 chunks +4 lines, -4 lines 0 comments Download
A + webrtc/video_engine/vie_sync_module.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/video_renderer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M webrtc/webrtc_tests.gypi View 1 chunk +8 lines, -8 lines 0 comments Download

Messages

Total messages: 13 (4 generated)
kjellander_webrtc
Created Revert of Merge webrtc/video_engine/ into webrtc/video/
5 years ago (2015-12-08 15:01:40 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1507903005/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1507903005/1
5 years ago (2015-12-08 15:02:47 UTC) #2
commit-bot: I haz the power
Failed to apply patch for PRESUBMIT.py: While running git apply --index -3 -p1; error: patch ...
5 years ago (2015-12-08 15:03:07 UTC) #4
kjellander_webrtc
review and CQ plz
5 years ago (2015-12-08 15:10:19 UTC) #6
pbos-webrtc
On 2015/12/08 15:10:19, kjellander (webrtc) wrote: > review and CQ plz lgtm
5 years ago (2015-12-08 15:11:25 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1507903005/300001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1507903005/300001
5 years ago (2015-12-08 15:11:41 UTC) #9
commit-bot: I haz the power
Committed patchset #2 (id:300001)
5 years ago (2015-12-08 15:12:10 UTC) #10
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/8237abf563bf4782ee104408b53cc8e55ce44518 Cr-Commit-Position: refs/heads/master@{#10937}
5 years ago (2015-12-08 15:12:15 UTC) #12
pbos-webrtc
5 years ago (2015-12-09 10:33:09 UTC) #13
Message was sent while issue was closed.
A revert of this CL (patchset #2 id:300001) has been created in
https://codereview.webrtc.org/1510183002/ by pbos@webrtc.org.

The reason for reverting is: Bot breakage caused by TickTime::UseFakeClock has
been removed..

Powered by Google App Engine
This is Rietveld 408576698