From c757c8b5b92834baf6c6fd01d49bc083412b57fa Mon Sep 17 00:00:00 2001 From: Folkert Date: Wed, 6 Mar 2024 17:02:03 +0100 Subject: [PATCH] `enum Rav1dWarpedMotionType`: `From` into `TryFrom` --- include/dav1d/headers.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/dav1d/headers.rs b/include/dav1d/headers.rs index ebcddd05e..022a00196 100644 --- a/include/dav1d/headers.rs +++ b/include/dav1d/headers.rs @@ -304,18 +304,20 @@ impl Rav1dWarpedMotionParams { } } -impl From for Rav1dWarpedMotionParams { - fn from(value: Dav1dWarpedMotionParams) -> Self { +impl TryFrom for Rav1dWarpedMotionParams { + type Error = (); + + fn try_from(value: Dav1dWarpedMotionParams) -> Result { let Dav1dWarpedMotionParams { r#type, matrix, abcd, } = value; - Self { - r#type: Rav1dWarpedMotionType::from_repr(r#type as usize).unwrap(), + Ok(Self { + r#type: Rav1dWarpedMotionType::from_repr(r#type as usize).ok_or(())?, matrix, abcd: Abcd::new(abcd), - } + }) } } @@ -2424,7 +2426,7 @@ impl From for Rav1dFrameHeader { }, warp_motion, reduced_txtp_set, - gmv: gmv.map(|c| c.into()), + gmv: gmv.map(|c| c.try_into().unwrap()), } } }