Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/video-streamer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ bench = ["perf-diagnostics"]

[dependencies]
anyhow = "1.0"
bytes = "1"
futures-util = { version = "0.3", features = ["sink"] }
tokio = { version = "1.52", features = [
"io-util",
Expand Down
22 changes: 9 additions & 13 deletions crates/video-streamer/src/bench_support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ use std::path::Path;
use std::time::{Duration, Instant};

use anyhow::Context as _;
use webm_iterable::WebmIterator;
use webm_iterable::errors::TagIteratorError;
use webm_iterable::matroska_spec::{Block, Master, MatroskaSpec, SimpleBlock};

use crate::StreamingConfig;
use crate::reopenable::Reopenable;
use crate::streamer::iter::{IteratorError, WebmPositionedIterator};
use crate::streamer::iter::WebmPositionedIterator;
use crate::streamer::tag_writers::{EncodeWriterConfig, HeaderWriter, WriterResult};

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -71,21 +69,20 @@ where
{
let started_at = Instant::now();

let mut webm_itr = WebmPositionedIterator::new(WebmIterator::new(
input_stream,
&[MatroskaSpec::BlockGroup(Master::Start)],
));
let mut webm_itr = WebmPositionedIterator::new(input_stream, cadeau::xmf::vpx::VpxCodec::VP8);

let mut headers = vec![];
while let Some(tag) = webm_itr.next() {
let tag = tag?;
if matches!(tag, MatroskaSpec::Cluster(Master::Start)) {
break;
loop {
match webm_itr.next() {
Some(Ok(MatroskaSpec::Cluster(Master::Start))) => break,
Some(Ok(tag)) => headers.push(tag),
Some(Err(error)) => return Err(error.into()),
None => anyhow::bail!("recording ended before the first cluster"),
}
headers.push(tag);
}

let encode_writer_config = EncodeWriterConfig::try_from((headers.as_slice(), &config))?;
webm_itr.set_codec(encode_writer_config.codec);

let mut sink = CountingWriter::default();
let mut header_writer = HeaderWriter::new(&mut sink);
Expand Down Expand Up @@ -156,7 +153,6 @@ where
WriterResult::Continue => {}
}
}
Some(Err(IteratorError::InnerError(TagIteratorError::UnexpectedEOF { .. }))) => break,
Some(Err(e)) => return Err(e).context("webm iterator error"),
None => break,
}
Expand Down
Loading
Loading