From 5eb25a313aef10c957c222328795a315778bba29 Mon Sep 17 00:00:00 2001 From: Vignesh Venkat Date: Tue, 24 Sep 2024 14:23:49 -0700 Subject: [PATCH] mediacodec: Fix build failures PiperOrigin-RevId: 678396014 --- src/codecs/android_mediacodec.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/codecs/android_mediacodec.rs b/src/codecs/android_mediacodec.rs index cdd6c87..41af12c 100644 --- a/src/codecs/android_mediacodec.rs +++ b/src/codecs/android_mediacodec.rs @@ -179,17 +179,15 @@ impl MediaFormat { return self.guess_plane_info(); } if size != std::mem::size_of::() { - return guess_plane_info(format); + return self.guess_plane_info(); } let image_data = unsafe { *(data as *const android_MediaImage2) }; if image_data.mType != android_MediaImage2_Type_MEDIA_IMAGE_TYPE_YUV { return self.guess_plane_info(); } let planes = unsafe { ptr::read_unaligned(ptr::addr_of!(image_data.mPlane)) }; - let color_format = get_i32(format, unsafe { AMEDIAFORMAT_KEY_COLOR_FORMAT }) - .ok_or(AvifError::UnknownError("".into()))?; let mut plane_info = PlaneInfo { - color_format, + color_format: self.color_format()?, ..Default::default() }; for plane_index in 0usize..3 {