projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
libjingle
/
source
/
talk
/
app
/
webrtc
/
videosource_unittest.cc
diff --git
a/src/third_party/libjingle/source/talk/app/webrtc/videosource_unittest.cc
b/src/third_party/libjingle/source/talk/app/webrtc/videosource_unittest.cc
index
d9d8acf
..
48c9c14
100644
(file)
--- a/
src/third_party/libjingle/source/talk/app/webrtc/videosource_unittest.cc
+++ b/
src/third_party/libjingle/source/talk/app/webrtc/videosource_unittest.cc
@@
-366,21
+366,12
@@
TEST_F(VideoSourceTest, InvalidOptionalConstraint) {
TEST_F(VideoSourceTest, SetValidOptionValues) {
FakeConstraints constraints;
constraints.AddMandatory(MediaConstraintsInterface::kNoiseReduction, "false");
TEST_F(VideoSourceTest, SetValidOptionValues) {
FakeConstraints constraints;
constraints.AddMandatory(MediaConstraintsInterface::kNoiseReduction, "false");
- constraints.AddMandatory(
- MediaConstraintsInterface::kTemporalLayeredScreencast, "false");
- constraints.AddOptional(
- MediaConstraintsInterface::kLeakyBucket, "true");
CreateVideoSource(&constraints);
bool value = true;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_FALSE(value);
CreateVideoSource(&constraints);
bool value = true;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_FALSE(value);
- EXPECT_TRUE(source_->options()->
- video_temporal_layer_screencast.Get(&value));
- EXPECT_FALSE(value);
- EXPECT_TRUE(source_->options()->video_leaky_bucket.Get(&value));
- EXPECT_TRUE(value);
}
TEST_F(VideoSourceTest, OptionNotSet) {
}
TEST_F(VideoSourceTest, OptionNotSet) {
@@
-402,7
+393,6
@@
TEST_F(VideoSourceTest, MandatoryOptionOverridesOptional) {
bool value = false;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_TRUE(value);
bool value = false;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_TRUE(value);
- EXPECT_FALSE(source_->options()->video_leaky_bucket.Get(&value));
}
TEST_F(VideoSourceTest, InvalidOptionKeyOptional) {
}
TEST_F(VideoSourceTest, InvalidOptionKeyOptional) {
@@
-437,18
+427,14
@@
TEST_F(VideoSourceTest, InvalidOptionKeyMandatory) {
TEST_F(VideoSourceTest, InvalidOptionValueOptional) {
FakeConstraints constraints;
constraints.AddOptional(
TEST_F(VideoSourceTest, InvalidOptionValueOptional) {
FakeConstraints constraints;
constraints.AddOptional(
- MediaConstraintsInterface::kNoiseReduction, "true");
- constraints.AddOptional(
- MediaConstraintsInterface::kLeakyBucket, "not boolean");
+ MediaConstraintsInterface::kNoiseReduction, "not a boolean");
CreateVideoSource(&constraints);
EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
kMaxWaitMs);
bool value = false;
CreateVideoSource(&constraints);
EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
kMaxWaitMs);
bool value = false;
- EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
- EXPECT_TRUE(value);
- EXPECT_FALSE(source_->options()->video_leaky_bucket.Get(&value));
+ EXPECT_FALSE(source_->options()->video_noise_reduction.Get(&value));
}
TEST_F(VideoSourceTest, InvalidOptionValueMandatory) {
}
TEST_F(VideoSourceTest, InvalidOptionValueMandatory) {
@@
-458,7
+444,7
@@
TEST_F(VideoSourceTest, InvalidOptionValueMandatory) {
MediaConstraintsInterface::kNoiseReduction, "false");
// Values are case-sensitive and must be all lower-case.
constraints.AddMandatory(
MediaConstraintsInterface::kNoiseReduction, "false");
// Values are case-sensitive and must be all lower-case.
constraints.AddMandatory(
- MediaConstraintsInterface::k
LeakyBucket
, "True");
+ MediaConstraintsInterface::k
NoiseReduction
, "True");
CreateVideoSource(&constraints);
CreateVideoSource(&constraints);
@@
-491,7
+477,6
@@
TEST_F(VideoSourceTest, MixedOptionsAndConstraints) {
bool value = true;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_FALSE(value);
bool value = true;
EXPECT_TRUE(source_->options()->video_noise_reduction.Get(&value));
EXPECT_FALSE(value);
- EXPECT_FALSE(source_->options()->video_leaky_bucket.Get(&value));
}
// Tests that the source starts video with the default resolution for
}
// Tests that the source starts video with the default resolution for