update dma-heap to 0.2.1

lu-zero · Jun 3, 2023 · cb247e5 · cb247e5
1 parent c276f3e
commit cb247e5
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -11,4 +11,4 @@ v4l2r = { path = "../lib" }
 thiserror = "1.0"
 anyhow = "1.0"
 log = "0.4.14"
-dma-heap = { git = "https://github.com/mripard/dma-heap" }
+dma-heap = "0.2.1"
diff --git a/utils/src/dmabuf_exporter.rs b/utils/src/dmabuf_exporter.rs
@@ -1,20 +1,21 @@
 use std::fs::File;
 
-use dma_heap::{DmaBufHeap, DmaBufHeapType};
+use dma_heap::{Heap, HeapKind};
 use v4l2r::{memory::DmaBufHandle, Format};
 
 use anyhow::Result;
 
 pub fn export_dmabufs(format: &Format, nb_buffers: usize) -> Result<Vec<Vec<DmaBufHandle<File>>>> {
-    let heap = DmaBufHeap::new(DmaBufHeapType::System).unwrap();
+    let heap = Heap::new(HeapKind::System)?;
 
     let fds: Vec<Vec<DmaBufHandle<File>>> = (0..nb_buffers)
         .map(|_| {
             format
                 .plane_fmt
                 .iter()
                 .map(|plane| {
-                    DmaBufHandle::from(heap.allocate::<File>(plane.sizeimage as usize).unwrap())
+                    let fd = File::from(heap.allocate(plane.sizeimage as usize).unwrap());
+                    DmaBufHandle::from(fd)
                 })
                 .collect()
         })