acd935b540
Reason for revert: Relanding after known downstream breakages have been fixed. Original issue's description: > Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (patchset #7 id:120001 of https://codereview.webrtc.org/2383093002/ ) > > Reason for revert: > Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio > > Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. > > Original issue's description: > > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > > > Replaced with webrtc::VideoFrame. > > > > TBR=mflodman@webrtc.org > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > > Cr-Commit-Position: refs/heads/master@{#14885} > > TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/7341ab8e2505c9763d208e069bda269018357e7d > Cr-Commit-Position: refs/heads/master@{#14886} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2487633002 Cr-Commit-Position: refs/heads/master@{#15039}
92 lines
3.5 KiB
C++
92 lines
3.5 KiB
C++
/*
|
|
* Copyright (c) 2004 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
|
|
#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/asyncinvoker.h"
|
|
#include "webrtc/base/messagehandler.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "webrtc/media/base/device.h"
|
|
#include "webrtc/media/base/videocapturer.h"
|
|
#include "webrtc/modules/video_capture/video_capture.h"
|
|
|
|
namespace cricket {
|
|
|
|
// Factory to allow injection of a VCM impl into WebRtcVideoCapturer.
|
|
// DeviceInfos do not have a Release() and therefore need an explicit Destroy().
|
|
class WebRtcVcmFactoryInterface {
|
|
public:
|
|
virtual ~WebRtcVcmFactoryInterface() {}
|
|
virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
|
|
int id,
|
|
const char* device) = 0;
|
|
virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) = 0;
|
|
virtual void DestroyDeviceInfo(
|
|
webrtc::VideoCaptureModule::DeviceInfo* info) = 0;
|
|
};
|
|
|
|
// WebRTC-based implementation of VideoCapturer.
|
|
class WebRtcVideoCapturer : public VideoCapturer,
|
|
public webrtc::VideoCaptureDataCallback {
|
|
public:
|
|
WebRtcVideoCapturer();
|
|
explicit WebRtcVideoCapturer(WebRtcVcmFactoryInterface* factory);
|
|
virtual ~WebRtcVideoCapturer();
|
|
|
|
bool Init(const Device& device);
|
|
bool Init(const rtc::scoped_refptr<webrtc::VideoCaptureModule>& module);
|
|
|
|
// Override virtual methods of the parent class VideoCapturer.
|
|
bool GetBestCaptureFormat(const VideoFormat& desired,
|
|
VideoFormat* best_format) override;
|
|
CaptureState Start(const VideoFormat& capture_format) override;
|
|
void Stop() override;
|
|
bool IsRunning() override;
|
|
bool IsScreencast() const override { return false; }
|
|
|
|
protected:
|
|
void OnSinkWantsChanged(const rtc::VideoSinkWants& wants) override;
|
|
// Override virtual methods of the parent class VideoCapturer.
|
|
bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override;
|
|
|
|
private:
|
|
// Callback when a frame is captured by camera.
|
|
void OnIncomingCapturedFrame(const int32_t id,
|
|
const webrtc::VideoFrame& frame) override;
|
|
void OnCaptureDelayChanged(const int32_t id,
|
|
const int32_t delay) override;
|
|
|
|
// Used to signal captured frames on the same thread as invoked Start().
|
|
// With WebRTC's current VideoCapturer implementations, this will mean a
|
|
// thread hop, but in other implementations (e.g. Chrome) it will be called
|
|
// directly from OnIncomingCapturedFrame.
|
|
// TODO(tommi): Remove this workaround when we've updated the WebRTC capturers
|
|
// to follow the same contract.
|
|
void SignalFrameCapturedOnStartThread(const webrtc::VideoFrame& frame);
|
|
|
|
std::unique_ptr<WebRtcVcmFactoryInterface> factory_;
|
|
rtc::scoped_refptr<webrtc::VideoCaptureModule> module_;
|
|
int captured_frames_;
|
|
std::vector<uint8_t> capture_buffer_;
|
|
rtc::Thread* start_thread_; // Set in Start(), unset in Stop();
|
|
|
|
std::unique_ptr<rtc::AsyncInvoker> async_invoker_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|