From b36515ee1746aeb7eba8005eb02c48eba2a967c8 Mon Sep 17 00:00:00 2001 From: Wolfgang Schildbach Date: Tue, 11 Feb 2025 22:28:26 +0100 Subject: [PATCH 1/2] convert reports into asserts Only the assert messages are parsed out of the schematron output, so all report messages were effectively muted. Fix this. --- DASH/mpdvalidator/schematron/ac4-generic.sch | 36 ++++++++++---------- DASH/mpdvalidator/schematron/dvb-dash.sch | 20 +++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/DASH/mpdvalidator/schematron/ac4-generic.sch b/DASH/mpdvalidator/schematron/ac4-generic.sch index b2c75f7d..fa1b2ebd 100644 --- a/DASH/mpdvalidator/schematron/ac4-generic.sch +++ b/DASH/mpdvalidator/schematron/ac4-generic.sch @@ -27,14 +27,14 @@ - The value of the mimeType attribute shall be set to 'audio/mp4' or 'video/mp4'. + The value of the mimeType attribute shall be set to 'audio/mp4' or 'video/mp4'. - @audioSamplingRate shall be set to the sampling frequency derived from the parameters fs_index and - dsi_sf_multiplier, contained in ac4_dsi_v1. + @audioSamplingRate shall be set to the sampling frequency derived from the parameters fs_index and + dsi_sf_multiplier, contained in ac4_dsi_v1. - The value of the mimeType attribute shall be set to 'audio/mp4'. + The value of the mimeType attribute shall be set to 'audio/mp4'. - The @startWithSAP value shall be set to '1'. + The @startWithSAP value shall be set to '1'. @@ -50,8 +50,8 @@ Role element for AC-4 - The value of Role (role) shall be main, alternate, commentary. + The value of Role (role) shall be main, alternate, commentary. @@ -70,17 +70,17 @@ - + It is recommended to use exactly one AudioChannelConfiguration element with a schemeIdURI of or - + The value element shall contain a four-digit hexadecimal representation of the 16-bit field which describes the channel assignment of the referenced AC-4 elementary stream - Use < schemeIdUri="" value=""/> + Use < schemeIdUri="" value=""/> @@ -90,19 +90,19 @@ - + Unspecified schemeIdUri in AudioChannelConfiguration element - + - + It is recommended to use exactly one AudioChannelConfiguration element with a schemeIdURI of or - + @@ -111,18 +111,18 @@ - For all AC-4 channel configurations that are mappable to the MPEG channel configuration scheme, the scheme described by - @schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" shall be used + For all AC-4 channel configurations that are mappable to the MPEG channel configuration scheme, the scheme described by + @schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" shall be used - + It is recommended to use exactly one AudioChannelConfiguration element with a schemeIdURI of or - + diff --git a/DASH/mpdvalidator/schematron/dvb-dash.sch b/DASH/mpdvalidator/schematron/dvb-dash.sch index 848245b2..d50bc7d4 100644 --- a/DASH/mpdvalidator/schematron/dvb-dash.sch +++ b/DASH/mpdvalidator/schematron/dvb-dash.sch @@ -12,22 +12,22 @@ - @mimeType shall be common between all Representations in an Adaptation Set + @mimeType shall be common between all Representations in an Adaptation Set - @codecs should be common between all Representations in an Adaptation Set + @codecs should be common between all Representations in an Adaptation Set - @audioSamplingRate should be common between all Representations in an Adaptation Set + @audioSamplingRate should be common between all Representations in an Adaptation Set - audioChannelConfiguration should be common between all Representations in an Adaptation Set + audioChannelConfiguration should be common between all Representations in an Adaptation Set - All Adaptation Sets that refer to Auxiliary Audio streams may not contain the @lang attribute and Role, - Accessibility, AudioChannelConfiguration descriptors + All Adaptation Sets that refer to Auxiliary Audio streams may not contain the @lang attribute and Role, + Accessibility, AudioChannelConfiguration descriptors @@ -43,15 +43,15 @@ - If there is more than one audio Preselection associated with an audio bundle, at least one of the Preselection - elements shall be tagged with an @value set to "main". + If there is more than one audio Preselection associated with an audio bundle, at least one of the Preselection + elements shall be tagged with an @value set to "main". - @preselectionComponents specifies the ids of the contained Adaptation Sets or Content Components that belong to this Preselection as white space separated list in processing order. - + From 6b3af85668889ce48f5d68ac6b90c818b6ed0b0a Mon Sep 17 00:00:00 2001 From: Wolfgang Schildbach Date: Wed, 12 Feb 2025 09:11:19 +0100 Subject: [PATCH 2/2] fix profile test for DVB DASH The test for the DVB2017 profile assumed a space separated list of profiles, instead of a comma separated list. Fix this, and use a helper function for consistent handling. --- DASH/mpdvalidator/schematron/dvb-dash.sch | 10 +++++----- DASH/mpdvalidator/schematron/helper-functions.sch | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/DASH/mpdvalidator/schematron/dvb-dash.sch b/DASH/mpdvalidator/schematron/dvb-dash.sch index d50bc7d4..c2346acb 100644 --- a/DASH/mpdvalidator/schematron/dvb-dash.sch +++ b/DASH/mpdvalidator/schematron/dvb-dash.sch @@ -10,7 +10,7 @@ AdaptationSet element for DVB DASH 2017 profile - + @mimeType shall be common between all Representations in an Adaptation Set @@ -18,13 +18,13 @@ @audioSamplingRate should be common between all Representations in an Adaptation Set - + audioChannelConfiguration should be common between all Representations in an Adaptation Set - + All Adaptation Sets that refer to Auxiliary Audio streams may not contain the @lang attribute and Role, Accessibility, AudioChannelConfiguration descriptors @@ -33,7 +33,7 @@ Preselection element for DVB DASH 2017 profile - + Every AC-4 or MPEG-H Audio Preselection element shall include at least one Role element using the scheme "urn:mpeg:dash:role:2011" as defined in ISO/IEC 23009-1:2019 [1]. @@ -61,7 +61,7 @@ AdaptationSet and Preselection element for AC-4 for DVB DASH 2017 profile - + diff --git a/DASH/mpdvalidator/schematron/helper-functions.sch b/DASH/mpdvalidator/schematron/helper-functions.sch index bbba053c..400160c0 100644 --- a/DASH/mpdvalidator/schematron/helper-functions.sch +++ b/DASH/mpdvalidator/schematron/helper-functions.sch @@ -16,6 +16,14 @@ + + + + + + +