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

make encoder output handle nalu read on codec basis for delimiting

Browse source
This commit is contained in:
Muaz Ahmad 2023-10-16 12:37:10 +05:00
parent 71a3ef569a
commit d33742b96f
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/encode/codecs/audio.rs
View file

@ -1,5 +1,5 @@
use std::error::Error; use std::error::Error;
use std::process::{Child, Command, Stdio, ChildStdin, ChildStdout}; use std::process::{Child, Command, Stdio, ChildStdin};
use std::sync::Arc; use std::sync::Arc;
use std::fs::File; use std::fs::File;
@ -15,8 +15,8 @@ impl Encoder for OpusEncoder {
self.cmd.stdin.take().unwrap() self.cmd.stdin.take().unwrap()
} }
fn stdout(&mut self) -> ChildStdout { fn read_nalu(&mut self) -> Result<util::NALUPacket, Box<dyn Error + Send + Sync>> {
self.cmd.stdout.take().unwrap() todo!();
} }
} }

19
src/encode/codecs/mod.rs
View file

@ -4,14 +4,27 @@ pub mod audio;
use std::error::Error; use std::error::Error;
use std::process::{ChildStdin, ChildStdout}; use std::process::{ChildStdin, ChildStdout};
use std::sync::mpsc; use std::sync::mpsc;
use std::io::{Read, Write}; use std::io::Write;
use std::thread; use std::thread;
use crate::util; use crate::util;
pub trait Encoder { pub trait Encoder {
fn stdin(&mut self) -> ChildStdin; fn stdin(&mut self) -> ChildStdin;
fn stdout(&mut self) -> ChildStdout; fn read_nalu(&mut self) -> Result<util::NALUPacket, Box<dyn Error + Send + Sync>>;
fn write_nalu_loop(&mut self, c_out: mpsc::Sender<util::NALUPacket>, c_err: mpsc::Sender<Box<dyn Error + Send + Sync>>) {
loop {
let nalu = match self.read_nalu() {
Ok(x) => x,
Err(err) => {util::thread_freeze(c_err, err); return}
};
match c_out.send(nalu) {
Ok(_) => (),
Err(err) => {util::thread_freeze(c_err, Box::new(err)); return}
}
}
}
} }
fn write_raw(cmd_in: &mut ChildStdin, media: util::RawMedia) -> Result<(), Box<dyn Error + Send + Sync>> { fn write_raw(cmd_in: &mut ChildStdin, media: util::RawMedia) -> Result<(), Box<dyn Error + Send + Sync>> {
@ -19,7 +32,7 @@ fn write_raw(cmd_in: &mut ChildStdin, media: util::RawMedia) -> Result<(), Box<d
Ok(()) Ok(())
} }
fn read_raw(cmd_out: &mut ChildStdout) -> Result<util::NALUPacket, Box<dyn Error>> { fn read_nalu(cmd_out: &mut ChildStdout) -> Result<util::NALUPacket, Box<dyn Error>> {
todo!(); todo!();
} }

6
src/encode/codecs/video.rs
View file

@ -1,5 +1,5 @@
use std::error::Error; use std::error::Error;
use std::process::{Child, Command, Stdio, ChildStdin, ChildStdout}; use std::process::{Child, Command, Stdio, ChildStdin};
use std::sync::Arc; use std::sync::Arc;
use std::fs::File; use std::fs::File;
@ -15,8 +15,8 @@ impl Encoder for VP9Encoder {
self.cmd.stdin.take().unwrap() self.cmd.stdin.take().unwrap()
} }
fn stdout(&mut self) -> ChildStdout { fn read_nalu(&mut self) -> Result<util::NALUPacket, Box<dyn Error + Send + Sync>> {
self.cmd.stdout.take().unwrap() todo!();
} }
} }