Convert peerconnection_client to use VcmCapturer
Eliminates the last use of WebRtcVideoDeviceCapturerFactory.
Bug: webrtc:6353
Change-Id: I72f8a1a968143037c04777e4fb443fff3801f763
Reviewed-on: https://webrtc-review.googlesource.com/c/115340
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26118}diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index d5aef6a..ace85fe 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -701,6 +701,7 @@
"../rtc_base/third_party/sigslot",
"../system_wrappers:field_trial",
"../test:field_trial",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
if (is_win) {
@@ -742,9 +743,11 @@
"../modules/audio_processing:audio_processing",
"../modules/video_capture:video_capture_module",
"../pc:libjingle_peerconnection",
+ "../pc:peerconnection",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_json",
+ "../test:video_test_common",
"//third_party/libyuv",
]
}
diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
index ff31213..096ff58 100644
--- a/examples/peerconnection/client/conductor.cc
+++ b/examples/peerconnection/client/conductor.cc
@@ -16,6 +16,7 @@
#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/audio/audio_mixer.h"
#include "api/audio_codecs/audio_decoder_factory.h"
@@ -31,18 +32,20 @@
#include "api/video_codecs/video_encoder_factory.h"
#include "examples/peerconnection/client/defaults.h"
#include "media/base/device.h"
-#include "media/engine/webrtcvideocapturerfactory.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "modules/video_capture/video_capture.h"
#include "modules/video_capture/video_capture_factory.h"
#include "p2p/base/portallocator.h"
+#include "pc/videotracksource.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/refcountedobject.h"
#include "rtc_base/rtccertificategenerator.h"
#include "rtc_base/strings/json.h"
+#include "test/vcm_capturer.h"
+namespace {
// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";
const char kCandidateSdpMlineIndexName[] = "sdpMLineIndex";
@@ -65,6 +68,35 @@
}
};
+class CapturerTrackSource : public webrtc::VideoTrackSource {
+ public:
+ static rtc::scoped_refptr<CapturerTrackSource> Create() {
+ const size_t kWidth = 640;
+ const size_t kHeight = 480;
+ const size_t kFps = 30;
+ const size_t kDeviceIndex = 0;
+ std::unique_ptr<webrtc::test::VcmCapturer> capturer = absl::WrapUnique(
+ webrtc::test::VcmCapturer::Create(kWidth, kHeight, kFps, kDeviceIndex));
+ if (!capturer) {
+ return nullptr;
+ }
+ return new rtc::RefCountedObject<CapturerTrackSource>(std::move(capturer));
+ }
+
+ protected:
+ explicit CapturerTrackSource(
+ std::unique_ptr<webrtc::test::VcmCapturer> capturer)
+ : VideoTrackSource(/*remote=*/false), capturer_(std::move(capturer)) {}
+
+ private:
+ rtc::VideoSourceInterface<webrtc::VideoFrame>* source() override {
+ return capturer_.get();
+ }
+ std::unique_ptr<webrtc::test::VcmCapturer> capturer_;
+};
+
+} // namespace
+
Conductor::Conductor(PeerConnectionClient* client, MainWindow* main_wnd)
: peer_id_(-1), loopback_(false), client_(client), main_wnd_(main_wnd) {
client_->RegisterObserver(this);
@@ -387,36 +419,6 @@
}
}
-std::unique_ptr<cricket::VideoCapturer> Conductor::OpenVideoCaptureDevice() {
- std::vector<std::string> device_names;
- {
- std::unique_ptr<webrtc::VideoCaptureModule::DeviceInfo> info(
- webrtc::VideoCaptureFactory::CreateDeviceInfo());
- if (!info) {
- return nullptr;
- }
- int num_devices = info->NumberOfDevices();
- for (int i = 0; i < num_devices; ++i) {
- const uint32_t kSize = 256;
- char name[kSize] = {0};
- char id[kSize] = {0};
- if (info->GetDeviceName(i, name, kSize, id, kSize) != -1) {
- device_names.push_back(name);
- }
- }
- }
-
- cricket::WebRtcVideoDeviceCapturerFactory factory;
- std::unique_ptr<cricket::VideoCapturer> capturer;
- for (const auto& name : device_names) {
- capturer = factory.Create(cricket::Device(name, 0));
- if (capturer) {
- break;
- }
- }
- return capturer;
-}
-
void Conductor::AddTracks() {
if (!peer_connection_->GetSenders().empty()) {
return; // Already added tracks.
@@ -432,13 +434,11 @@
<< result_or_error.error().message();
}
- std::unique_ptr<cricket::VideoCapturer> video_device =
- OpenVideoCaptureDevice();
+ rtc::scoped_refptr<CapturerTrackSource> video_device =
+ CapturerTrackSource::Create();
if (video_device) {
rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track_(
- peer_connection_factory_->CreateVideoTrack(
- kVideoLabel, peer_connection_factory_->CreateVideoSource(
- std::move(video_device), nullptr)));
+ peer_connection_factory_->CreateVideoTrack(kVideoLabel, video_device));
main_wnd_->StartLocalRenderer(video_track_);
result_or_error = peer_connection_->AddTrack(video_track_, {kStreamId});
diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h
index a038743..76c1dbe 100644
--- a/examples/peerconnection/client/conductor.h
+++ b/examples/peerconnection/client/conductor.h
@@ -57,7 +57,6 @@
void DeletePeerConnection();
void EnsureStreamingUI();
void AddTracks();
- std::unique_ptr<cricket::VideoCapturer> OpenVideoCaptureDevice();
//
// PeerConnectionObserver implementation.
