2013-09-19 05:49:50 +00:00
|
|
|
/*
|
|
|
|
|
* libjingle
|
2015-01-20 21:36:13 +00:00
|
|
|
* Copyright 2013 Google Inc.
|
2013-09-19 05:49:50 +00:00
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
|
*
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
|
|
|
* and/or other materials provided with the distribution.
|
|
|
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
|
|
|
* derived from this software without specific prior written permission.
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
|
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
|
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
|
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
|
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
|
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
|
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
|
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
|
|
2016-02-10 10:53:12 +01:00
|
|
|
#include "webrtc/api/remotevideocapturer.h"
|
2014-08-13 17:26:08 +00:00
|
|
|
#include "webrtc/base/gunit.h"
|
Move talk/media to webrtc/media
I removed the 'libjingle' target in talk/libjingle.gyp and replaced
all users of it with base/base.gyp:rtc_base. It seems the jsoncpp
and expat dependencies were not used by it's previous references.
The files in talk/media/testdata were uploaded to Google Storage and
added .sha1 files in resources/media instead of simply moving them.
The previously disabled warnings that were inherited from
talk/build/common.gypi are now replaced by target-specific disabling
of only the failing warnings. Additional disabling was needed since the stricter
compilation warnings that applies to code in webrtc/.
License headers will be updated in a follow-up CL in order to not
break Git history.
Other modifications:
* Updated the header guards.
* Sorted the includes using chromium/src/tools/sort-headers.py
except for these files:
talk/app/webrtc/peerconnectionendtoend_unittest.cc
talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
webrtc/media/devices/win32devicemanager.cc.
* Unused GYP reference to libjingle_tests_additional_deps was removed.
* Removed duplicated GYP entries of
webrtc/base/testutils.cc
webrtc/base/testutils.h
The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media,
so they were moved to the media.gyp.
I also checked that none of
EXPAT_RELATIVE_PATH,
FEATURE_ENABLE_VOICEMAIL,
GTEST_RELATIVE_PATH,
JSONCPP_RELATIVE_PATH,
LOGGING=1,
SRTP_RELATIVE_PATH,
FEATURE_ENABLE_SSL,
FEATURE_ENABLE_VOICEMAIL,
FEATURE_ENABLE_PSTN,
HAVE_SCTP,
HAVE_SRTP,
are used by the talk/media code.
For Chromium, the following changes will need to be applied to the roll CL that updates the
DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/
BUG=webrtc:5420
NOPRESUBMIT=True
TBR=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1587193006
Cr-Commit-Position: refs/heads/master@{#11495}
2016-02-04 23:52:28 -08:00
|
|
|
#include "webrtc/media/webrtc/webrtcvideoframe.h"
|
2013-09-19 05:49:50 +00:00
|
|
|
|
|
|
|
|
using cricket::CaptureState;
|
|
|
|
|
using cricket::VideoCapturer;
|
|
|
|
|
using cricket::VideoFormat;
|
|
|
|
|
using cricket::VideoFormatPod;
|
|
|
|
|
using cricket::VideoFrame;
|
|
|
|
|
|
|
|
|
|
static const int kMaxWaitMs = 1000;
|
|
|
|
|
static const VideoFormatPod kTestFormat =
|
|
|
|
|
{640, 480, FPS_TO_INTERVAL(30), cricket::FOURCC_ANY};
|
|
|
|
|
|
|
|
|
|
class RemoteVideoCapturerTest : public testing::Test,
|
|
|
|
|
public sigslot::has_slots<> {
|
|
|
|
|
protected:
|
|
|
|
|
RemoteVideoCapturerTest()
|
|
|
|
|
: captured_frame_num_(0),
|
|
|
|
|
capture_state_(cricket::CS_STOPPED) {}
|
|
|
|
|
|
|
|
|
|
virtual void SetUp() {
|
|
|
|
|
capturer_.SignalStateChange.connect(
|
|
|
|
|
this, &RemoteVideoCapturerTest::OnStateChange);
|
|
|
|
|
capturer_.SignalVideoFrame.connect(
|
|
|
|
|
this, &RemoteVideoCapturerTest::OnVideoFrame);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~RemoteVideoCapturerTest() {
|
|
|
|
|
capturer_.SignalStateChange.disconnect(this);
|
|
|
|
|
capturer_.SignalVideoFrame.disconnect(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int captured_frame_num() const {
|
|
|
|
|
return captured_frame_num_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CaptureState capture_state() const {
|
|
|
|
|
return capture_state_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
webrtc::RemoteVideoCapturer capturer_;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
void OnStateChange(VideoCapturer* capturer,
|
|
|
|
|
CaptureState capture_state) {
|
|
|
|
|
EXPECT_EQ(&capturer_, capturer);
|
|
|
|
|
capture_state_ = capture_state;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void OnVideoFrame(VideoCapturer* capturer, const VideoFrame* frame) {
|
|
|
|
|
EXPECT_EQ(&capturer_, capturer);
|
|
|
|
|
++captured_frame_num_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int captured_frame_num_;
|
|
|
|
|
CaptureState capture_state_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
TEST_F(RemoteVideoCapturerTest, StartStop) {
|
|
|
|
|
// Start
|
|
|
|
|
EXPECT_TRUE(
|
|
|
|
|
capturer_.StartCapturing(VideoFormat(kTestFormat)));
|
|
|
|
|
EXPECT_TRUE_WAIT((cricket::CS_RUNNING == capture_state()), kMaxWaitMs);
|
|
|
|
|
EXPECT_EQ(VideoFormat(kTestFormat),
|
|
|
|
|
*capturer_.GetCaptureFormat());
|
|
|
|
|
EXPECT_TRUE(capturer_.IsRunning());
|
|
|
|
|
|
|
|
|
|
// Stop
|
|
|
|
|
capturer_.Stop();
|
|
|
|
|
EXPECT_TRUE_WAIT((cricket::CS_STOPPED == capture_state()), kMaxWaitMs);
|
|
|
|
|
EXPECT_TRUE(NULL == capturer_.GetCaptureFormat());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(RemoteVideoCapturerTest, GetPreferredFourccs) {
|
|
|
|
|
EXPECT_FALSE(capturer_.GetPreferredFourccs(NULL));
|
|
|
|
|
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
std::vector<uint32_t> fourccs;
|
2013-09-19 05:49:50 +00:00
|
|
|
EXPECT_TRUE(capturer_.GetPreferredFourccs(&fourccs));
|
|
|
|
|
EXPECT_EQ(1u, fourccs.size());
|
|
|
|
|
EXPECT_EQ(cricket::FOURCC_I420, fourccs.at(0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(RemoteVideoCapturerTest, GetBestCaptureFormat) {
|
|
|
|
|
VideoFormat desired = VideoFormat(kTestFormat);
|
|
|
|
|
EXPECT_FALSE(capturer_.GetBestCaptureFormat(desired, NULL));
|
|
|
|
|
|
|
|
|
|
VideoFormat expected_format = VideoFormat(kTestFormat);
|
|
|
|
|
expected_format.fourcc = cricket::FOURCC_I420;
|
|
|
|
|
VideoFormat best_format;
|
|
|
|
|
EXPECT_TRUE(capturer_.GetBestCaptureFormat(desired, &best_format));
|
|
|
|
|
EXPECT_EQ(expected_format, best_format);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST_F(RemoteVideoCapturerTest, InputFrame) {
|
|
|
|
|
EXPECT_EQ(0, captured_frame_num());
|
|
|
|
|
|
|
|
|
|
cricket::WebRtcVideoFrame test_frame;
|
|
|
|
|
capturer_.SignalVideoFrame(&capturer_, &test_frame);
|
|
|
|
|
EXPECT_EQ(1, captured_frame_num());
|
|
|
|
|
capturer_.SignalVideoFrame(&capturer_, &test_frame);
|
|
|
|
|
EXPECT_EQ(2, captured_frame_num());
|
|
|
|
|
}
|