mahmad/hls-transcoder-2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use metadata as Arc pointer to move around easier

Browse source
This commit is contained in:
Muaz Ahmad 2023-10-06 16:03:07 +05:00
parent 9942dca4fb
commit f5e2ba19ab
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/demux/input.rs
View file

@ -1,7 +1,7 @@
use std::error::Error; use std::error::Error;
use std::io; use std::io;
use std::io::Read; use std::io::Read;
use std::sync::mpsc; use std::sync::{mpsc, Arc};
use crate::util; use crate::util;
use crate::demux::flv; use crate::demux::flv;
@ -9,9 +9,9 @@ use crate::demux::flv;
pub trait FileReader { pub trait FileReader {
fn init(&mut self) -> Result<util::Metadata, Box<dyn Error>>; fn init(&mut self) -> Result<util::Metadata, Box<dyn Error>>;
fn read_nalu(&mut self, metadata: &util::Metadata) -> Result<util::NALUPacket, Box<dyn Error + Send + Sync>>; fn read_nalu(&mut self, metadata: &util::Metadata) -> Result<util::NALUPacket, Box<dyn Error + Send + Sync>>;
fn data_loop(&mut self, v_in: mpsc::Sender<util::NALUPacket>, a_in: mpsc::Sender<util::NALUPacket>, metadata: &util::Metadata, err_in: mpsc::Sender<Box<dyn Error + Send + Sync>>) { fn data_loop(&mut self, v_in: mpsc::Sender<util::NALUPacket>, a_in: mpsc::Sender<util::NALUPacket>, metadata: Arc<util::Metadata>, err_in: mpsc::Sender<Box<dyn Error + Send + Sync>>) {
loop { loop {
let nalu = match self.read_nalu(metadata) { let nalu = match self.read_nalu(&metadata) {
Ok(x) => x, Ok(x) => x,
Err(err) => {util::thread_freeze(err_in, err); return} Err(err) => {util::thread_freeze(err_in, err); return}
}; };

8
src/demux/mod.rs
View file

@ -4,6 +4,7 @@ mod flv;
use std::sync::mpsc; use std::sync::mpsc;
use std::error::Error; use std::error::Error;
use std::thread; use std::thread;
use std::sync::Arc;
use crate::util; use crate::util;
use crate::demux::input::FileReader; use crate::demux::input::FileReader;
@ -12,18 +13,19 @@ pub fn spawn() -> Result<
( (
mpsc::Receiver<util::NALUPacket>, mpsc::Receiver<util::NALUPacket>,
mpsc::Receiver<util::NALUPacket>, mpsc::Receiver<util::NALUPacket>,
util::Metadata, Arc<util::Metadata>,
mpsc::Receiver<Box<dyn Error + Send + Sync>> mpsc::Receiver<Box<dyn Error + Send + Sync>>
), ),
Box<dyn Error> Box<dyn Error>
> { > {
let mut reader = input::new_reader()?; let mut reader = input::new_reader()?;
let metadata = reader.init()?; let metadata = Arc::new(reader.init()?);
let (v_in, v_out) = mpsc::channel(); let (v_in, v_out) = mpsc::channel();
let (a_in, a_out) = mpsc::channel(); let (a_in, a_out) = mpsc::channel();
let (err_in, err_out) = mpsc::channel(); let (err_in, err_out) = mpsc::channel();
let metadata_ptr = metadata.clone();
thread::spawn(move || { thread::spawn(move || {
reader.data_loop(v_in, a_in, &metadata, err_in); reader.data_loop(v_in, a_in, metadata_ptr, err_in);
}); });
return Ok((v_out, a_out, metadata, err_out)); return Ok((v_out, a_out, metadata, err_out));
} }