Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
shaka-packager/packager/mpd/base/xml/xml_node_unittest.cc

548 lines
19 KiB
C++
Raw Normal View History

Add copyright information. The information is generated by Edwin's copyright.py script with some minor manual modifications. Chromium's original copyright notice is not replaced. Also add LICENSE file taken from https://sites.google.com/a/google.com/ospo/releasing#TOC-BSD-License Change-Id: I231f09af96a0a611b1ca81e95cab82e12d7f529b
2014-02-14 23:21:05 +00:00
// Copyright 2014 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
Remove "testing" from gtest/gmock include header This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: If23512c9e4a70462d70ff965e59339a33541746c
2014-08-21 22:40:44 +00:00
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
#include <gflags/gflags.h>
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
#include <gmock/gmock.h>
Remove "testing" from gtest/gmock include header This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: If23512c9e4a70462d70ff965e59339a33541746c
2014-08-21 22:40:44 +00:00
#include <gtest/gtest.h>
Use relative path for libxml and protobuf This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: Idcdf31a517e50a9a689794a665b3e5e7c05e6c1f
2014-08-28 18:35:15 +00:00
#include <libxml/tree.h>
Remove "testing" from gtest/gmock include header This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: If23512c9e4a70462d70ff965e59339a33541746c
2014-08-21 22:40:44 +00:00
MpdBuilder Live profile Add BandwidthEstimator to estimate the required bandwidth for the segments. Also includes unit test for the change. Change-Id: I28262424e2ed6ceebdf81e2b11dcd67feba1d68c
2014-05-22 02:16:17 +00:00
#include <list>
Add copyright information. The information is generated by Edwin's copyright.py script with some minor manual modifications. Chromium's original copyright notice is not replaced. Also add LICENSE file taken from https://sites.google.com/a/google.com/ospo/releasing#TOC-BSD-License Change-Id: I231f09af96a0a611b1ca81e95cab82e12d7f529b
2014-02-14 23:21:05 +00:00
Modify include headers to have "packager" in the path This is a follow up to previous CL. Generated using command: find {media,app,mpd} -type f -exec sed -r -i 's/#include "(.*)"/#include "packager\/\1"/' {} \; common.gypi and mpd.gyp are also modified to take the path change into consideration. Change-Id: I1fb102b4eb73ae5fde5f4ab303a12cec09b05c33
2014-10-01 22:10:21 +00:00
#include "packager/base/logging.h"
#include "packager/base/strings/string_util.h"
Move AdaptationSet, Representation out of mpd_builder.h Change-Id: I61fffb4d956f189b44c7537ddcf183bbf4129840
2017-12-13 01:26:37 +00:00
#include "packager/mpd/base/segment_info.h"
Modify include headers to have "packager" in the path This is a follow up to previous CL. Generated using command: find {media,app,mpd} -type f -exec sed -r -i 's/#include "(.*)"/#include "packager\/\1"/' {} \; common.gypi and mpd.gyp are also modified to take the path change into consideration. Change-Id: I1fb102b4eb73ae5fde5f4ab303a12cec09b05c33
2014-10-01 22:10:21 +00:00
#include "packager/mpd/base/xml/xml_node.h"
#include "packager/mpd/test/xml_compare.h"
Add unittest file for XmlNode Small coverage. Change-Id: I6053d82a0f9b1d391b4720c419ff7b3cbaa67ca8
2014-01-15 03:55:04 +00:00
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
DECLARE_bool(segment_template_constant_duration);
[DASH] Support signalling of last segment number (#713) Per https://dashif.org/docs/DASH-IF-IOP-v4.3.pdf 4.4.3.6 Signalling the last segment number in Period, there are three ways to signal the last segment number: a. Use the lmsg signalling as defined in clause 4.4.3.5. b. Use the Segment Timeline with @r value greater or equal to 0. c. Add a Supplemental Descriptor with @schemeIdUri set to http://dashif.org/guidelines/last-segment-number with the @value set to the last segment number. We do not support (a). This change adds support for (c) when Segment Timeline (b) is not used, i.e. when Representation has constant duration (could be approximate). Under flag --dash_add_last_segment_number_when_needed (disabled by default).
2020-02-25 07:12:53 +00:00
DECLARE_bool(dash_add_last_segment_number_when_needed);
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
using ::testing::ElementsAre;
Rename top level namespace to shaka Issue #103 Change-Id: I67945c8ec6d2c178494d3b5400e5ec0170e9d115
2016-05-20 21:19:33 +00:00
namespace shaka {
Add unittest file for XmlNode Small coverage. Change-Id: I6053d82a0f9b1d391b4720c419ff7b3cbaa67ca8
2014-01-15 03:55:04 +00:00
namespace xml {
namespace {
// Template so that it works for ContentProtectionXml and
// ContentProtectionXml::Element.
template <typename XmlElement>
void AddAttribute(const std::string& name,
const std::string& value,
XmlElement* content_protection_xml) {
MediaInfo::ContentProtectionXml::AttributeNameValuePair* attribute =
content_protection_xml->add_attributes();
attribute->set_name(name);
attribute->set_value(value);
}
} // namespace
XML compare function XML compare function for comparing a subset of MPD or the whole MPD. The children must appear in the same order but the order of attributes do not matter. Change existing tests to use XmlEqual() instead of string comparison. Change-Id: Ib7f80f52b5bed5b5f7c2517620c8955261a4b6a2
2014-04-12 01:23:20 +00:00
// Make sure XmlEqual() is functioning correctly.
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
// TODO(rkuroiwa): Move this to a separate file. This requires it to be TEST
MpdBuilder Live profile Add BandwidthEstimator to estimate the required bandwidth for the segments. Also includes unit test for the change. Change-Id: I28262424e2ed6ceebdf81e2b11dcd67feba1d68c
2014-05-22 02:16:17 +00:00
// due to gtest /test
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
TEST(XmlNodeTest, MetaTestXmlElementsEqual) {
XML compare function XML compare function for comparing a subset of MPD or the whole MPD. The children must appear in the same order but the order of attributes do not matter. Change existing tests to use XmlEqual() instead of string comparison. Change-Id: Ib7f80f52b5bed5b5f7c2517620c8955261a4b6a2
2014-04-12 01:23:20 +00:00
static const char kXml1[] =
"<A>\n"
" <B\n"
" c=\"1\""
" e=\"foobar\""
" somelongnameattribute=\"somevalue\">\n"
" <Bchild childvalue=\"3\"\n"
" f=\"4\"/>\n"
" </B>\n"
" <C />\n"
"</A>";
// This is same as kXml1 but the attributes are reordered. Note that the
// children are not reordered.
static const char kXml1AttributeReorder[] =
"<A>\n"
" <B\n"
" c=\"1\""
" somelongnameattribute=\"somevalue\"\n"
" e=\"foobar\">"
" <Bchild childvalue=\"3\"\n"
" f=\"4\"/>\n"
" </B>\n"
" <C />\n"
"</A>";
// <C> is before <B>.
static const char kXml1ChildrenReordered[] =
"<A>\n"
" <C />\n"
" <B\n"
" d=\"2\""
" c=\"1\""
" somelongnameattribute=\"somevalue\"\n"
" e=\"foobar\">"
" <Bchild childvalue=\"3\"\n"
" f=\"4\"/>\n"
" </B>\n"
"</A>";
// <C> is before <B>.
static const char kXml1RemovedAttributes[] =
"<A>\n"
" <B\n"
" d=\"2\"\n>"
" <Bchild f=\"4\"/>\n"
" </B>\n"
" <C />\n"
"</A>";
static const char kXml2[] =
"<A>\n"
" <C />\n"
"</A>";
// In XML <C />, <C></C>, and <C/> mean the same thing.
static const char kXml2DifferentSyntax[] =
"<A>\n"
" <C></C>\n"
"</A>";
static const char kXml2MoreDifferentSyntax[] =
"<A>\n"
" <C/>\n"
"</A>";
// Identity.
ASSERT_TRUE(XmlEqual(kXml1, kXml1));
// Equivalent.
ASSERT_TRUE(XmlEqual(kXml1, kXml1AttributeReorder));
ASSERT_TRUE(XmlEqual(kXml2, kXml2DifferentSyntax));
ASSERT_TRUE(XmlEqual(kXml2, kXml2MoreDifferentSyntax));
// Different.
ASSERT_FALSE(XmlEqual(kXml1, kXml2));
ASSERT_FALSE(XmlEqual(kXml1, kXml1ChildrenReordered));
ASSERT_FALSE(XmlEqual(kXml1, kXml1RemovedAttributes));
ASSERT_FALSE(XmlEqual(kXml1AttributeReorder, kXml1ChildrenReordered));
}
MpdBuilder should not automatically add ContentProtection elements - ContentProtection elements should be added explicitly by the AddContentProtection() methods. - This is because some MPDs should have ContentProtection at AdaptationSet level instead of Representation. - Change SimpleMpdNotifier, which uses MpdBuilder, to add ContentProtectionElements. The logic is moved from MuxerListener. - Add Element class for specifying subelements for ContentProtectionElement. Change-Id: I9bedfb3e5a5ac0b3d5c702f1e6e4a8608c978d1d
2015-07-15 21:57:47 +00:00
// Verify that if contents are different, XmlEqual returns false.
// This is to catch the case where just using xmlNodeGetContent() on elements
// that have subelements don't quite work well.
// xmlNodeGetContent(<A>) (for both <A>s) will return "content1content2".
// But if it is run on <B> for the first XML, it will return "content1", but
// for second XML will return "c".
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
TEST(XmlNodeTest, MetaTestXmlEqualDifferentContent) {
MpdBuilder should not automatically add ContentProtection elements - ContentProtection elements should be added explicitly by the AddContentProtection() methods. - This is because some MPDs should have ContentProtection at AdaptationSet level instead of Representation. - Change SimpleMpdNotifier, which uses MpdBuilder, to add ContentProtectionElements. The logic is moved from MuxerListener. - Add Element class for specifying subelements for ContentProtectionElement. Change-Id: I9bedfb3e5a5ac0b3d5c702f1e6e4a8608c978d1d
2015-07-15 21:57:47 +00:00
ASSERT_FALSE(XmlEqual(
"<A><B>content1</B><B>content2</B></A>",
"<A><B>c</B><B>ontent1content2</B></A>"));
}
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
TEST(XmlNodeTest, ExtractReferencedNamespaces) {
XmlNode grand_child_with_namespace("grand_ns:grand_child");
grand_child_with_namespace.SetContent("grand child content");
XmlNode child("child1");
child.SetContent("child1 content");
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(child.AddChild(std::move(grand_child_with_namespace)));
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
XmlNode child_with_namespace("child_ns:child2");
child_with_namespace.SetContent("child2 content");
XmlNode root("root");
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(root.AddChild(std::move(child)));
ASSERT_TRUE(root.AddChild(std::move(child_with_namespace)));
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
EXPECT_THAT(root.ExtractReferencedNamespaces(),
ElementsAre("child_ns", "grand_ns"));
}
TEST(XmlNodeTest, ExtractReferencedNamespacesFromAttributes) {
XmlNode child("child");
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(child.SetStringAttribute("child_attribute_ns:attribute",
"child attribute value"));
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
XmlNode root("root");
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(root.AddChild(std::move(child)));
ASSERT_TRUE(root.SetStringAttribute("root_attribute_ns:attribute",
"root attribute value"));
Put namespace URIs in DASH mpd only if needed Change-Id: I31284b665599a8ee8f0b1aa11b58d6797dbe2884
2018-09-18 19:05:11 +00:00
EXPECT_THAT(root.ExtractReferencedNamespaces(),
ElementsAre("child_attribute_ns", "root_attribute_ns"));
}
MpdBuilder should not automatically add ContentProtection elements - ContentProtection elements should be added explicitly by the AddContentProtection() methods. - This is because some MPDs should have ContentProtection at AdaptationSet level instead of Representation. - Change SimpleMpdNotifier, which uses MpdBuilder, to add ContentProtectionElements. The logic is moved from MuxerListener. - Add Element class for specifying subelements for ContentProtectionElement. Change-Id: I9bedfb3e5a5ac0b3d5c702f1e6e4a8608c978d1d
2015-07-15 21:57:47 +00:00
// Verify that AddContentProtectionElements work.
// xmlReadMemory() (used in XmlEqual()) doesn't like XML fragments that have
// namespaces without context, e.g. <cenc:pssh> element.
// The MpdBuilderTests work because the MPD element has xmlns:cenc attribute.
// Tests that have <cenc:pssh> is in mpd_builder_unittest.
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
TEST(XmlNodeTest, AddContentProtectionElements) {
MpdBuilder should not automatically add ContentProtection elements - ContentProtection elements should be added explicitly by the AddContentProtection() methods. - This is because some MPDs should have ContentProtection at AdaptationSet level instead of Representation. - Change SimpleMpdNotifier, which uses MpdBuilder, to add ContentProtectionElements. The logic is moved from MuxerListener. - Add Element class for specifying subelements for ContentProtectionElement. Change-Id: I9bedfb3e5a5ac0b3d5c702f1e6e4a8608c978d1d
2015-07-15 21:57:47 +00:00
std::list<ContentProtectionElement> content_protections;
ContentProtectionElement content_protection_widevine;
content_protection_widevine.scheme_id_uri =
"urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed";
content_protection_widevine.value = "SOME bogus Widevine DRM version";
Element any_element;
any_element.name = "AnyElement";
any_element.content = "any content";
content_protection_widevine.subelements.push_back(any_element);
content_protections.push_back(content_protection_widevine);
ContentProtectionElement content_protection_clearkey;
content_protection_clearkey.scheme_id_uri =
"urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b";
content_protections.push_back(content_protection_clearkey);
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddContentProtectionElements(content_protections));
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
XmlNodeEqual(
"<Representation>\n"
" <ContentProtection\n"
" schemeIdUri=\"urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed\"\n"
" value=\"SOME bogus Widevine DRM version\">\n"
" <AnyElement>any content</AnyElement>\n"
" </ContentProtection>\n"
" <ContentProtection\n"
" schemeIdUri=\"urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b\">"
" </ContentProtection>\n"
"</Representation>"));
Add unittest file for XmlNode Small coverage. Change-Id: I6053d82a0f9b1d391b4720c419ff7b3cbaa67ca8
2014-01-15 03:55:04 +00:00
}
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
TEST(XmlNodeTest, AddEC3AudioInfo) {
MPD signaling for Dolby Enhanced AC3 audio. Parse channel layout value from dec3 box. Pass it through audio stream info. MPD builder forms audio channel configuration to signal ec-3 codec. Specs: 1) ETSI TS 102 366 V1.3.1 Digital Audio Compression (AC-3, Enhanced AC-3) Standard E.1.3.1.8. 2) DASH-IF Interoperability Points v3.0 9.2.1.2. Issue #64 Change-Id: Ia2c22dd3d82e757ba5a88ba1de35c5d593f5005e
2016-02-09 00:22:01 +00:00
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ec-3");
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
audio_info.set_sampling_frequency(48000);
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
audio_info.mutable_codec_specific_data()->set_channel_mask(0xF801);
audio_info.mutable_codec_specific_data()->set_channel_mpeg_value(
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
0xFFFFFFFF);
MPD signaling for Dolby Enhanced AC3 audio. Parse channel layout value from dec3 box. Pass it through audio stream info. MPD builder forms audio channel configuration to signal ec-3 codec. Specs: 1) ETSI TS 102 366 V1.3.1 Digital Audio Compression (AC-3, Enhanced AC-3) Standard E.1.3.1.8. 2) DASH-IF Interoperability Points v3.0 9.2.1.2. Issue #64 Change-Id: Ia2c22dd3d82e757ba5a88ba1de35c5d593f5005e
2016-02-09 00:22:01 +00:00
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
XmlNodeEqual(
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
"<Representation audioSamplingRate=\"48000\">\n"
Clean up mpd_unittest Added gMock matchers for matching xmlNodePtr and its attributes. Clean up mpd_unittests to make it easier to separate adaptation set tests and representation tests. Change-Id: I31816b06e9c76f92d4a82656c659f3b9acae8cb5
2017-12-14 06:33:47 +00:00
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"tag:dolby.com,2014:dash:audio_channel_configuration:2011\"\n"
" value=\"F801\"/>\n"
"</Representation>\n"));
MPD signaling for Dolby Enhanced AC3 audio. Parse channel layout value from dec3 box. Pass it through audio stream info. MPD builder forms audio channel configuration to signal ec-3 codec. Specs: 1) ETSI TS 102 366 V1.3.1 Digital Audio Compression (AC-3, Enhanced AC-3) Standard E.1.3.1.8. 2) DASH-IF Interoperability Points v3.0 9.2.1.2. Issue #64 Change-Id: Ia2c22dd3d82e757ba5a88ba1de35c5d593f5005e
2016-02-09 00:22:01 +00:00
}
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
TEST(XmlNodeTest, AddEC3AudioInfoMPEGScheme) {
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ec-3");
audio_info.set_sampling_frequency(48000);
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
audio_info.mutable_codec_specific_data()->set_channel_mask(0xF801);
audio_info.mutable_codec_specific_data()->set_channel_mpeg_value(6);
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
EXPECT_THAT(representation,
XmlNodeEqual("<Representation audioSamplingRate=\"48000\">\n"
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"urn:mpeg:mpegB:cicp:ChannelConfiguration\"\n"
" value=\"6\"/>\n"
"</Representation>\n"));
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
}
TEST(XmlNodeTest, AddEC3AudioInfoMPEGSchemeJOC) {
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ec-3");
audio_info.set_sampling_frequency(48000);
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
audio_info.mutable_codec_specific_data()->set_channel_mask(0xF801);
audio_info.mutable_codec_specific_data()->set_channel_mpeg_value(6);
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
audio_info.mutable_codec_specific_data()->set_ec3_joc_complexity(16);
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Support DD+JOC in DASH and HLS (#775) Spec: ETSI TS 102 366 V1.4.1 HLS: https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendices DASH: https://github.com/Dash-Industry-Forum/DASH-IF-IOP/issues/268 Closes #753.
2020-06-04 05:02:49 +00:00
XmlNodeEqual(
"<Representation audioSamplingRate=\"48000\">\n"
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"urn:mpeg:mpegB:cicp:ChannelConfiguration\"\n"
" value=\"6\"/>\n"
" <SupplementalProperty\n"
" schemeIdUri=\n"
" \"tag:dolby.com,2018:dash:EC3_ExtensionType:2018\"\n"
" value=\"JOC\"/>\n"
" <SupplementalProperty\n"
" schemeIdUri=\n"
" \"tag:dolby.com,2018:dash:EC3_ExtensionComplexityIndex:2018\"\n"
" value=\"16\"/>\n"
"</Representation>\n"));
}
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
TEST(XmlNodeTest, AddAC4AudioInfo) {
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ac-4.02.01.02");
audio_info.set_sampling_frequency(48000);
auto* codec_data = audio_info.mutable_codec_specific_data();
codec_data->set_channel_mpeg_value(0xFFFFFFFF);
codec_data->set_channel_mask(0x0000C7);
codec_data->set_ac4_ims_flag(false);
codec_data->set_ac4_cbi_flag(false);
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
XmlNodeEqual(
"<Representation audioSamplingRate=\"48000\">\n"
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"tag:dolby.com,2015:dash:audio_channel_configuration:2015\"\n"
" value=\"0000C7\"/>\n"
"</Representation>\n"));
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
}
TEST(XmlNodeTest, AddAC4AudioInfoMPEGScheme) {
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ac-4.02.01.00");
audio_info.set_sampling_frequency(48000);
auto* codec_data = audio_info.mutable_codec_specific_data();
codec_data->set_channel_mpeg_value(2);
codec_data->set_channel_mask(0x000001);
codec_data->set_ac4_ims_flag(false);
codec_data->set_ac4_cbi_flag(false);
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
EXPECT_THAT(representation,
XmlNodeEqual("<Representation audioSamplingRate=\"48000\">\n"
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"urn:mpeg:mpegB:cicp:ChannelConfiguration\"\n"
" value=\"2\"/>\n"
"</Representation>\n"));
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
}
TEST(XmlNodeTest, AddAC4AudioInfoMPEGSchemeIMS) {
MediaInfo::AudioInfo audio_info;
audio_info.set_codec("ac-4.02.02.00");
audio_info.set_sampling_frequency(48000);
auto* codec_data = audio_info.mutable_codec_specific_data();
codec_data->set_channel_mpeg_value(2);
codec_data->set_channel_mask(0x000001);
codec_data->set_ac4_ims_flag(true);
codec_data->set_ac4_cbi_flag(false);
RepresentationXmlNode representation;
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
ASSERT_TRUE(representation.AddAudioInfo(audio_info));
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
XmlNodeEqual("<Representation audioSamplingRate=\"48000\">\n"
" <AudioChannelConfiguration\n"
" schemeIdUri=\n"
" \"urn:mpeg:mpegB:cicp:ChannelConfiguration\"\n"
" value=\"2\"/>\n"
" <SupplementalProperty\n"
" schemeIdUri=\n"
" \"tag:dolby.com,2016:dash:virtualized_content:2016\"\n"
" value=\"1\"/>\n"
"</Representation>\n"));
Added AC-4 codec support (#795) Closes #754.
2020-07-04 21:55:28 +00:00
}
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
class LiveSegmentTimelineTest : public ::testing::Test {
protected:
void SetUp() override {
FLAGS_segment_template_constant_duration = true;
media_info_.set_segment_template_url("$Number$.m4s");
}
void TearDown() override { FLAGS_segment_template_constant_duration = false; }
MediaInfo media_info_;
};
TEST_F(LiveSegmentTimelineTest, OneSegmentInfo) {
const uint32_t kStartNumber = 1;
const uint64_t kStartTime = 0;
const uint64_t kDuration = 100;
const uint64_t kRepeat = 9;
std::list<SegmentInfo> segment_infos = {
{kStartTime, kDuration, kRepeat},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual("<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" "
" startNumber=\"1\" duration=\"100\"/>"
"</Representation>"));
}
TEST_F(LiveSegmentTimelineTest, OneSegmentInfoNonZeroStartTime) {
const uint32_t kStartNumber = 1;
const uint64_t kNonZeroStartTime = 500;
const uint64_t kDuration = 100;
const uint64_t kRepeat = 9;
std::list<SegmentInfo> segment_infos = {
{kNonZeroStartTime, kDuration, kRepeat},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
EXPECT_THAT(representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual(
"<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" startNumber=\"1\">"
" <SegmentTimeline>"
" <S t=\"500\" d=\"100\" r=\"9\"/>"
" </SegmentTimeline>"
" </SegmentTemplate>"
"</Representation>"));
}
TEST_F(LiveSegmentTimelineTest, OneSegmentInfoMatchingStartTimeAndNumber) {
const uint32_t kStartNumber = 6;
const uint64_t kNonZeroStartTime = 500;
const uint64_t kDuration = 100;
const uint64_t kRepeat = 9;
std::list<SegmentInfo> segment_infos = {
{kNonZeroStartTime, kDuration, kRepeat},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual("<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" "
" startNumber=\"6\" duration=\"100\"/>"
"</Representation>"));
}
TEST_F(LiveSegmentTimelineTest, AllSegmentsSameDurationExpectLastOne) {
const uint32_t kStartNumber = 1;
const uint64_t kStartTime1 = 0;
const uint64_t kDuration1 = 100;
const uint64_t kRepeat1 = 9;
const uint64_t kStartTime2 = kStartTime1 + (kRepeat1 + 1) * kDuration1;
const uint64_t kDuration2 = 200;
const uint64_t kRepeat2 = 0;
std::list<SegmentInfo> segment_infos = {
{kStartTime1, kDuration1, kRepeat1},
{kStartTime2, kDuration2, kRepeat2},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
EXPECT_THAT(
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual("<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" "
" startNumber=\"1\" duration=\"100\"/>"
"</Representation>"));
}
TEST_F(LiveSegmentTimelineTest, SecondSegmentInfoNonZeroRepeat) {
const uint32_t kStartNumber = 1;
const uint64_t kStartTime1 = 0;
const uint64_t kDuration1 = 100;
const uint64_t kRepeat1 = 9;
const uint64_t kStartTime2 = kStartTime1 + (kRepeat1 + 1) * kDuration1;
const uint64_t kDuration2 = 200;
const uint64_t kRepeat2 = 1;
std::list<SegmentInfo> segment_infos = {
{kStartTime1, kDuration1, kRepeat1},
{kStartTime2, kDuration2, kRepeat2},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
EXPECT_THAT(representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual(
"<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" startNumber=\"1\">"
" <SegmentTimeline>"
" <S t=\"0\" d=\"100\" r=\"9\"/>"
" <S t=\"1000\" d=\"200\" r=\"1\"/>"
" </SegmentTimeline>"
" </SegmentTemplate>"
"</Representation>"));
}
TEST_F(LiveSegmentTimelineTest, TwoSegmentInfoWithGap) {
const uint32_t kStartNumber = 1;
const uint64_t kStartTime1 = 0;
const uint64_t kDuration1 = 100;
const uint64_t kRepeat1 = 9;
const uint64_t kGap = 100;
const uint64_t kStartTime2 = kGap + kStartTime1 + (kRepeat1 + 1) * kDuration1;
const uint64_t kDuration2 = 200;
const uint64_t kRepeat2 = 0;
std::list<SegmentInfo> segment_infos = {
{kStartTime1, kDuration1, kRepeat1},
{kStartTime2, kDuration2, kRepeat2},
};
RepresentationXmlNode representation;
ASSERT_TRUE(
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
EXPECT_THAT(representation,
Support approximate SegmentTimeline It is not always possible to align segment duration to target duration exactly. For example, for AAC with sampling rate of 44100, there are always 1024 audio frames per sample, so the sample duration is 1024/44100. For a target duration of 2 seconds, the closest segment duration would be 1.984 or 2.00533. This feature allows MPD generator to treat these segments as having the same duration, thus allows MPD generator to generate less SegmentTimeline entries and potentially no SegmentTimeline entries (replaced with SegmentTemplate@duration instead if --segment_template_constant_duration flag is enabled). Under flag --allow_approximate_segment_timeline. Disabled by default. Fixes #330. Change-Id: I5044eaa348ebbf45bf792a2af53fc95a115ae21b
2017-09-25 19:18:50 +00:00
XmlNodeEqual(
"<Representation>"
" <SegmentTemplate media=\"$Number$.m4s\" startNumber=\"1\">"
" <SegmentTimeline>"
" <S t=\"0\" d=\"100\" r=\"9\"/>"
" <S t=\"1100\" d=\"200\"/>"
" </SegmentTimeline>"
" </SegmentTemplate>"
"</Representation>"));
}
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
TEST_F(LiveSegmentTimelineTest, LastSegmentNumberSupplementalProperty) {
const uint32_t kStartNumber = 1;
const uint64_t kStartTime = 0;
const uint64_t kDuration = 100;
const uint64_t kRepeat = 9;
std::list<SegmentInfo> segment_infos = {
{kStartTime, kDuration, kRepeat},
};
RepresentationXmlNode representation;
FLAGS_dash_add_last_segment_number_when_needed = true;
ASSERT_TRUE(
[DASH] Support signalling of last segment number (#713) Per https://dashif.org/docs/DASH-IF-IOP-v4.3.pdf 4.4.3.6 Signalling the last segment number in Period, there are three ways to signal the last segment number: a. Use the lmsg signalling as defined in clause 4.4.3.5. b. Use the Segment Timeline with @r value greater or equal to 0. c. Add a Supplemental Descriptor with @schemeIdUri set to http://dashif.org/guidelines/last-segment-number with the @value set to the last segment number. We do not support (a). This change adds support for (c) when Segment Timeline (b) is not used, i.e. when Representation has constant duration (could be approximate). Under flag --dash_add_last_segment_number_when_needed (disabled by default).
2020-02-25 07:12:53 +00:00
representation.AddLiveOnlyInfo(media_info_, segment_infos, kStartNumber));
Refactor XmlNode and libxml usages. - Use std::move to transfer ownership. - Avoid libxml primitives outside XmlNode. - Have attribute setting return errors. - Mark bool returns with WARN_UNUSED_RESULTS and use return value. - Use std::string over char*. Change-Id: Ia00bb29c690025275e270f10e5c065722481c0c5
2020-11-10 00:32:58 +00:00
EXPECT_THAT(
representation,
XmlNodeEqual("<Representation>"
"<SupplementalProperty schemeIdUri=\"http://dashif.org/"
"guidelines/last-segment-number\" value=\"10\"/>"
" <SegmentTemplate media=\"$Number$.m4s\" "
" startNumber=\"1\" duration=\"100\"/>"
"</Representation>"));
FLAGS_dash_add_last_segment_number_when_needed = false;
}
[DASH] Support signalling of last segment number (#713) Per https://dashif.org/docs/DASH-IF-IOP-v4.3.pdf 4.4.3.6 Signalling the last segment number in Period, there are three ways to signal the last segment number: a. Use the lmsg signalling as defined in clause 4.4.3.5. b. Use the Segment Timeline with @r value greater or equal to 0. c. Add a Supplemental Descriptor with @schemeIdUri set to http://dashif.org/guidelines/last-segment-number with the @value set to the last segment number. We do not support (a). This change adds support for (c) when Segment Timeline (b) is not used, i.e. when Representation has constant duration (could be approximate). Under flag --dash_add_last_segment_number_when_needed (disabled by default).
2020-02-25 07:12:53 +00:00
Add unittest file for XmlNode Small coverage. Change-Id: I6053d82a0f9b1d391b4720c419ff7b3cbaa67ca8
2014-01-15 03:55:04 +00:00
} // namespace xml
Rename top level namespace to shaka Issue #103 Change-Id: I67945c8ec6d2c178494d3b5400e5ec0170e9d115
2016-05-20 21:19:33 +00:00
} // namespace shaka