[vlc-commits] demux: adaptive: move decryption to base classes

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 18 19:42:40 2019 +0200| [619a6c77e76a3f9874711b6e40ecc2788122b853] | committer: Francois Cartegnie

demux: adaptive: move decryption to base classes

(cherry picked from commit a726ac41fc98e6abdf4d10d2e7b3358878ecf2de)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=619a6c77e76a3f9874711b6e40ecc2788122b853
---

 .../demux/adaptive/encryption/CommonEncryption.cpp | 16 ++++++--
 .../demux/adaptive/encryption/CommonEncryption.hpp |  8 +++-
 modules/demux/adaptive/encryption/Keyring.cpp      |  1 +
 modules/demux/adaptive/playlist/Segment.cpp        | 29 ++++++++++++-
 modules/demux/adaptive/playlist/Segment.h          | 11 ++++-
 modules/demux/adaptive/playlist/SegmentChunk.cpp   | 29 +++++++++++++
 modules/demux/adaptive/playlist/SegmentChunk.hpp   |  8 ++++
 modules/demux/hls/playlist/HLSSegment.cpp          | 48 ++++------------------
 modules/demux/hls/playlist/HLSSegment.hpp          |  8 ++--
 modules/demux/hls/playlist/Parser.cpp              | 11 ++---
 10 files changed, 109 insertions(+), 60 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=619a6c77e76a3f9874711b6e40ecc2788122b853