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

Unified Diff: webrtc/api/androidvideocapturer.cc

Issue 2235893003: Remove the old AndroidVideoCapturer stack code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 4 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/api/androidvideocapturer.h ('k') | webrtc/api/api.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/androidvideocapturer.cc
diff --git a/webrtc/api/androidvideocapturer.cc b/webrtc/api/androidvideocapturer.cc
deleted file mode 100644
index 0bdf214701a1b0425d6c4f54f577c96c62f83834..0000000000000000000000000000000000000000
--- a/webrtc/api/androidvideocapturer.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2015 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/api/androidvideocapturer.h"
-
-#include <memory>
-
-#include "webrtc/api/android/jni/native_handle_impl.h"
-#include "webrtc/base/common.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
-
-namespace webrtc {
-
-AndroidVideoCapturer::AndroidVideoCapturer(
- const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
- : running_(false),
- delegate_(delegate) {
- thread_checker_.DetachFromThread();
- SetSupportedFormats(delegate_->GetSupportedFormats());
-}
-
-AndroidVideoCapturer::~AndroidVideoCapturer() {
- RTC_CHECK(!running_);
-}
-
-cricket::CaptureState AndroidVideoCapturer::Start(
- const cricket::VideoFormat& capture_format) {
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- RTC_CHECK(!running_);
- const int fps = cricket::VideoFormat::IntervalToFps(capture_format.interval);
- LOG(LS_INFO) << " AndroidVideoCapturer::Start " << capture_format.width << "x"
- << capture_format.height << "@" << fps;
-
- running_ = true;
- delegate_->Start(capture_format.width, capture_format.height, fps, this);
- SetCaptureFormat(&capture_format);
- return cricket::CS_STARTING;
-}
-
-void AndroidVideoCapturer::Stop() {
- LOG(LS_INFO) << " AndroidVideoCapturer::Stop ";
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- RTC_CHECK(running_);
- running_ = false;
- SetCaptureFormat(NULL);
-
- delegate_->Stop();
- SetCaptureState(cricket::CS_STOPPED);
-}
-
-bool AndroidVideoCapturer::IsRunning() {
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- return running_;
-}
-
-bool AndroidVideoCapturer::GetPreferredFourccs(std::vector<uint32_t>* fourccs) {
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- fourccs->push_back(cricket::FOURCC_YV12);
- return true;
-}
-
-void AndroidVideoCapturer::OnCapturerStarted(bool success) {
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- const cricket::CaptureState new_state =
- success ? cricket::CS_RUNNING : cricket::CS_FAILED;
- SetCaptureState(new_state);
-}
-
-void AndroidVideoCapturer::OnOutputFormatRequest(
- int width, int height, int fps) {
- RTC_CHECK(thread_checker_.CalledOnValidThread());
- cricket::VideoFormat format(width, height,
- cricket::VideoFormat::FpsToInterval(fps), 0);
- video_adapter()->OnOutputFormatRequest(format);
-}
-
-bool AndroidVideoCapturer::GetBestCaptureFormat(
- const cricket::VideoFormat& desired,
- cricket::VideoFormat* best_format) {
- // Delegate this choice to VideoCapturer.startCapture().
- *best_format = desired;
- return true;
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/api/androidvideocapturer.h ('k') | webrtc/api/api.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698