Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use aligned_vec crate to eliminate unsound code #24

Merged
merged 4 commits into from
Feb 20, 2024
Merged

Use aligned_vec crate to eliminate unsound code #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5a32d5
Use aligned_vec crate to eliminate unsound code
shssoichiro Feb 11, 2024
afa8cbc
Use const align
shssoichiro Feb 11, 2024
9a63173
Use boxed slice
shssoichiro Feb 11, 2024
f789925
128
shssoichiro Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
repository = "https://github.com/rust-av/v_frame"

[features]
serialize = ["serde"]
serialize = ["serde", "aligned-vec/serde"]
wasm = ["wasm-bindgen"]
tracing = [
"profiling/profile-with-tracing",
Expand All @@ -24,6 +24,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
wasm-bindgen = { version = "0.2.63", optional = true }
profiling = { version = "1" }
tracing = { version = "0.1.40", optional = true }
aligned-vec = "0.5.0"

[dev-dependencies]
criterion = { version = "0.5", features = ["html_reports"] }
Expand Down
170 changes: 32 additions & 138 deletions src/plane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@
// Media Patent License 1.0 was not distributed with this source code in the
// PATENTS file, you can obtain it at www.aomedia.org/license/patent.

use std::alloc::handle_alloc_error;
use std::iter::FusedIterator;
use std::iter::{self, FusedIterator};
use std::marker::PhantomData;
use std::mem;
use std::ops::{Index, IndexMut, Range};
use std::{
alloc::{alloc, dealloc, Layout},
u32,
};
use std::u32;
use std::{
fmt::{Debug, Display, Formatter},
usize,
};

use aligned_vec::{ABox, AVec, ConstAlign};

use crate::math::*;
use crate::pixel::*;
use crate::serialize::{Deserialize, Serialize};
Expand Down Expand Up @@ -100,86 +98,29 @@ pub struct PlaneOffset {
///
/// The buffer is padded and aligned according to the architecture-specific
/// SIMD constraints.
#[derive(Debug, PartialEq, Eq)]
#[cfg_attr(not(feature = "serialize"), derive(Serialize, Deserialize))]
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
pub struct PlaneData<T: Pixel> {
ptr: std::ptr::NonNull<T>,
_marker: PhantomData<T>,
len: usize,
#[cfg(not(target_arch = "wasm32"))]
data: ABox<[T], ConstAlign<{ 1 << 6 }>>,
#[cfg(target_arch = "wasm32")]
data: ABox<[T], ConstAlign<{ 1 << 3 }>>,
}

unsafe impl<T: Pixel + Send> Send for PlaneData<T> {}
unsafe impl<T: Pixel + Sync> Sync for PlaneData<T> {}

impl<T: Pixel> Clone for PlaneData<T> {
fn clone(&self) -> Self {
// SAFETY: we initialize the plane data before returning
let mut pd = unsafe { Self::new_uninitialized(self.len) };

pd.copy_from_slice(self);

pd
}
}

impl<T: Pixel> std::ops::Deref for PlaneData<T> {
type Target = [T];

fn deref(&self) -> &[T] {
// SAFETY: we cannot reference out of bounds because we know the length of the data
unsafe {
let p = self.ptr.as_ptr();

std::slice::from_raw_parts(p, self.len)
}
self.data.as_ref()
}
}

impl<T: Pixel> std::ops::DerefMut for PlaneData<T> {
fn deref_mut(&mut self) -> &mut [T] {
// SAFETY: we cannot reference out of bounds because we know the length of the data
unsafe {
let p = self.ptr.as_ptr();

std::slice::from_raw_parts_mut(p, self.len)
}
}
}

impl<T: Pixel> std::ops::Drop for PlaneData<T> {
fn drop(&mut self) {
// SAFETY: we cannot dealloc too much because we know the length of the data
unsafe {
dealloc(self.ptr.as_ptr() as *mut u8, Self::layout(self.len));
}
}
}

#[cfg(feature = "serialize")]
impl<T: Pixel + Serialize> Serialize for PlaneData<T> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
use serde::ser::SerializeSeq;
use std::ops::Deref;

let mut data = serializer.serialize_seq(Some(self.len))?;
for byte in self.deref() {
data.serialize_element(&byte)?;
}
data.end()
}
}

#[cfg(feature = "serialize")]
impl<'de, T: Pixel + Deserialize<'de>> Deserialize<'de> for PlaneData<T> {
fn deserialize<D>(deserializer: D) -> Result<Self, <D as serde::Deserializer<'de>>::Error>
where
D: serde::Deserializer<'de>,
{
let deserialized = Vec::deserialize(deserializer)?;
Ok(Self::from_slice(&deserialized))
self.data.as_mut()
}
}

