7341ab8e25
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 Review-Url: https://codereview.webrtc.org/2471783002 Cr-Commit-Position: refs/heads/master@{#14886}
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
/*
|
|
* Copyright 2012 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_API_VIDEOTRACK_H_
|
|
#define WEBRTC_API_VIDEOTRACK_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/api/mediastreamtrack.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/base/thread_checker.h"
|
|
#include "webrtc/media/base/videosourcebase.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
|
|
public rtc::VideoSourceBase,
|
|
public ObserverInterface {
|
|
public:
|
|
static rtc::scoped_refptr<VideoTrack> Create(
|
|
const std::string& label,
|
|
VideoTrackSourceInterface* source);
|
|
|
|
void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) override;
|
|
void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
|
|
|
|
VideoTrackSourceInterface* GetSource() const override {
|
|
return video_source_.get();
|
|
}
|
|
bool set_enabled(bool enable) override;
|
|
std::string kind() const override;
|
|
|
|
protected:
|
|
VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
|
|
~VideoTrack();
|
|
|
|
private:
|
|
// Implements ObserverInterface. Observes |video_source_| state.
|
|
void OnChanged() override;
|
|
|
|
rtc::ThreadChecker signaling_thread_checker_;
|
|
rtc::ThreadChecker worker_thread_checker_;
|
|
rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_API_VIDEOTRACK_H_
|