vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Sun Dec 25 20:26:10 2011 +0100| [3f790f57d7cfefed4dd38ee97667b16dc8cc6418] | committer: Jean-Baptiste Kempf
dash: Handle parsing of ContentProtection, Accessibility, Rating and Viewpoint in CommonAttributesElements All of these fields are of ContentDescription type, so ContentProtection, Viewpoint, Rating and Accessibility classes are now removed in favour of a unique class. Moreover, the SchemeInformation is defined as a string by the standard. Therefore, the SchemeInformation class has been removed. Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit e16536dc6a14f3d095ab9b80da7277dd26cde21d) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=3f790f57d7cfefed4dd38ee97667b16dc8cc6418 --- modules/stream_filter/dash/Modules.am | 6 -- modules/stream_filter/dash/mpd/Accessibility.h | 40 ------------- modules/stream_filter/dash/mpd/BasicCMParser.cpp | 39 +++++++++++++ modules/stream_filter/dash/mpd/BasicCMParser.h | 3 + .../dash/mpd/CommonAttributesElements.cpp | 58 ++++++++++++++++--- .../dash/mpd/CommonAttributesElements.h | 19 +++++-- .../stream_filter/dash/mpd/ContentDescription.cpp | 29 +++------ .../stream_filter/dash/mpd/ContentDescription.h | 19 ++---- modules/stream_filter/dash/mpd/ContentProtection.h | 40 ------------- modules/stream_filter/dash/mpd/Group.cpp | 61 ++------------------ modules/stream_filter/dash/mpd/Group.h | 16 ----- modules/stream_filter/dash/mpd/Rating.h | 40 ------------- modules/stream_filter/dash/mpd/Representation.cpp | 5 +- modules/stream_filter/dash/mpd/Representation.h | 3 - .../stream_filter/dash/mpd/SchemeInformation.cpp | 38 ------------ modules/stream_filter/dash/mpd/SchemeInformation.h | 41 ------------- modules/stream_filter/dash/mpd/Viewpoint.h | 40 ------------- 17 files changed, 128 insertions(+), 369 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=3f790f57d7cfefed4dd38ee97667b16dc8cc6418 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
