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

Rename "crypto_handler" to "encryption_handler" 

Change-Id: I44307fad6f4f0c4c2f8b61c3c6b07867859c9867
This commit is contained in:
Aaron Vaage 2017-09-20 11:00:45 -07:00
parent 3495025051
commit 304f7d2a88
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packager/packager.cc
View File

@ -398,7 +398,7 @@ std::shared_ptr<Muxer> CreateMuxer(const PackagingParams& packaging_params,
return muxer; return muxer;
} }
std::shared_ptr<MediaHandler> CreateCryptoHandler( std::shared_ptr<MediaHandler> CreateEncryptionHandler(
const PackagingParams& packaging_params, const PackagingParams& packaging_params,
const StreamDescriptor& stream, const StreamDescriptor& stream,
KeySource* key_source) { KeySource* key_source) {
@ -552,10 +552,10 @@ Status CreateRemuxJobs(const StreamDescriptorList& stream_descriptors,
std::make_shared<ChunkingHandler>(packaging_params.chunking_params); std::make_shared<ChunkingHandler>(packaging_params.chunking_params);
handlers.push_back(chunking_handler); handlers.push_back(chunking_handler);
std::shared_ptr<MediaHandler> crypto_handler = CreateCryptoHandler( std::shared_ptr<MediaHandler> encryption_handler = CreateEncryptionHandler(
packaging_params, *stream_iter, encryption_key_source); packaging_params, *stream_iter, encryption_key_source);
if (crypto_handler) { if (encryption_handler) {
handlers.push_back(crypto_handler); handlers.push_back(encryption_handler);
} }
// If trick_play_handler is available, muxer should already be connected to // If trick_play_handler is available, muxer should already be connected to