Skip to content

Fix SDP validating against media_type constraint #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lo-simon merged 9 commits into from
Feb 8, 2022
Merged

Fix SDP validating against media_type constraint #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c600f6c
Fix SDP validating against media_type constraint
N-Nagorny Feb 3, 2022
75fbcd8
Add BST_REQUIRE_NO_THROW etc.
garethsb Feb 3, 2022
23d281e
Add test case for nmos::validate_sdp_parameters
garethsb Feb 3, 2022
eee03d0
Fix defaulting of rtpmap <encoding-parameters> for non-audio media types
garethsb Feb 3, 2022
e6f1b40
Handle TCS default of SDR and be lenient in handling omitted ptime/ma…
garethsb Feb 3, 2022
5ad5d01
Tiny usability tweak to nmos::string_enum so we can test emptiness di…
garethsb Feb 4, 2022
c811a89
max_packet_time constraint can now be enabled since commit e6f1b4038f…
garethsb Feb 5, 2022
9b10dba
Parameter constraints for which validation isn't implemented are ignored
garethsb Feb 6, 2022
9d00c35
Adding more comments following code review with @lo-simon
garethsb Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Development/bst/test/detail/boost_1_57_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ PRAGMA_WARNING_POP
#define BST_CHECK_GT(expected, actual) BOOST_CHECK_GT(expected, actual)
#define BST_CHECK_GE(expected, actual) BOOST_CHECK_GE(expected, actual)
#define BST_CHECK_THROW(expr, exception) BOOST_CHECK_THROW(expr, exception)
#define BST_CHECK_NO_THROW(expr) BOOST_CHECK_NO_THROW(expr)
#define BST_REQUIRE(expr) BOOST_REQUIRE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) BOOST_REQUIRE_EQUAL(expected, actual)
#define BST_REQUIRE_NE(expected, actual) BOOST_REQUIRE_NE(expected, actual)
Expand All @@ -59,13 +60,16 @@ PRAGMA_WARNING_POP
#define BST_REQUIRE_GT(expected, actual) BOOST_REQUIRE_GT(expected, actual)
#define BST_REQUIRE_GE(expected, actual) BOOST_REQUIRE_GE(expected, actual)
#define BST_REQUIRE_THROW(expr, exception) BOOST_REQUIRE_THROW(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) BOOST_REQUIRE_NO_THROW(expr)
#define BST_WARN(expr) BOOST_WARN(expr)
#define BST_WARN_EQUAL(expected, actual) BOOST_WARN_EQUAL(expected, actual)
#define BST_WARN_NE(expected, actual) BOOST_WARN_NE(expected, actual)
#define BST_WARN_LT(expected, actual) BOOST_WARN_LT(expected, actual)
#define BST_WARN_LE(expected, actual) BOOST_WARN_LE(expected, actual)
#define BST_WARN_GT(expected, actual) BOOST_WARN_GT(expected, actual)
#define BST_WARN_GE(expected, actual) BOOST_WARN_GE(expected, actual)
#define BST_WARN_THROW(expr, exception) BOOST_WARN_THROW(expr, exception)
#define BST_WARN_NO_THROW(expr) BOOST_WARN_NO_THROW(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
#define BST_CHECK_STRING_EQUAL(expected, actual) BOOST_CHECK_EQUAL(expected, actual)
Expand Down
4 changes: 4 additions & 0 deletions Development/bst/test/detail/boost_1_65_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ do {
#define BST_CHECK_GT(expected, actual) BOOST_CHECK_GT(expected, actual)
#define BST_CHECK_GE(expected, actual) BOOST_CHECK_GE(expected, actual)
#define BST_CHECK_THROW(expr, exception) BOOST_CHECK_THROW(expr, exception)
#define BST_CHECK_NO_THROW(expr) BOOST_CHECK_NO_THROW(expr)
#define BST_REQUIRE(expr) BOOST_REQUIRE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) BOOST_REQUIRE_EQUAL(expected, actual)
#define BST_REQUIRE_NE(expected, actual) BOOST_REQUIRE_NE(expected, actual)
Expand All @@ -64,13 +65,16 @@ do {
#define BST_REQUIRE_GT(expected, actual) BOOST_REQUIRE_GT(expected, actual)
#define BST_REQUIRE_GE(expected, actual) BOOST_REQUIRE_GE(expected, actual)
#define BST_REQUIRE_THROW(expr, exception) BOOST_REQUIRE_THROW(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) BOOST_REQUIRE_NO_THROW(expr)
#define BST_WARN(expr) BOOST_WARN(expr)
#define BST_WARN_EQUAL(expected, actual) BOOST_WARN_EQUAL(expected, actual)
#define BST_WARN_NE(expected, actual) BOOST_WARN_NE(expected, actual)
#define BST_WARN_LT(expected, actual) BOOST_WARN_LT(expected, actual)
#define BST_WARN_LE(expected, actual) BOOST_WARN_LE(expected, actual)
#define BST_WARN_GT(expected, actual) BOOST_WARN_GT(expected, actual)
#define BST_WARN_GE(expected, actual) BOOST_WARN_GE(expected, actual)
#define BST_WARN_THROW(expr, exception) BOOST_WARN_THROW(expr, exception)
#define BST_WARN_NO_THROW(expr) BOOST_WARN_NO_THROW(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
#define BST_CHECK_STRING_EQUAL(expected, actual) BOOST_CHECK_EQUAL(expected, actual)
Expand Down
8 changes: 8 additions & 0 deletions Development/bst/test/detail/catch-1.0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ PRAGMA_WARNING_POP
#define CATCH_CHECK_CATCH_AS( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )
#define CATCH_CHECK_CATCH_AS_NOFAIL( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )

#define CATCH_CHECK_THROWS_NOFAIL( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_THROWS_NOFAIL" )
#define CATCH_CHECK_THROWS_AS_NOFAIL( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_THROWS_AS_NOFAIL" )
#define CATCH_CHECK_NOTHROW_NOFAIL( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CATCH_CHECK_NOTHROW_NOFAIL" )

// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
#else
Expand All @@ -66,7 +68,9 @@ PRAGMA_WARNING_POP
#define CHECK_CATCH_AS( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )
#define CHECK_CATCH_AS_NOFAIL( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )

#define CHECK_THROWS_NOFAIL( expr ) INTERNAL_CATCH_THROWS( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_THROWS_NOFAIL" )
#define CHECK_THROWS_AS_NOFAIL( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( expr, exceptionType, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_THROWS_AS_NOFAIL" )
#define CHECK_NOTHROW_NOFAIL( expr ) INTERNAL_CATCH_NO_THROW( expr, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "CHECK_NOTHROW_NOFAIL" )

#endif
//- Break INTERNAL_CATCH_THROWS_AS in two so the statement can contain commas, etc.
Expand Down Expand Up @@ -222,6 +226,7 @@ PRAGMA_WARNING_POP
#define BST_CHECK_GT(expected, actual) CATCH_CHECK((expected) > (actual))
#define BST_CHECK_GE(expected, actual) CATCH_CHECK((expected) >= (actual))
#define BST_CHECK_THROW(expr, exception) CATCH_CHECK_THROWS_AS(expr, exception)
#define BST_CHECK_NO_THROW(expr) CATCH_CHECK_NOTHROW(expr)
#define BST_REQUIRE(expr) CATCH_REQUIRE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) CATCH_REQUIRE((expected) == (actual))
#define BST_REQUIRE_NE(expected, actual) CATCH_REQUIRE((expected) != (actual))
Expand All @@ -230,13 +235,16 @@ PRAGMA_WARNING_POP
#define BST_REQUIRE_GT(expected, actual) CATCH_REQUIRE((expected) > (actual))
#define BST_REQUIRE_GE(expected, actual) CATCH_REQUIRE((expected) >= (actual))
#define BST_REQUIRE_THROW(expr, exception) CATCH_REQUIRE_THROWS_AS(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) CATCH_REQUIRE_NOTHROW(expr)
#define BST_WARN(expr) CATCH_CHECK_NOFAIL(expr)
#define BST_WARN_EQUAL(expected, actual) CATCH_CHECK_NOFAIL((expected) == (actual))
#define BST_WARN_NE(expected, actual) CATCH_CHECK_NOFAIL((expected) != (actual))
#define BST_WARN_LT(expected, actual) CATCH_CHECK_NOFAIL((expected) < (actual))
#define BST_WARN_LE(expected, actual) CATCH_CHECK_NOFAIL((expected) <= (actual))
#define BST_WARN_GT(expected, actual) CATCH_CHECK_NOFAIL((expected) > (actual))
#define BST_WARN_GE(expected, actual) CATCH_CHECK_NOFAIL((expected) >= (actual))
#define BST_WARN_THROW(expr, exception) CATCH_CHECK_THROWS_AS_NOFAIL(expr, exception)
#define BST_WARN_NO_THROW(expr) CATCH_CHECK_NOTHROW_NOFAIL(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
namespace bst_test_detail
Expand Down
8 changes: 8 additions & 0 deletions Development/bst/test/detail/catch-1.10.0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ PRAGMA_WARNING_POP
#define CATCH_CHECK_CATCH_AS( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )
#define CATCH_CHECK_CATCH_AS_NOFAIL( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )

#define CATCH_CHECK_THROWS_NOFAIL( expr ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "", expr )
#define CATCH_CHECK_THROWS_AS_NOFAIL( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS_NOFAIL", exceptionType, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )
#define CATCH_CHECK_NOTHROW_NOFAIL( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )

// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
#else
Expand All @@ -66,7 +68,9 @@ PRAGMA_WARNING_POP
#define CHECK_CATCH_AS( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )
#define CHECK_CATCH_AS_NOFAIL( exceptionType ) INTERNAL_CATCH_CATCH_AS( exceptionType )

#define CHECK_THROWS_NOFAIL( expr ) INTERNAL_CATCH_THROWS( "CHECK_THROWS_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, "", expr )
#define CHECK_THROWS_AS_NOFAIL( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS_NOFAIL", exceptionType, Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )
#define CHECK_NOTHROW_NOFAIL( expr ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )

#endif
//- Break INTERNAL_CATCH_THROWS_AS in two so the statement can contain commas, etc.
Expand Down Expand Up @@ -231,6 +235,7 @@ PRAGMA_WARNING_POP
#define BST_CHECK_GT(expected, actual) CATCH_CHECK((expected) > (actual))
#define BST_CHECK_GE(expected, actual) CATCH_CHECK((expected) >= (actual))
#define BST_CHECK_THROW(expr, exception) CATCH_CHECK_THROWS_AS(expr, exception)
#define BST_CHECK_NO_THROW(expr) CATCH_CHECK_NOTHROW(expr)
#define BST_REQUIRE(expr) CATCH_REQUIRE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) CATCH_REQUIRE((expected) == (actual))
#define BST_REQUIRE_NE(expected, actual) CATCH_REQUIRE((expected) != (actual))
Expand All @@ -239,13 +244,16 @@ PRAGMA_WARNING_POP
#define BST_REQUIRE_GT(expected, actual) CATCH_REQUIRE((expected) > (actual))
#define BST_REQUIRE_GE(expected, actual) CATCH_REQUIRE((expected) >= (actual))
#define BST_REQUIRE_THROW(expr, exception) CATCH_REQUIRE_THROWS_AS(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) CATCH_REQUIRE_NOTHROW(expr)
#define BST_WARN(expr) CATCH_CHECK_NOFAIL(expr)
#define BST_WARN_EQUAL(expected, actual) CATCH_CHECK_NOFAIL((expected) == (actual))
#define BST_WARN_NE(expected, actual) CATCH_CHECK_NOFAIL((expected) != (actual))
#define BST_WARN_LT(expected, actual) CATCH_CHECK_NOFAIL((expected) < (actual))
#define BST_WARN_LE(expected, actual) CATCH_CHECK_NOFAIL((expected) <= (actual))
#define BST_WARN_GT(expected, actual) CATCH_CHECK_NOFAIL((expected) > (actual))
#define BST_WARN_GE(expected, actual) CATCH_CHECK_NOFAIL((expected) >= (actual))
#define BST_WARN_THROW(expr, exception) CATCH_CHECK_THROWS_AS_NOFAIL(expr, exception)
#define BST_WARN_NO_THROW(expr) CATCH_CHECK_NOTHROW_NOFAIL(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
namespace bst_test_detail
Expand Down
4 changes: 4 additions & 0 deletions Development/bst/test/detail/googletest-release-1.7.0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#define BST_CHECK_GT(expected, actual) EXPECT_GT(expected, actual)
#define BST_CHECK_GE(expected, actual) EXPECT_GE(expected, actual)
#define BST_CHECK_THROW(expr, exception) EXPECT_THROW(expr, exception)
#define BST_CHECK_NO_THROW(expr) EXPECT_NO_THROW(expr)
#define BST_REQUIRE(expr) ASSERT_TRUE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) ASSERT_EQ(expected, actual)
#define BST_REQUIRE_NE(expected, actual) ASSERT_NE(expected, actual)
Expand All @@ -94,6 +95,7 @@
#define BST_REQUIRE_GT(expected, actual) ASSERT_GT(expected, actual)
#define BST_REQUIRE_GE(expected, actual) ASSERT_GE(expected, actual)
#define BST_REQUIRE_THROW(expr, exception) ASSERT_THROW(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) ASSERT_NO_THROW(expr)
// Hmm, Google Test doesn't have the equivalent of WARN?
#define BST_WARN(expr) EXPECT_TRUE(expr)
#define BST_WARN_EQUAL(expected, actual) EXPECT_EQ(expected, actual)
Expand All @@ -102,6 +104,8 @@
#define BST_WARN_LE(expected, actual) EXPECT_LE(expected, actual)
#define BST_WARN_GT(expected, actual) EXPECT_GT(expected, actual)
#define BST_WARN_GE(expected, actual) EXPECT_GE(expected, actual)
#define BST_WARN_THROW(expr, exception) EXPECT_THROW(expr, exception)
#define BST_WARN_NO_THROW(expr) EXPECT_NO_THROW(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
namespace bst_test_detail
Expand Down
4 changes: 4 additions & 0 deletions Development/bst/test/detail/googletest-release-1.8.0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
#define BST_CHECK_GT(expected, actual) EXPECT_GT(expected, actual)
#define BST_CHECK_GE(expected, actual) EXPECT_GE(expected, actual)
#define BST_CHECK_THROW(expr, exception) EXPECT_THROW(expr, exception)
#define BST_CHECK_NO_THROW(expr) EXPECT_NO_THROW(expr)
#define BST_REQUIRE(expr) ASSERT_TRUE(expr)
#define BST_REQUIRE_EQUAL(expected, actual) ASSERT_EQ(expected, actual)
#define BST_REQUIRE_NE(expected, actual) ASSERT_NE(expected, actual)
Expand All @@ -95,6 +96,7 @@
#define BST_REQUIRE_GT(expected, actual) ASSERT_GT(expected, actual)
#define BST_REQUIRE_GE(expected, actual) ASSERT_GE(expected, actual)
#define BST_REQUIRE_THROW(expr, exception) ASSERT_THROW(expr, exception)
#define BST_REQUIRE_NO_THROW(expr) ASSERT_NO_THROW(expr)
// Hmm, Google Test doesn't have the equivalent of WARN?
#define BST_WARN(expr) EXPECT_TRUE(expr)
#define BST_WARN_EQUAL(expected, actual) EXPECT_EQ(expected, actual)
Expand All @@ -103,6 +105,8 @@
#define BST_WARN_LE(expected, actual) EXPECT_LE(expected, actual)
#define BST_WARN_GT(expected, actual) EXPECT_GT(expected, actual)
#define BST_WARN_GE(expected, actual) EXPECT_GE(expected, actual)
#define BST_WARN_THROW(expr, exception) EXPECT_THROW(expr, exception)
#define BST_WARN_NO_THROW(expr) EXPECT_NO_THROW(expr)

// Explicit STRING macros to work around the different behaviours of the frameworks when comparing two char* or wchar_t*
namespace bst_test_detail
Expand Down
1 change: 1 addition & 0 deletions Development/cmake/NmosCppLibraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ set(NMOS_CPP_NMOS_HEADERS
nmos/slog.h
nmos/ssl_context_options.h
nmos/string_enum.h
nmos/string_enum_fwd.h
nmos/system_api.h
nmos/system_resources.h
nmos/tai.h
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/channelmapping_resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace nmos
using web::json::value;
using web::json::value_of;

const bool empty = id.empty() || type.name.empty();
const bool empty = id.empty() || type.empty();
return value_of({
{ nmos::fields::id, empty ? value::null() : value::string(id) },
{ nmos::fields::type, empty ? value::null() : value::string(type.name) }
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/components.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace nmos
make_component(component_names::B, frame_width, frame_height, bit_depth)
});
case YCbCr422:
return value_of({
return value_of({
make_component(component_names::Y, frame_width, frame_height, bit_depth),
make_component(component_names::Cb, frame_width / 2, frame_height, bit_depth),
make_component(component_names::Cr, frame_width / 2, frame_height, bit_depth)
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/group_hint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace nmos
{
utility::string_t make_group_hint(const group_hint& group_hint)
{
return group_hint.optional_group_scope.name.empty()
return group_hint.optional_group_scope.empty()
? group_hint.group_name + U(':') + group_hint.role_in_group
: group_hint.group_name + U(':') + group_hint.role_in_group + U(':') + group_hint.optional_group_scope.name;
}
Expand Down
4 changes: 2 additions & 2 deletions Development/nmos/node_resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ namespace nmos
data[U("caps")] = value::object();
data[U("device_id")] = value::string(device_id);
data[U("parents")] = value::array();
data[U("clock_name")] = !clk.name.empty() ? value::string(clk.name) : value::null();
data[U("clock_name")] = !clk.empty() ? value::string(clk.name) : value::null();

return{ is04_versions::v1_3, types::source, std::move(data), false };
}
Expand Down Expand Up @@ -406,7 +406,7 @@ namespace nmos

data[U("format")] = value::string(nmos::formats::data.name);
data[U("media_type")] = value::string(nmos::media_types::application_json.name);
if (!event_type.name.empty())
if (!event_type.empty())
{
data[U("event_type")] = value::string(event_type.name);
}
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/query_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ namespace nmos

href_type = fields.end() != field ? field->second : nmos::type{};
}
else if (href_type.name.empty())
else if (href_type.empty())
{
assign(std::move(value));
}
Expand Down
Loading