mirrors/mp4-rust
1
0
Fork 0
mirror of https://github.com/alfg/mp4-rust.git synced 2025-01-07 02:35:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix track functions when encrypted

Browse source
This commit is contained in:
Jensenn 2024-02-20 15:13:40 -07:00
parent 7b82b6399f
commit 3fa3856797
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/track.rs
View file

@ -208,7 +208,15 @@ impl Mp4Track {
} }
pub fn sample_freq_index(&self) -> Result<SampleFreqIndex> { pub fn sample_freq_index(&self) -> Result<SampleFreqIndex> {
let mut mp4a_opt: Option<&Mp4aBox> = None;
if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a { if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a {
mp4a_opt = Some(mp4a);
} else if let Some(ref enca) = self.trak.mdia.minf.stbl.stsd.enca {
if let Some(ref mp4a) = enca.mp4a {
mp4a_opt = Some(mp4a);
}
}
if let Some(ref mp4a) = mp4a_opt {
if let Some(ref esds) = mp4a.esds { if let Some(ref esds) = mp4a.esds {
SampleFreqIndex::try_from(esds.es_desc.dec_config.dec_specific.freq_index) SampleFreqIndex::try_from(esds.es_desc.dec_config.dec_specific.freq_index)
} else { } else {
@ -220,7 +228,15 @@ impl Mp4Track {
} }
pub fn channel_config(&self) -> Result<ChannelConfig> { pub fn channel_config(&self) -> Result<ChannelConfig> {
let mut mp4a_opt: Option<&Mp4aBox> = None;
if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a { if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a {
mp4a_opt = Some(mp4a);
} else if let Some(ref enca) = self.trak.mdia.minf.stbl.stsd.enca {
if let Some(ref mp4a) = enca.mp4a {
mp4a_opt = Some(mp4a);
}
}
if let Some(ref mp4a) = mp4a_opt {
if let Some(ref esds) = mp4a.esds { if let Some(ref esds) = mp4a.esds {
ChannelConfig::try_from(esds.es_desc.dec_config.dec_specific.chan_conf) ChannelConfig::try_from(esds.es_desc.dec_config.dec_specific.chan_conf)
} else { } else {
@ -246,7 +262,15 @@ impl Mp4Track {
} }
pub fn bitrate(&self) -> u32 { pub fn bitrate(&self) -> u32 {
let mut mp4a_opt: Option<&Mp4aBox> = None;
if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a { if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a {
mp4a_opt = Some(mp4a);
} else if let Some(ref enca) = self.trak.mdia.minf.stbl.stsd.enca {
if let Some(ref mp4a) = enca.mp4a {
mp4a_opt = Some(mp4a);
}
}
if let Some(ref mp4a) = mp4a_opt {
if let Some(ref esds) = mp4a.esds { if let Some(ref esds) = mp4a.esds {
esds.es_desc.dec_config.avg_bitrate esds.es_desc.dec_config.avg_bitrate
} else { } else {
@ -281,7 +305,15 @@ impl Mp4Track {
} }
pub fn video_profile(&self) -> Result<AvcProfile> { pub fn video_profile(&self) -> Result<AvcProfile> {
let mut avc1_opt: Option<&Avc1Box> = None;
if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 { if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
avc1_opt = Some(avc1);
} else if let Some(ref encv) = self.trak.mdia.minf.stbl.stsd.encv {
if let Some(ref avc1) = encv.avc1 {
avc1_opt = Some(avc1);
}
}
if let Some(ref avc1) = avc1_opt {
AvcProfile::try_from(( AvcProfile::try_from((
avc1.avcc.avc_profile_indication, avc1.avcc.avc_profile_indication,
avc1.avcc.profile_compatibility, avc1.avcc.profile_compatibility,
@ -292,7 +324,15 @@ impl Mp4Track {
} }
pub fn sequence_parameter_set(&self) -> Result<&[u8]> { pub fn sequence_parameter_set(&self) -> Result<&[u8]> {
let mut avc1_opt: Option<&Avc1Box> = None;
if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 { if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
avc1_opt = Some(avc1);
} else if let Some(ref encv) = self.trak.mdia.minf.stbl.stsd.encv {
if let Some(ref avc1) = encv.avc1 {
avc1_opt = Some(avc1);
}
}
if let Some(ref avc1) = avc1_opt {
match avc1.avcc.sequence_parameter_sets.get(0) { match avc1.avcc.sequence_parameter_sets.get(0) {
Some(nal) => Ok(nal.bytes.as_ref()), Some(nal) => Ok(nal.bytes.as_ref()),
None => Err(Error::EntryInStblNotFound( None => Err(Error::EntryInStblNotFound(
@ -307,7 +347,15 @@ impl Mp4Track {
} }
pub fn picture_parameter_set(&self) -> Result<&[u8]> { pub fn picture_parameter_set(&self) -> Result<&[u8]> {
let mut avc1_opt: Option<&Avc1Box> = None;
if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 { if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
avc1_opt = Some(avc1);
} else if let Some(ref encv) = self.trak.mdia.minf.stbl.stsd.encv {
if let Some(ref avc1) = encv.avc1 {
avc1_opt = Some(avc1);
}
}
if let Some(ref avc1) = avc1_opt {
match avc1.avcc.picture_parameter_sets.get(0) { match avc1.avcc.picture_parameter_sets.get(0) {
Some(nal) => Ok(nal.bytes.as_ref()), Some(nal) => Ok(nal.bytes.as_ref()),
None => Err(Error::EntryInStblNotFound( None => Err(Error::EntryInStblNotFound(
@ -322,7 +370,15 @@ impl Mp4Track {
} }
pub fn audio_profile(&self) -> Result<AudioObjectType> { pub fn audio_profile(&self) -> Result<AudioObjectType> {
let mut mp4a_opt: Option<&Mp4aBox> = None;
if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a { if let Some(ref mp4a) = self.trak.mdia.minf.stbl.stsd.mp4a {
mp4a_opt = Some(mp4a);
} else if let Some(ref enca) = self.trak.mdia.minf.stbl.stsd.enca {
if let Some(ref mp4a) = enca.mp4a {
mp4a_opt = Some(mp4a);
}
}
if let Some(ref mp4a) = mp4a_opt {
if let Some(ref esds) = mp4a.esds { if let Some(ref esds) = mp4a.esds {
AudioObjectType::try_from(esds.es_desc.dec_config.dec_specific.profile) AudioObjectType::try_from(esds.es_desc.dec_config.dec_specific.profile)
} else { } else {