Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

H265: Check not in FU before calling finalize and check pieces bounds before indexing #4

Merged
merged 3 commits into from
Nov 11, 2024
Merged

H265: Check not in FU before calling finalize and check pieces bounds before indexing #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8abfc4
Check not in FU before calling finalize and check pieces bounds befor…
kfuseini Nov 9, 2024
04a940b
Add license header to h265 codec file
kfuseini Nov 9, 2024
651a1f9
Add copyright header to h265 code file
kfuseini Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/codec/h265.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
// Copyright (C) 2021 Scott Lamb <[email protected]>
// SPDX-License-Identifier: MIT OR Apache-2.0

//! [H.265]-encoded video.

use std::convert::TryFrom;
use std::fmt::Write;

use base64::Engine;
use bytes::{Buf, BufMut, Bytes, BytesMut};
use hevc_parser::hevc::{NalHeader, UnitType};
use log::{debug, log_enabled, trace};
Expand Down Expand Up @@ -167,7 +171,7 @@ impl Depacketizer {
.last()
.ok_or("nals should not be empty".to_string())?
.hdr;
if can_end_au(last_nal_hdr.nal_unit_type()) {
if !access_unit.in_fu && can_end_au(last_nal_hdr.nal_unit_type()) {
access_unit.end_ctx = *pkt.ctx();
self.pending =
Some(self.finalize_access_unit(access_unit, "ts change")?);
Expand Down Expand Up @@ -436,6 +440,9 @@ impl Depacketizer {
}
for nal in &self.nals {
let next_piece_idx = usize::try_from(nal.next_piece_idx).expect("u32 fits in usize");
if next_piece_idx > self.pieces.len() {
return Err("Incomplete buffered nals finalizing access unit".into());
}
let nal_pieces = &self.pieces[piece_idx..next_piece_idx];
match nal.hdr.nal_unit_type() {
UnitType::NalVps => {
Expand Down Expand Up @@ -620,9 +627,11 @@ impl InternalParameters {
if !matches!(key, "sprop-sps" | "sprop-pps" | "sprop-vps") {
continue;
}
let nal = base64::decode(value).map_err(|_| {
"bad parameter: NAL has invalid base64 encoding".to_string()
})?;
let nal = base64::engine::general_purpose::STANDARD
.decode(value)
.map_err(|_| {
"bad parameter: NAL has invalid base64 encoding".to_string()
})?;
if nal.is_empty() {
return Err(format!("bad parameter {key}: empty NAL"));
}
Expand Down
Loading