feat: image processor redesign

Cargo.toml

@@ -3,6 +3,7 @@
 members = [
     "platform/api",
     "image_processor",
+    "image_processor/proto",
     "video/edge",
     "video/ingest",
     "video/transcoder",

ffmpeg/Cargo.toml

@@ -11,11 +11,9 @@ bytes = { optional = true, version = "1" }
 tokio = { optional = true, version = "1" }
 crossbeam-channel = { optional = true, version = "0.5" }
 tracing = { optional = true, version = "0.1" }
-scuffle-utils = { path = "../utils", version = "*", optional = true, features = ["task"]}
 
 [features]
 default = []
-task-abort = ["dep:scuffle-utils"]
 channel = ["dep:bytes"]
 tokio-channel = ["channel", "dep:tokio"]
 crossbeam-channel = ["channel", "dep:crossbeam-channel"]

ffmpeg/src/decoder.rs

@@ -152,9 +152,6 @@ impl GenericDecoder {
 	}
 
 	pub fn send_packet(&mut self, packet: &Packet) -> Result<(), FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _guard = scuffle_utils::task::AbortGuard::new();
-
 		// Safety: `packet` is a valid pointer, and `self.decoder` is a valid pointer.
 		let ret = unsafe { avcodec_send_packet(self.decoder.as_mut_ptr(), packet.as_ptr()) };
 
@@ -165,9 +162,6 @@ impl GenericDecoder {
 	}
 
 	pub fn send_eof(&mut self) -> Result<(), FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _guard = scuffle_utils::task::AbortGuard::new();
-
 		// Safety: `self.decoder` is a valid pointer.
 		let ret = unsafe { avcodec_send_packet(self.decoder.as_mut_ptr(), std::ptr::null()) };
 
@@ -178,9 +172,6 @@ impl GenericDecoder {
 	}
 
 	pub fn receive_frame(&mut self) -> Result<Option<VideoFrame>, FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _guard = scuffle_utils::task::AbortGuard::new();
-
 		let mut frame = Frame::new()?;
 
 		// Safety: `frame` is a valid pointer, and `self.decoder` is a valid pointer.

ffmpeg/src/encoder.rs

@@ -426,9 +426,6 @@ impl Encoder {
 		outgoing_time_base: AVRational,
 		settings: impl Into<EncoderSettings>,
 	) -> Result<Self, FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _abort_guard = scuffle_utils::task::AbortGuard::new();
-
 		if codec.as_ptr().is_null() {
 			return Err(FfmpegError::NoEncoder);
 		}
@@ -489,9 +486,6 @@ impl Encoder {
 	}
 
 	pub fn send_eof(&mut self) -> Result<(), FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _abort_guard = scuffle_utils::task::AbortGuard::new();
-
 		// Safety: `self.encoder` is a valid pointer.
 		let ret = unsafe { avcodec_send_frame(self.encoder.as_mut_ptr(), std::ptr::null()) };
 		if ret == 0 {
@@ -502,9 +496,6 @@ impl Encoder {
 	}
 
 	pub fn send_frame(&mut self, frame: &Frame) -> Result<(), FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _abort_guard = scuffle_utils::task::AbortGuard::new();
-
 		// Safety: `self.encoder` and `frame` are valid pointers.
 		let ret = unsafe { avcodec_send_frame(self.encoder.as_mut_ptr(), frame.as_ptr()) };
 		if ret == 0 {
@@ -515,9 +506,6 @@ impl Encoder {
 	}
 
 	pub fn receive_packet(&mut self) -> Result<Option<Packet>, FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _abort_guard = scuffle_utils::task::AbortGuard::new();
-
 		let mut packet = Packet::new()?;
 
 		const AVERROR_EAGAIN: i32 = AVERROR(EAGAIN);
@@ -631,9 +619,6 @@ impl<T: Send + Sync> MuxerEncoder<T> {
 	}
 
 	pub fn send_eof(&mut self) -> Result<(), FfmpegError> {
-		#[cfg(feature = "task-abort")]
-		let _abort_guard = scuffle_utils::task::AbortGuard::new();
-
 		self.encoder.send_eof()?;
 		self.handle_packets()?;