andrey/retina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(h264): replace is_some with variants

Browse Source
This commit is contained in:
Shehriyar Qureshi 2022-10-31 20:36:28 +05:00
parent 42282f1603
commit cda6808dda
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/codec/h264.rs
View File

@ -481,17 +481,16 @@ impl Depacketizer {
return Err("FU-A pkt with MARK && !END".into()); return Err("FU-A pkt with MARK && !END".into());
} }
let u32_len = u32::try_from(data.len()).expect("RTP packet len must be < u16::MAX"); let u32_len = u32::try_from(data.len()).expect("RTP packet len must be < u16::MAX");
match (start, access_unit.in_fu_a.is_some()) { match (start, access_unit.in_fu_a) {
(true, true) => return Err("FU-A with start bit while frag in progress".into()), (true, Some(_)) => {
(true, false) => { return Err("FU-A with start bit while frag in progress".into())
}
(true, None) => {
self.nal_parser.start_rtp_nal(nal_header, data, u32_len)?; self.nal_parser.start_rtp_nal(nal_header, data, u32_len)?;
access_unit.in_fu_a = Some(nal_header); access_unit.in_fu_a = Some(nal_header);
} }
(false, true) => { (false, Some(header_of_starting_fu_a)) => {
let pieces = self.nal_parser.append_rtp_nal(data)?; let pieces = self.nal_parser.append_rtp_nal(data)?;
let header_of_starting_fu_a = access_unit.in_fu_a.expect(
"Nal header should be set because starting FU-A is processed before middle FU-A",
);
if u8::from(nal_header) != u8::from(header_of_starting_fu_a) { if u8::from(nal_header) != u8::from(header_of_starting_fu_a) {
return Err(format!( return Err(format!(
"FU-A has inconsistent NAL type: {:?} then {:?}", "FU-A has inconsistent NAL type: {:?} then {:?}",
@ -511,7 +510,7 @@ impl Depacketizer {
return Err("FU-A has MARK and no END".into()); return Err("FU-A has MARK and no END".into());
} }
} }
(false, false) => { (false, None) => {
if loss > 0 { if loss > 0 {
self.nal_parser.clear(); self.nal_parser.clear();
self.input_state = DepacketizerInputState::Loss { self.input_state = DepacketizerInputState::Loss {