imfsample -> avpacket wtf

Author: Brendonovich

Cargo.lock

@@ -9,11 +9,12 @@ tracing.workspace = true
 thiserror.workspace = true
 
 [target.'cfg(windows)'.dependencies]
+cap-mediafoundation-utils = { path = "../mediafoundation-utils" }
 windows-core = { workspace = true }
 windows = { workspace = true, features = [
-	"Win32_Media_MediaFoundation",
-	"Win32_Media_DirectShow",
-	"Win32_System_Com",
+    "Win32_Media_MediaFoundation",
+    "Win32_Media_DirectShow",
+    "Win32_System_Com",
 ] }
 
 [dev-dependencies]

crates/camera-mediafoundation/Cargo.toml

@@ -1,21 +1,20 @@
 #![cfg(windows)]
 #![allow(non_snake_case)]
 
+use cap_mediafoundation_utils::*;
 use std::{
     ffi::OsString,
     fmt::Display,
     mem::MaybeUninit,
     ops::{Deref, DerefMut},
     os::windows::ffi::OsStringExt,
-    ptr::null_mut,
     slice::from_raw_parts,
     sync::{
         Mutex,
         mpsc::{Receiver, Sender, channel},
     },
     time::{Duration, Instant},
 };
-
 use tracing::error;
 use windows::Win32::{
     Foundation::{S_FALSE, *},
@@ -541,51 +540,6 @@ fn get_device_model_id(device_id: &str) -> Option<String> {
     Some(format!("{id_vendor}:{id_product}"))
 }
 
-pub trait IMFMediaBufferExt {
-    fn lock(&self) -> windows_core::Result<IMFMediaBufferLock<'_>>;
-}
-
-impl IMFMediaBufferExt for IMFMediaBuffer {
-    fn lock(&self) -> windows_core::Result<IMFMediaBufferLock<'_>> {
-        let mut bytes_ptr = null_mut();
-        let mut size = 0;
-
-        unsafe {
-            self.Lock(&mut bytes_ptr, None, Some(&mut size))?;
-        }
-
-        Ok(IMFMediaBufferLock {
-            source: self,
-            bytes: unsafe { std::slice::from_raw_parts_mut(bytes_ptr, size as usize) },
-        })
-    }
-}
-
-pub struct IMFMediaBufferLock<'a> {
-    source: &'a IMFMediaBuffer,
-    bytes: &'a mut [u8],
-}
-
-impl<'a> Drop for IMFMediaBufferLock<'a> {
-    fn drop(&mut self) {
-        let _ = unsafe { self.source.Unlock() };
-    }
-}
-
-impl<'a> Deref for IMFMediaBufferLock<'a> {
-    type Target = [u8];
-
-    fn deref(&self) -> &Self::Target {
-        self.bytes
-    }
-}
-
-impl<'a> DerefMut for IMFMediaBufferLock<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.bytes
-    }
-}
-
 pub struct CallbackData {
     pub sample: IMFSample,
     pub reference_time: Instant,

crates/camera-mediafoundation/src/lib.rs

@@ -9,6 +9,7 @@ thiserror.workspace = true
 inquire = "0.7.5"
 
 [target.'cfg(windows)'.dependencies]
+cap-mediafoundation-utils = { path = "../mediafoundation-utils" }
 cap-camera-mediafoundation = { path = "../camera-mediafoundation" }
 cap-camera-directshow = { path = "../camera-directshow" }
 

crates/camera-windows/Cargo.toml

@@ -1,7 +1,7 @@
 #![cfg(windows)]
 
 use cap_camera_directshow::{AM_MEDIA_TYPEVideoExt, AMMediaType};
-use cap_camera_mediafoundation::{IMFMediaBufferExt, IMFMediaBufferLock};
+use cap_mediafoundation_utils::*;
 use std::{
     ffi::{OsStr, OsString},
     fmt::{Debug, Display},

crates/camera-windows/src/lib.rs

@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 cpal.workspace = true
 ffmpeg.workspace = true
+cap-ffmpeg-utils = { path = "../ffmpeg-utils" }
 
 [lints]
 workspace = true

crates/cpal-ffmpeg/Cargo.toml

@@ -1,3 +1,4 @@
+use cap_ffmpeg_utils::PlanarData;
 use cpal::{SampleFormat, StreamConfig};
 use ffmpeg::format::{Sample, sample};
 
@@ -43,39 +44,3 @@ impl DataExt for ::cpal::Data {
         ffmpeg_frame
     }
 }
-
-pub trait PlanarData {
-    fn plane_data(&self, index: usize) -> &[u8];
-
-    fn plane_data_mut(&mut self, index: usize) -> &mut [u8];
-}
-
-impl PlanarData for ffmpeg::frame::Audio {
-    #[inline]
-    fn plane_data(&self, index: usize) -> &[u8] {
-        if index >= self.planes() {
-            panic!("out of bounds");
-        }
-
-        unsafe {
-            std::slice::from_raw_parts(
-                (*self.as_ptr()).data[index],
-                (*self.as_ptr()).linesize[0] as usize,
-            )
-        }
-    }
-
-    #[inline]
-    fn plane_data_mut(&mut self, index: usize) -> &mut [u8] {
-        if index >= self.planes() {
-            panic!("out of bounds");
-        }
-
-        unsafe {
-            std::slice::from_raw_parts_mut(
-                (*self.as_mut_ptr()).data[index],
-                (*self.as_ptr()).linesize[0] as usize,
-            )
-        }
-    }
-}

crates/cpal-ffmpeg/src/lib.rs

@@ -0,0 +1,10 @@
+[package]
+name = "cap-ffmpeg-utils"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+ffmpeg.workspace = true
+
+[lints]
+workspace = true

crates/ffmpeg-utils/Cargo.toml

@@ -0,0 +1,34 @@
+pub trait PlanarData {
+    fn plane_data(&self, index: usize) -> &[u8];
+    fn plane_data_mut(&mut self, index: usize) -> &mut [u8];
+}
+
+impl PlanarData for ffmpeg::frame::Audio {
+    #[inline]
+    fn plane_data(&self, index: usize) -> &[u8] {
+        if index >= self.planes() {
+            panic!("out of bounds");
+        }
+
+        unsafe {
+            std::slice::from_raw_parts(
+                (*self.as_ptr()).data[index],
+                (*self.as_ptr()).linesize[0] as usize,
+            )
+        }
+    }
+
+    #[inline]
+    fn plane_data_mut(&mut self, index: usize) -> &mut [u8] {
+        if index >= self.planes() {
+            panic!("out of bounds");
+        }
+
+        unsafe {
+            std::slice::from_raw_parts_mut(
+                (*self.as_mut_ptr()).data[index],
+                (*self.as_ptr()).linesize[0] as usize,
+            )
+        }
+    }
+}

crates/ffmpeg-utils/src/lib.rs

@@ -8,5 +8,7 @@ ffmpeg.workspace = true
 thiserror.workspace = true
 cpal.workspace = true
 
+cap-ffmpeg-utils = { path = "../ffmpeg-utils" }
+
 [lints]
 workspace = true