From 307f52c002c43c268e59d9eddb17ed6036d170e8 Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Tue, 2 Jun 2020 17:54:31 +0800 Subject: [PATCH] Reformat code with latest cargo fmt --- examples/transcode-audio.rs | 6 ++++-- src/codec/encoder/video.rs | 3 ++- src/codec/subtitle/mod.rs | 12 ++++++------ src/device/extensions.rs | 6 +++--- src/software/scaling/context.rs | 6 ++++-- src/util/color/primaries.rs | 3 ++- src/util/color/range.rs | 3 ++- src/util/color/space.rs | 3 ++- src/util/color/transfer_characteristic.rs | 3 ++- src/util/frame/audio.rs | 4 +++- src/util/frame/video.rs | 24 +++++++++++++++-------- 11 files changed, 46 insertions(+), 27 deletions(-) diff --git a/examples/transcode-audio.rs b/examples/transcode-audio.rs index f279034..0e99b1c 100644 --- a/examples/transcode-audio.rs +++ b/examples/transcode-audio.rs @@ -66,14 +66,16 @@ fn transcoder>( path: &P, filter_spec: &str, ) -> Result { - let input = ictx.streams() + let input = ictx + .streams() .best(media::Type::Audio) .expect("could not find best audio stream"); let mut decoder = input.codec().decoder().audio()?; let codec = ffmpeg::encoder::find(octx.format().codec(path, media::Type::Audio)) .expect("failed to find encoder") .audio()?; - let global = octx.format() + let global = octx + .format() .flags() .contains(ffmpeg::format::flag::Flags::GLOBAL_HEADER); diff --git a/src/codec/encoder/video.rs b/src/codec/encoder/video.rs index a21aaa1..7b4e425 100644 --- a/src/codec/encoder/video.rs +++ b/src/codec/encoder/video.rs @@ -422,7 +422,8 @@ impl Encoder { out: &mut P, ) -> Result { unsafe { - if self.format() != frame.format() || self.width() != frame.width() + if self.format() != frame.format() + || self.width() != frame.width() || self.height() != frame.height() { return Err(Error::InvalidData); diff --git a/src/codec/subtitle/mod.rs b/src/codec/subtitle/mod.rs index 9b93d85..0eb006a 100644 --- a/src/codec/subtitle/mod.rs +++ b/src/codec/subtitle/mod.rs @@ -147,9 +147,9 @@ impl<'a> Iterator for RectIter<'a> { None } else { self.cur += 1; - Some(Rect::wrap(*(*self.ptr) - .rects - .offset((self.cur - 1) as isize))) + Some(Rect::wrap( + *(*self.ptr).rects.offset((self.cur - 1) as isize), + )) } } } @@ -191,9 +191,9 @@ impl<'a> Iterator for RectMutIter<'a> { None } else { self.cur += 1; - Some(RectMut::wrap(*(*self.ptr) - .rects - .offset((self.cur - 1) as isize))) + Some(RectMut::wrap( + *(*self.ptr).rects.offset((self.cur - 1) as isize), + )) } } } diff --git a/src/device/extensions.rs b/src/device/extensions.rs index 4da0364..3b7f224 100644 --- a/src/device/extensions.rs +++ b/src/device/extensions.rs @@ -59,9 +59,9 @@ impl<'a> Iterator for DeviceIter<'a> { None } else { self.cur += 1; - Some(device::Info::wrap(*(*self.ptr) - .devices - .offset((self.cur - 1) as isize))) + Some(device::Info::wrap( + *(*self.ptr).devices.offset((self.cur - 1) as isize), + )) } } } diff --git a/src/software/scaling/context.rs b/src/software/scaling/context.rs index 969ca99..77cd331 100644 --- a/src/software/scaling/context.rs +++ b/src/software/scaling/context.rs @@ -128,7 +128,8 @@ impl Context { } pub fn run(&mut self, input: &frame::Video, output: &mut frame::Video) -> Result<(), Error> { - if input.format() != self.input.format || input.width() != self.input.width + if input.format() != self.input.format + || input.width() != self.input.width || input.height() != self.input.height { return Err(Error::InputChanged); @@ -140,7 +141,8 @@ impl Context { } } - if output.format() != self.output.format || output.width() != self.output.width + if output.format() != self.output.format + || output.width() != self.output.width || output.height() != self.output.height { return Err(Error::OutputChanged); diff --git a/src/util/color/primaries.rs b/src/util/color/primaries.rs index f6fced6..5143923 100644 --- a/src/util/color/primaries.rs +++ b/src/util/color/primaries.rs @@ -31,7 +31,8 @@ impl Primaries { } unsafe { let ptr = av_color_primaries_name((*self).into()); - ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) + ptr.as_ref() + .map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) } } } diff --git a/src/util/color/range.rs b/src/util/color/range.rs index 678f830..4fb267c 100644 --- a/src/util/color/range.rs +++ b/src/util/color/range.rs @@ -18,7 +18,8 @@ impl Range { } unsafe { let ptr = av_color_range_name((*self).into()); - ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) + ptr.as_ref() + .map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) } } } diff --git a/src/util/color/space.rs b/src/util/color/space.rs index 4bc65b3..eba43c1 100644 --- a/src/util/color/space.rs +++ b/src/util/color/space.rs @@ -33,7 +33,8 @@ impl Space { } unsafe { let ptr = av_color_space_name((*self).into()); - ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) + ptr.as_ref() + .map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) } } } diff --git a/src/util/color/transfer_characteristic.rs b/src/util/color/transfer_characteristic.rs index bc18fe5..70e16d1 100644 --- a/src/util/color/transfer_characteristic.rs +++ b/src/util/color/transfer_characteristic.rs @@ -34,7 +34,8 @@ impl TransferCharacteristic { } unsafe { let ptr = av_color_transfer_name((*self).into()); - ptr.as_ref().map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) + ptr.as_ref() + .map(|ptr| from_utf8_unchecked(CStr::from_ptr(ptr).to_bytes())) } } } diff --git a/src/util/frame/audio.rs b/src/util/frame/audio.rs index 126e44d..f29c427 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -64,7 +64,9 @@ impl Audio { #[inline] pub fn channel_layout(&self) -> ChannelLayout { unsafe { - ChannelLayout::from_bits_truncate(av_frame_get_channel_layout(self.as_ptr()) as c_ulonglong) + ChannelLayout::from_bits_truncate( + av_frame_get_channel_layout(self.as_ptr()) as c_ulonglong + ) } } diff --git a/src/util/frame/video.rs b/src/util/frame/video.rs index d62b41c..e4fcdb5 100644 --- a/src/util/frame/video.rs +++ b/src/util/frame/video.rs @@ -399,19 +399,27 @@ unsafe impl Component for (u8, u8, u8) { unsafe impl Component for [u8; 4] { #[inline(always)] fn is_valid(format: format::Pixel) -> bool { - format == format::Pixel::RGBA || format == format::Pixel::BGRA - || format == format::Pixel::ARGB || format == format::Pixel::ABGR - || format == format::Pixel::RGBZ || format == format::Pixel::BGRZ - || format == format::Pixel::ZRGB || format == format::Pixel::ZBGR + format == format::Pixel::RGBA + || format == format::Pixel::BGRA + || format == format::Pixel::ARGB + || format == format::Pixel::ABGR + || format == format::Pixel::RGBZ + || format == format::Pixel::BGRZ + || format == format::Pixel::ZRGB + || format == format::Pixel::ZBGR } } unsafe impl Component for (u8, u8, u8, u8) { #[inline(always)] fn is_valid(format: format::Pixel) -> bool { - format == format::Pixel::RGBA || format == format::Pixel::BGRA - || format == format::Pixel::ARGB || format == format::Pixel::ABGR - || format == format::Pixel::RGBZ || format == format::Pixel::BGRZ - || format == format::Pixel::ZRGB || format == format::Pixel::ZBGR + format == format::Pixel::RGBA + || format == format::Pixel::BGRA + || format == format::Pixel::ARGB + || format == format::Pixel::ABGR + || format == format::Pixel::RGBZ + || format == format::Pixel::BGRZ + || format == format::Pixel::ZRGB + || format == format::Pixel::ZBGR } }