generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 72819313-> 72820109

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6849 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-08-07 16:57:07 +00:00
parent 94b996cc18
commit d509678a4e
17 changed files with 442 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
talk/session/media/channel_unittest.cc
View File

@@ -23,16 +23,8 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "webrtc/base/fileutils.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/pathutils.h"
#include "webrtc/base/signalthread.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/base/sslidentity.h"
#include "webrtc/base/window.h"
#include "talk/media/base/fakemediaengine.h"
#include "talk/media/base/fakescreencapturerfactory.h"
#include "talk/media/base/fakertp.h"
#include "talk/media/base/fakevideocapturer.h"
#include "talk/media/base/mediachannel.h"
@@ -45,6 +37,15 @@
#include "talk/session/media/mediarecorder.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/session/media/typingmonitor.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/pathutils.h"
#include "webrtc/base/signalthread.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/base/sslidentity.h"
#include "webrtc/base/window.h"
#define MAYBE_SKIP_TEST(feature) \
if (!(rtc::SSLStreamAdapter::feature())) { \
@@ -88,49 +89,6 @@ class Traits {
typedef MediaInfoT MediaInfo;
};
class FakeScreenCaptureFactory
: public cricket::VideoChannel::ScreenCapturerFactory,
public sigslot::has_slots<> {
public:
FakeScreenCaptureFactory()
: window_capturer_(NULL),
capture_state_(cricket::CS_STOPPED) {}
virtual cricket::VideoCapturer* CreateScreenCapturer(
const ScreencastId& window) {
if (window_capturer_ != NULL) {
// Class is only designed to handle one fake screencapturer.
ADD_FAILURE();
return NULL;
}
window_capturer_ = new cricket::FakeVideoCapturer;
window_capturer_->SignalDestroyed.connect(
this,
&FakeScreenCaptureFactory::OnWindowCapturerDestroyed);
window_capturer_->SignalStateChange.connect(
this,
&FakeScreenCaptureFactory::OnStateChange);
return window_capturer_;
}
cricket::FakeVideoCapturer* window_capturer() { return window_capturer_; }
cricket::CaptureState capture_state() { return capture_state_; }
private:
void OnWindowCapturerDestroyed(cricket::FakeVideoCapturer* capturer) {
if (capturer == window_capturer_) {
window_capturer_ = NULL;
}
}
void OnStateChange(cricket::VideoCapturer*, cricket::CaptureState state) {
capture_state_ = state;
}
cricket::FakeVideoCapturer* window_capturer_;
cricket::CaptureState capture_state_;
};
// Controls how long we wait for a session to send messages that we
// expect, in milliseconds. We put it high to avoid flaky tests.
static const int kEventTimeout = 5000;
@@ -2469,28 +2427,31 @@ TEST_F(VideoChannelTest, TestStreams) {
TEST_F(VideoChannelTest, TestScreencastEvents) {
const int kTimeoutMs = 500;
TestInit();
FakeScreenCaptureFactory* screencapture_factory =
new FakeScreenCaptureFactory();
channel1_->SetScreenCaptureFactory(screencapture_factory);
cricket::ScreencastEventCatcher catcher;
channel1_->SignalScreencastWindowEvent.connect(
&catcher,
&cricket::ScreencastEventCatcher::OnEvent);
EXPECT_TRUE(channel1_->AddScreencast(0, ScreencastId(WindowId(0))) != NULL);
ASSERT_TRUE(screencapture_factory->window_capturer() != NULL);
EXPECT_EQ_WAIT(cricket::CS_STOPPED, screencapture_factory->capture_state(),
rtc::scoped_ptr<cricket::FakeScreenCapturerFactory>
screen_capturer_factory(new cricket::FakeScreenCapturerFactory());
cricket::VideoCapturer* screen_capturer = screen_capturer_factory->Create(
ScreencastId(WindowId(0)));
ASSERT_TRUE(screen_capturer != NULL);
EXPECT_TRUE(channel1_->AddScreencast(0, screen_capturer));
EXPECT_EQ_WAIT(cricket::CS_STOPPED, screen_capturer_factory->capture_state(),
kTimeoutMs);
screencapture_factory->window_capturer()->SignalStateChange(
screencapture_factory->window_capturer(), cricket::CS_PAUSED);
screen_capturer->SignalStateChange(screen_capturer, cricket::CS_PAUSED);
EXPECT_EQ_WAIT(rtc::WE_MINIMIZE, catcher.event(), kTimeoutMs);
screencapture_factory->window_capturer()->SignalStateChange(
screencapture_factory->window_capturer(), cricket::CS_RUNNING);
screen_capturer->SignalStateChange(screen_capturer, cricket::CS_RUNNING);
EXPECT_EQ_WAIT(rtc::WE_RESTORE, catcher.event(), kTimeoutMs);
screencapture_factory->window_capturer()->SignalStateChange(
screencapture_factory->window_capturer(), cricket::CS_STOPPED);
screen_capturer->SignalStateChange(screen_capturer, cricket::CS_STOPPED);
EXPECT_EQ_WAIT(rtc::WE_CLOSE, catcher.event(), kTimeoutMs);
EXPECT_TRUE(channel1_->RemoveScreencast(0));
ASSERT_TRUE(screencapture_factory->window_capturer() == NULL);
}
TEST_F(VideoChannelTest, TestUpdateStreamsInLocalContent) {