mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 14:50:39 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
144 lines
6.1 KiB
C++
144 lines
6.1 KiB
C++
/*
|
|
* Copyright 2018 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 "pc/session_description.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "test/gtest.h"
|
|
|
|
namespace cricket {
|
|
|
|
TEST(MediaContentDescriptionTest, ExtmapAllowMixedDefaultValue) {
|
|
VideoContentDescription video_desc;
|
|
EXPECT_EQ(MediaContentDescription::kNo, video_desc.extmap_allow_mixed_enum());
|
|
}
|
|
|
|
TEST(MediaContentDescriptionTest, SetExtmapAllowMixed) {
|
|
VideoContentDescription video_desc;
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kNo);
|
|
EXPECT_EQ(MediaContentDescription::kNo, video_desc.extmap_allow_mixed_enum());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_EQ(MediaContentDescription::kMedia,
|
|
video_desc.extmap_allow_mixed_enum());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kSession);
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
video_desc.extmap_allow_mixed_enum());
|
|
|
|
// Not allowed to downgrade from kSession to kMedia.
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
video_desc.extmap_allow_mixed_enum());
|
|
|
|
// Always okay to set not supported.
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kNo);
|
|
EXPECT_EQ(MediaContentDescription::kNo, video_desc.extmap_allow_mixed_enum());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_EQ(MediaContentDescription::kMedia,
|
|
video_desc.extmap_allow_mixed_enum());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kNo);
|
|
EXPECT_EQ(MediaContentDescription::kNo, video_desc.extmap_allow_mixed_enum());
|
|
}
|
|
|
|
TEST(MediaContentDescriptionTest, MixedOneTwoByteHeaderSupported) {
|
|
VideoContentDescription video_desc;
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kNo);
|
|
EXPECT_FALSE(video_desc.extmap_allow_mixed());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_TRUE(video_desc.extmap_allow_mixed());
|
|
video_desc.set_extmap_allow_mixed_enum(MediaContentDescription::kSession);
|
|
EXPECT_TRUE(video_desc.extmap_allow_mixed());
|
|
}
|
|
|
|
TEST(SessionDescriptionTest, SetExtmapAllowMixed) {
|
|
SessionDescription session_desc;
|
|
session_desc.set_extmap_allow_mixed(true);
|
|
EXPECT_TRUE(session_desc.extmap_allow_mixed());
|
|
session_desc.set_extmap_allow_mixed(false);
|
|
EXPECT_FALSE(session_desc.extmap_allow_mixed());
|
|
}
|
|
|
|
TEST(SessionDescriptionTest, SetExtmapAllowMixedPropagatesToMediaLevel) {
|
|
SessionDescription session_desc;
|
|
session_desc.AddContent("video", MediaProtocolType::kRtp,
|
|
std::make_unique<VideoContentDescription>());
|
|
MediaContentDescription* video_desc =
|
|
session_desc.GetContentDescriptionByName("video");
|
|
|
|
// Setting true on session level propagates to media level.
|
|
session_desc.set_extmap_allow_mixed(true);
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
|
|
// Don't downgrade from session level to media level
|
|
video_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
|
|
// Setting false on session level propagates to media level if the current
|
|
// state is kSession.
|
|
session_desc.set_extmap_allow_mixed(false);
|
|
EXPECT_EQ(MediaContentDescription::kNo,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
|
|
// Now possible to set at media level.
|
|
video_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
EXPECT_EQ(MediaContentDescription::kMedia,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
|
|
// Setting false on session level does not override on media level if current
|
|
// state is kMedia.
|
|
session_desc.set_extmap_allow_mixed(false);
|
|
EXPECT_EQ(MediaContentDescription::kMedia,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
|
|
// Setting true on session level overrides setting on media level.
|
|
session_desc.set_extmap_allow_mixed(true);
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
video_desc->extmap_allow_mixed_enum());
|
|
}
|
|
|
|
TEST(SessionDescriptionTest, AddContentTransfersExtmapAllowMixedSetting) {
|
|
SessionDescription session_desc;
|
|
session_desc.set_extmap_allow_mixed(false);
|
|
std::unique_ptr<MediaContentDescription> audio_desc =
|
|
std::make_unique<AudioContentDescription>();
|
|
audio_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
|
|
// If session setting is false, media level setting is preserved when new
|
|
// content is added.
|
|
session_desc.AddContent("audio", MediaProtocolType::kRtp,
|
|
std::move(audio_desc));
|
|
EXPECT_EQ(MediaContentDescription::kMedia,
|
|
session_desc.GetContentDescriptionByName("audio")
|
|
->extmap_allow_mixed_enum());
|
|
|
|
// If session setting is true, it's transferred to media level when new
|
|
// content is added.
|
|
session_desc.set_extmap_allow_mixed(true);
|
|
std::unique_ptr<MediaContentDescription> video_desc =
|
|
std::make_unique<VideoContentDescription>();
|
|
session_desc.AddContent("video", MediaProtocolType::kRtp,
|
|
std::move(video_desc));
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
session_desc.GetContentDescriptionByName("video")
|
|
->extmap_allow_mixed_enum());
|
|
|
|
// Session level setting overrides media level when new content is added.
|
|
std::unique_ptr<MediaContentDescription> data_desc =
|
|
std::make_unique<RtpDataContentDescription>();
|
|
data_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
|
|
session_desc.AddContent("data", MediaProtocolType::kRtp,
|
|
std::move(data_desc));
|
|
EXPECT_EQ(MediaContentDescription::kSession,
|
|
session_desc.GetContentDescriptionByName("data")
|
|
->extmap_allow_mixed_enum());
|
|
}
|
|
|
|
} // namespace cricket
|