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}
94 lines
3.3 KiB
C++
94 lines
3.3 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.
|
|
*/
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "webrtc/api/test/fakevideotrackrenderer.h"
|
|
#include "webrtc/api/videocapturertracksource.h"
|
|
#include "webrtc/api/videotrack.h"
|
|
#include "webrtc/base/gunit.h"
|
|
#include "webrtc/media/base/fakevideocapturer.h"
|
|
#include "webrtc/media/base/fakemediaengine.h"
|
|
|
|
using webrtc::FakeVideoTrackRenderer;
|
|
using webrtc::MediaSourceInterface;
|
|
using webrtc::MediaStreamTrackInterface;
|
|
using webrtc::VideoTrackSource;
|
|
using webrtc::VideoTrack;
|
|
using webrtc::VideoTrackInterface;
|
|
|
|
class VideoTrackTest : public testing::Test {
|
|
public:
|
|
VideoTrackTest() {
|
|
static const char kVideoTrackId[] = "track_id";
|
|
video_track_source_ = new rtc::RefCountedObject<VideoTrackSource>(
|
|
&capturer_, true /* remote */);
|
|
video_track_ = VideoTrack::Create(kVideoTrackId, video_track_source_);
|
|
capturer_.Start(
|
|
cricket::VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30),
|
|
cricket::FOURCC_I420));
|
|
}
|
|
|
|
protected:
|
|
cricket::FakeVideoCapturer capturer_;
|
|
rtc::scoped_refptr<VideoTrackSource> video_track_source_;
|
|
rtc::scoped_refptr<VideoTrackInterface> video_track_;
|
|
};
|
|
|
|
// Test changing the source state also changes the track state.
|
|
TEST_F(VideoTrackTest, SourceStateChangeTrackState) {
|
|
EXPECT_EQ(MediaStreamTrackInterface::kLive, video_track_->state());
|
|
video_track_source_->SetState(MediaSourceInterface::kEnded);
|
|
EXPECT_EQ(MediaStreamTrackInterface::kEnded, video_track_->state());
|
|
}
|
|
|
|
// Test adding renderers to a video track and render to them by providing
|
|
// frames to the source.
|
|
TEST_F(VideoTrackTest, RenderVideo) {
|
|
// FakeVideoTrackRenderer register itself to |video_track_|
|
|
std::unique_ptr<FakeVideoTrackRenderer> renderer_1(
|
|
new FakeVideoTrackRenderer(video_track_.get()));
|
|
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(1, renderer_1->num_rendered_frames());
|
|
|
|
// FakeVideoTrackRenderer register itself to |video_track_|
|
|
std::unique_ptr<FakeVideoTrackRenderer> renderer_2(
|
|
new FakeVideoTrackRenderer(video_track_.get()));
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(2, renderer_1->num_rendered_frames());
|
|
EXPECT_EQ(1, renderer_2->num_rendered_frames());
|
|
|
|
renderer_1.reset(nullptr);
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(2, renderer_2->num_rendered_frames());
|
|
}
|
|
|
|
// Test that disabling the track results in blacked out frames.
|
|
TEST_F(VideoTrackTest, DisableTrackBlackout) {
|
|
std::unique_ptr<FakeVideoTrackRenderer> renderer(
|
|
new FakeVideoTrackRenderer(video_track_.get()));
|
|
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(1, renderer->num_rendered_frames());
|
|
EXPECT_FALSE(renderer->black_frame());
|
|
|
|
video_track_->set_enabled(false);
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(2, renderer->num_rendered_frames());
|
|
EXPECT_TRUE(renderer->black_frame());
|
|
|
|
video_track_->set_enabled(true);
|
|
capturer_.CaptureFrame();
|
|
EXPECT_EQ(3, renderer->num_rendered_frames());
|
|
EXPECT_FALSE(renderer->black_frame());
|
|
}
|