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

Fix 'senc' bug when encrypting mp4:vp9 with superframe 

Although superframe index is not encrypted, it should still be inserted
into subsamples list (with cipher_bytes as 0).

Change-Id: I06b38f8333a22a31a71cd67e0412218dd3aaa5c3
This commit is contained in:
Kongqun Yang 2016-06-15 17:55:38 -07:00 committed by KongQun Yang
parent 0a9de96eb2
commit 47a3fb977d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packager/media/formats/mp4/encrypting_fragmenter.cc
View File

@ -285,6 +285,16 @@ Status EncryptingFragmenter::EncryptSample(scoped_refptr<MediaSample> sample) {
EncryptBytes(data + subsample.clear_bytes, subsample.cipher_bytes); EncryptBytes(data + subsample.clear_bytes, subsample.cipher_bytes);
data += frame.frame_size; data += frame.frame_size;
} }
// Add subsample for the superframe index if exists.
if (is_superframe) {
size_t index_size = sample->data() + sample->data_size() - data;
DCHECK_LE(index_size, 2 + vpx_frames.size() * 4);
DCHECK_GE(index_size, 2 + vpx_frames.size() * 1);
SubsampleEntry subsample;
subsample.clear_bytes = index_size;
subsample.cipher_bytes = 0;
sample_encryption_entry.subsamples.push_back(subsample);
}
} else { } else {
const Nalu::CodecType nalu_type = const Nalu::CodecType nalu_type =
(video_codec_ == kCodecHVC1 || video_codec_ == kCodecHEV1) (video_codec_ == kCodecHVC1 || video_codec_ == kCodecHEV1)
@ -341,6 +351,8 @@ Status EncryptingFragmenter::EncryptSample(scoped_refptr<MediaSample> sample) {
AddSubsamples(accumulated_clear_bytes, 0, AddSubsamples(accumulated_clear_bytes, 0,
&sample_encryption_entry.subsamples); &sample_encryption_entry.subsamples);
} }
DCHECK_EQ(sample_encryption_entry.GetTotalSizeOfSubsamples(),
sample->data_size());
// The length of per-sample auxiliary datum, defined in CENC ch. 7. // The length of per-sample auxiliary datum, defined in CENC ch. 7.
traf()->auxiliary_size.sample_info_sizes.push_back( traf()->auxiliary_size.sample_info_sizes.push_back(