Expand All @@ -188,52 +129,26 @@ impl<T: Pixel> PlaneData<T> {
cfg_if::cfg_if! {
if #[cfg(target_arch = "wasm32")] {
// FIXME: wasm32 allocator fails for alignment larger than 3
const DATA_ALIGNMENT_LOG2: usize = 3;
const DATA_ALIGNMENT: usize = 1 << 3;
} else {
const DATA_ALIGNMENT_LOG2: usize = 6;
const DATA_ALIGNMENT: usize = 1 << 6;
}
}

unsafe fn layout(len: usize) -> Layout {
Layout::from_size_align(len * mem::size_of::<T>(), 1 << Self::DATA_ALIGNMENT_LOG2)
.expect("layout size too large")
}

unsafe fn new_uninitialized(len: usize) -> Self {
let ptr = {
let layout = Self::layout(len);
let ptr = alloc(layout) as *mut T;
if ptr.is_null() {
handle_alloc_error(layout);
}
std::ptr::NonNull::new_unchecked(ptr)
};

PlaneData {
ptr,
len,
_marker: PhantomData,
}
}

pub fn new(len: usize) -> Self {
// SAFETY: we initialize the plane data before returning
let mut pd = unsafe { Self::new_uninitialized(len) };

for v in pd.iter_mut() {
*v = T::cast_from(128);
Self {
data: AVec::from_iter(
Self::DATA_ALIGNMENT,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After skimming through aligned-vec, it's fine (and maybe preferable?) to just pass 0 here. That way there'd be no need for another target-dependent const variable.

iter::repeat(T::cast_from(128)).take(len),
)
.into_boxed_slice(),
}

pd
}

fn from_slice(data: &[T]) -> Self {
// SAFETY: we initialize the plane data before returning
let mut pd = unsafe { Self::new_uninitialized(data.len()) };

pd.copy_from_slice(data);

pd
Self {
data: AVec::from_slice(Self::DATA_ALIGNMENT, data).into_boxed_slice(),
}
}
}

Expand Down Expand Up @@ -279,21 +194,6 @@ impl<T: Pixel> Plane<T> {
Plane { data, cfg }
}

/// Allocates and returns an uninitialized plane.
unsafe fn new_uninitialized(
width: usize,
height: usize,
xdec: usize,
ydec: usize,
xpad: usize,
ypad: usize,
) -> Self {
let cfg = PlaneConfig::new(width, height, xdec, ydec, xpad, ypad, mem::size_of::<T>());
let data = PlaneData::new_uninitialized(cfg.stride * cfg.alloc_height);

Plane { data, cfg }
}

/// # Panics
///
/// - If `len` is not a multiple of `stride`
Expand Down Expand Up @@ -557,17 +457,14 @@ impl<T: Pixel> Plane<T> {
/// - If the requested width and height are > half the input width or height
pub fn downsampled(&self, frame_width: usize, frame_height: usize) -> Plane<T> {
let src = self;
// SAFETY: all pixels initialized in this function
let mut new = unsafe {
Plane::new_uninitialized(
(src.cfg.width + 1) / 2,
(src.cfg.height + 1) / 2,
src.cfg.xdec + 1,
src.cfg.ydec + 1,
src.cfg.xpad / 2,
src.cfg.ypad / 2,
)
};
let mut new = Plane::new(
(src.cfg.width + 1) / 2,
(src.cfg.height + 1) / 2,
src.cfg.xdec + 1,
src.cfg.ydec + 1,
src.cfg.xpad / 2,
src.cfg.ypad / 2,
);

let width = new.cfg.width;
let height = new.cfg.height;
Expand Down Expand Up @@ -606,10 +503,7 @@ impl<T: Pixel> Plane<T> {

/// Returns a plane downscaled from the source plane by a factor of `scale` (not padded)
pub fn downscale<const SCALE: usize>(&self) -> Plane<T> {
// SAFETY: all pixels initialized when `downscale_in_place` is called
let mut new_plane = unsafe {
Plane::new_uninitialized(self.cfg.width / SCALE, self.cfg.height / SCALE, 0, 0, 0, 0)
};
let mut new_plane = Plane::new(self.cfg.width / SCALE, self.cfg.height / SCALE, 0, 0, 0, 0);

self.downscale_in_place::<SCALE>(&mut new_plane);

Expand Down
Loading