mirrors/hls_m3u8
1
0
Fork 0
mirror of https://github.com/sile/hls_m3u8.git synced 2025-01-24 18:28:11 +00:00
Code Issues Projects Releases Wiki Activity

insert iv based on segmentnumber

Browse source
This commit is contained in:
Luro02 2020-03-28 10:47:52 +01:00
parent e187c9dc7c
commit 8eb45dceb7
No known key found for this signature in database
GPG key ID: B66FD4F74501A9CF
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/media_playlist.rs
View file

@ -301,6 +301,22 @@ impl MediaPlaylistBuilder {
let mut segment = segment.clone(); let mut segment = segment.clone();
segment.number = position; segment.number = position;
// add the segment number as iv, if the iv is missing:
for key in &mut segment.keys {
if let ExtXKey(Some(DecryptionKey {
method, iv, format, ..
})) = key
{
if *method == EncryptionMethod::Aes128 && *iv == InitializationVector::Missing {
if format.is_none() {
*iv = InitializationVector::Number(segment.number as u128);
} else if let Some(KeyFormat::Identity) = format {
*iv = InitializationVector::Number(segment.number as u128);
}
}
}
}
result_segments.insert(segment.number, segment); result_segments.insert(segment.number, segment);
position += 1; position += 1;
} }
@ -428,26 +444,35 @@ impl fmt::Display for MediaPlaylist {
writeln!(f, "{}", value)?; writeln!(f, "{}", value)?;
} }
let mut available_keys = HashSet::new(); let mut available_keys = HashSet::<ExtXKey>::new();
for segment in self.segments.values() { for segment in self.segments.values() {
for key in &segment.keys { for key in &segment.keys {
// the key is new:
if let ExtXKey(Some(decryption_key)) = key { if let ExtXKey(Some(decryption_key)) = key {
// TODO: this piece should be linted by clippy?
// next segment will be encrypted, so the segment can not have an empty key // next segment will be encrypted, so the segment can not have an empty key
available_keys.remove(&ExtXKey::empty()); available_keys.remove(&ExtXKey::empty());
let mut decryption_key = decryption_key.clone();
let key = {
if let InitializationVector::Number(_) = decryption_key.iv {
// set the iv from a segment number to missing
// this does reduce the output size and the correct iv
// is automatically set, when parsing.
decryption_key.iv = InitializationVector::Missing;
}
ExtXKey(Some(decryption_key.clone()))
};
// only do something if a key has been overwritten // only do something if a key has been overwritten
if available_keys.insert(key) { if available_keys.insert(key.clone()) {
let mut remove_key = None; let mut remove_key = None;
// an old key might be removed: // an old key might be removed:
for k in &available_keys { for k in &available_keys {
if let ExtXKey(Some(dk)) = k { if let ExtXKey(Some(dk)) = k {
if dk.format == decryption_key.format && &key != k { if dk.format == decryption_key.format && key != *k {
remove_key = Some(*k); remove_key = Some(k.clone());
break; break;
} }
} else { } else {
@ -457,7 +482,7 @@ impl fmt::Display for MediaPlaylist {
if let Some(k) = remove_key { if let Some(k) = remove_key {
// this should always be true: // this should always be true:
let res = available_keys.remove(k); let res = available_keys.remove(&k);
debug_assert!(res); debug_assert!(res);
} }
@ -466,7 +491,7 @@ impl fmt::Display for MediaPlaylist {
} else { } else {
// the next segment is not encrypted, so remove all available keys // the next segment is not encrypted, so remove all available keys
available_keys.clear(); available_keys.clear();
available_keys.insert(key); available_keys.insert(ExtXKey::empty());
writeln!(f, "{}", key)?; writeln!(f, "{}", key)?;
} }
} }
@ -632,7 +657,7 @@ fn parse_media_playlist(
} }
if has_partial_segment { if has_partial_segment {
return Err(Error::invalid_input()); return Err(Error::custom("Missing URI for the last `MediaSegment`"));
} }
builder.unknown(unknown); builder.unknown(unknown);