From 78e0e5c7cc7473f82cfad17ce7e9c98789058dd1 Mon Sep 17 00:00:00 2001
From: Muaz Ahmad <mahmad2000@protonmail.com>
Date: Wed, 11 Oct 2023 14:33:25 +0500
Subject: [PATCH] output to pipe instead to link with channels through trait

---
 src/decode/codecs/audio.rs | 18 ++++++++++++------
 src/decode/codecs/video.rs | 14 +++++++++++---
 src/util/mod.rs            |  6 ++++--
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/decode/codecs/audio.rs b/src/decode/codecs/audio.rs
index 375f1a3..c7d8471 100644
--- a/src/decode/codecs/audio.rs
+++ b/src/decode/codecs/audio.rs
@@ -2,14 +2,13 @@ use std::error::Error;
 use std::process::{Child, Command, Stdio};
 use std::sync::{Arc, Mutex};
 use std::io::{Read, Write};
-use std::fs::File;
 
 use crate::decode::codecs::Decoder;
 use crate::util;
 
 pub struct AACDecoder {
     cmd: Child,
-    metadata: Arc<util::Metadata>,
+    bytes_per_sample_chunk: usize
 }
 
 impl Decoder for Arc<Mutex<AACDecoder>> {
@@ -27,14 +26,21 @@ impl Decoder for Arc<Mutex<AACDecoder>> {
         Ok(())
     }
     fn read_raw(&self) -> Result<util::RawMedia, Box<dyn Error + Send + Sync>> {
-        todo!();
+        let mut self_ptr = self.lock().unwrap();
+        let mut pcm_buff = vec![0u8; self_ptr.bytes_per_sample_chunk];
+        let mut pipe = match &mut self_ptr.cmd.stdout {
+            Some(x) => x,
+            None => {return Err(Box::new(util::DecoderError::BrokenOutPipe))}
+        };
+        pipe.read_exact(pcm_buff.as_mut_slice())?;
+        return Ok(util::RawMedia {media_type: util::RawMediaType::PCM16BE, sample: pcm_buff});
     }
 }
 
 pub fn new_aac(metadata: Arc<util::Metadata>) -> Result<AACDecoder, Box<dyn Error>> {
-    let f = File::create("out.pcm")?;
     let cmd = Command::new("faad")
         .args(["-f", "2", "-w", "-q", "-"])
-        .stdin(Stdio::piped()).stdout(f).spawn()?;
-    return Ok(AACDecoder {cmd: cmd, metadata: metadata})
+        .stdin(Stdio::piped()).stdout(Stdio::piped()).spawn()?;
+    let bytes_per_sample_chunk = 1024 * 2 * metadata.audio.channels as usize;
+    return Ok(AACDecoder {cmd: cmd, bytes_per_sample_chunk: bytes_per_sample_chunk})
 }
diff --git a/src/decode/codecs/video.rs b/src/decode/codecs/video.rs
index 70ea6d3..5720cc5 100644
--- a/src/decode/codecs/video.rs
+++ b/src/decode/codecs/video.rs
@@ -9,7 +9,7 @@ use crate::util;
 
 pub struct H264Decoder {
     cmd: Child,
-    metadata: Arc<util::Metadata>,
+    bytes_per_sample: usize
 }
 
 impl Decoder for Arc<Mutex<H264Decoder>> {
@@ -28,7 +28,14 @@ impl Decoder for Arc<Mutex<H264Decoder>> {
         Ok(())
     }
     fn read_raw(&self) -> Result<util::RawMedia, Box<dyn Error + Send + Sync>> {
-        todo!();
+        let mut self_ptr = self.lock().unwrap();
+        let mut yuv_buff = vec![0u8; self_ptr.bytes_per_sample];
+        let mut pipe = match &mut self_ptr.cmd.stdout {
+            Some(x) => x,
+            None => {return Err(Box::new(util::DecoderError::BrokenOutPipe))}
+        };
+        pipe.read_exact(yuv_buff.as_mut_slice());
+        return Ok(util::RawMedia {media_type: util::RawMediaType::YUV420P, sample: yuv_buff});
     }
 }
 
@@ -37,5 +44,6 @@ pub fn new_h264(metadata: Arc<util::Metadata>) -> Result<H264Decoder, Box<dyn Er
     let cmd = Command::new("ffmpeg")
         .args(["-y", "-hide_banner", "-loglevel", "error" , "-i", "-", "-c:v", "rawvideo", "-pix_fmt", "yuv420p", "-f", "rawvideo", "-"])
         .stdin(Stdio::piped()).stdout(f).spawn()?;
-    return Ok(H264Decoder {cmd: cmd, metadata: metadata});
+    let bytes_per_sample = metadata.video.width * metadata.video.height * 3 / 2;
+    return Ok(H264Decoder {cmd: cmd, bytes_per_sample: bytes_per_sample as usize});
 }
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 08a08cb..47d3f05 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -61,7 +61,7 @@ pub struct NALUPacket {
 
 pub enum RawMediaType {
     YUV420P,
-    PCM16LE,
+    PCM16BE,
 }
 
 pub struct RawMedia {
@@ -131,6 +131,7 @@ impl fmt::Display for DemuxerError {
 pub enum DecoderError {
     CodecNotImplemented,
     BrokenInPipe,
+    BrokenOutPipe,
 }
 
 impl Error for DecoderError {}
@@ -140,7 +141,8 @@ impl fmt::Debug for DecoderError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             DecoderError::CodecNotImplemented => write!(f, "Codec not recognized"),
-            DecoderError::BrokenInPipe => write!(f, "Decoder has invalid piping"),
+            DecoderError::BrokenInPipe => write!(f, "Decoder has invalid piping, stdin closed"),
+            DecoderError::BrokenInPipe => write!(f, "Decoder has invalid piping, stdout closed"),
             _ => write!(f, "Error not described yet")
         }
     }