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

Unified Diff: webrtc/test/video_capturer.cc

Issue 2764133002: Revert of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Created 3 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/video_capturer.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/video_capturer.cc
diff --git a/webrtc/test/video_capturer.cc b/webrtc/test/video_capturer.cc
deleted file mode 100644
index c8b38261cefe182d058187d085c2b9bf78da6c17..0000000000000000000000000000000000000000
--- a/webrtc/test/video_capturer.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/test/video_capturer.h"
-
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-
-namespace webrtc {
-namespace test {
-VideoCapturer::VideoCapturer() : video_adapter_(new cricket::VideoAdapter()) {}
-VideoCapturer::~VideoCapturer() {}
-
-rtc::Optional<VideoFrame> VideoCapturer::AdaptFrame(const VideoFrame& frame) {
- int cropped_width = 0;
- int cropped_height = 0;
- int out_width = 0;
- int out_height = 0;
-
- if (!video_adapter_->AdaptFrameResolution(
- frame.width(), frame.height(), frame.timestamp_us() * 1000,
- &cropped_width, &cropped_height, &out_width, &out_height)) {
- // Drop frame in order to respect frame rate constraint.
- return rtc::Optional<VideoFrame>();
- }
-
- rtc::Optional<VideoFrame> out_frame;
- if (out_height != frame.height() || out_width != frame.width()) {
- // Video adapter has requested a down-scale. Allocate a new buffer and
- // return scaled version.
- rtc::scoped_refptr<I420Buffer> scaled_buffer =
- I420Buffer::Create(out_width, out_height);
- scaled_buffer->ScaleFrom(*frame.video_frame_buffer().get());
- out_frame.emplace(
- VideoFrame(scaled_buffer, kVideoRotation_0, frame.timestamp_us()));
- } else {
- // No adaptations needed, just return the frame as is.
- out_frame.emplace(frame);
- }
-
- return out_frame;
-}
-
-void VideoCapturer::AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
- const rtc::VideoSinkWants& wants) {
- video_adapter_->OnResolutionFramerateRequest(
- wants.target_pixel_count, wants.max_pixel_count, wants.max_framerate_fps);
-}
-
-} // namespace test
-} // namespace webrtc
« no previous file with comments | « webrtc/test/video_capturer.h ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698