diff --git a/media/cros-codecs/src/decoders/h264/backends/stateless/dummy.rs b/media/cros-codecs/src/decoders/h264/backends/stateless/dummy.rs index 89a6752df0..5e28d2679e 100644 --- a/media/cros-codecs/src/decoders/h264/backends/stateless/dummy.rs +++ b/media/cros-codecs/src/decoders/h264/backends/stateless/dummy.rs @@ -6,7 +6,6 @@ //! run so we can test it in isolation. use std::cell::RefCell; -use std::collections::HashSet; use std::collections::VecDeque; use std::rc::Rc; @@ -22,40 +21,6 @@ use crate::decoders::h264::parser::Sps; use crate::decoders::h264::picture::H264Picture; use crate::decoders::VideoDecoderBackend; use crate::utils::dummy::*; -use crate::DecodedFormat; -use crate::Resolution; - -pub struct Backend; - -impl VideoDecoderBackend for Backend { - fn num_resources_total(&self) -> usize { - 1 - } - - fn num_resources_left(&self) -> usize { - 1 - } - - fn format(&self) -> Option { - None - } - - fn try_format(&mut self, _: DecodedFormat) -> crate::decoders::Result<()> { - Ok(()) - } - - fn supported_formats_for_stream(&self) -> crate::decoders::Result> { - Ok(HashSet::new()) - } - - fn coded_resolution(&self) -> Option { - None - } - - fn display_resolution(&self) -> Option { - None - } -} impl StatelessDecoderBackend for Backend { type Handle = Handle>; diff --git a/media/cros-codecs/src/decoders/h264/decoder.rs b/media/cros-codecs/src/decoders/h264/decoder.rs index 0a00156e0b..b9a0e39fe9 100644 --- a/media/cros-codecs/src/decoders/h264/decoder.rs +++ b/media/cros-codecs/src/decoders/h264/decoder.rs @@ -2557,7 +2557,6 @@ where pub mod tests { use std::io::Cursor; - use crate::decoders::h264::backends::stateless::dummy::Backend; use crate::decoders::h264::decoder::Decoder; use crate::decoders::h264::nalu_reader::NaluReader; use crate::decoders::h264::parser::Nalu; @@ -2567,6 +2566,7 @@ pub mod tests { use crate::decoders::DecodedHandle; use crate::decoders::DynDecodedHandle; use crate::decoders::VideoDecoder; + use crate::utils::dummy::Backend; pub fn process_ready_frames( decoder: &mut Decoder, diff --git a/media/cros-codecs/src/decoders/vp8/backends/stateless/dummy.rs b/media/cros-codecs/src/decoders/vp8/backends/stateless/dummy.rs index 3bd02d6fd9..752a147ad4 100644 --- a/media/cros-codecs/src/decoders/vp8/backends/stateless/dummy.rs +++ b/media/cros-codecs/src/decoders/vp8/backends/stateless/dummy.rs @@ -6,7 +6,6 @@ // run so we can test it in isolation. use std::cell::RefCell; -use std::collections::HashSet; use std::collections::VecDeque; use std::rc::Rc; @@ -14,40 +13,6 @@ use crate::decoders::vp8::backends::stateless::StatelessDecoderBackend; use crate::decoders::vp8::backends::stateless::Vp8Picture; use crate::decoders::VideoDecoderBackend; use crate::utils::dummy::*; -use crate::DecodedFormat; -use crate::Resolution; - -pub struct Backend; - -impl VideoDecoderBackend for Backend { - fn num_resources_total(&self) -> usize { - 1 - } - - fn num_resources_left(&self) -> usize { - 1 - } - - fn format(&self) -> Option { - None - } - - fn try_format(&mut self, _: DecodedFormat) -> crate::decoders::Result<()> { - Ok(()) - } - - fn supported_formats_for_stream(&self) -> crate::decoders::Result> { - Ok(HashSet::new()) - } - - fn coded_resolution(&self) -> Option { - None - } - - fn display_resolution(&self) -> Option { - None - } -} impl StatelessDecoderBackend for Backend { type Handle = Handle>; diff --git a/media/cros-codecs/src/decoders/vp8/decoder.rs b/media/cros-codecs/src/decoders/vp8/decoder.rs index b4af478a86..4f27eb866d 100644 --- a/media/cros-codecs/src/decoders/vp8/decoder.rs +++ b/media/cros-codecs/src/decoders/vp8/decoder.rs @@ -462,13 +462,13 @@ pub mod tests { use bytes::Buf; - use crate::decoders::vp8::backends::stateless::dummy::Backend; use crate::decoders::vp8::decoder::Decoder; use crate::decoders::vp8::parser::Header; use crate::decoders::BlockingMode; use crate::decoders::DecodedHandle; use crate::decoders::DynDecodedHandle; use crate::decoders::VideoDecoder; + use crate::utils::dummy::Backend; /// Read and return the data from the next IVF packet. Returns `None` if there is no more data /// to read. diff --git a/media/cros-codecs/src/decoders/vp9/backends/stateless/dummy.rs b/media/cros-codecs/src/decoders/vp9/backends/stateless/dummy.rs index 194acb8901..0b0d61c2a3 100644 --- a/media/cros-codecs/src/decoders/vp9/backends/stateless/dummy.rs +++ b/media/cros-codecs/src/decoders/vp9/backends/stateless/dummy.rs @@ -6,7 +6,6 @@ //! run so we can test it in isolation. use std::cell::RefCell; -use std::collections::HashSet; use std::collections::VecDeque; use std::rc::Rc; @@ -15,40 +14,6 @@ use crate::decoders::vp9::backends::stateless::Vp9Picture; use crate::decoders::vp9::parser::NUM_REF_FRAMES; use crate::decoders::VideoDecoderBackend; use crate::utils::dummy::*; -use crate::DecodedFormat; -use crate::Resolution; - -pub struct Backend; - -impl VideoDecoderBackend for Backend { - fn num_resources_total(&self) -> usize { - 1 - } - - fn num_resources_left(&self) -> usize { - 1 - } - - fn format(&self) -> Option { - None - } - - fn try_format(&mut self, _: DecodedFormat) -> crate::decoders::Result<()> { - Ok(()) - } - - fn supported_formats_for_stream(&self) -> crate::decoders::Result> { - Ok(HashSet::new()) - } - - fn coded_resolution(&self) -> Option { - None - } - - fn display_resolution(&self) -> Option { - None - } -} impl StatelessDecoderBackend for Backend { type Handle = Handle>; diff --git a/media/cros-codecs/src/decoders/vp9/decoder.rs b/media/cros-codecs/src/decoders/vp9/decoder.rs index e96e0ffc5b..b9b88db022 100644 --- a/media/cros-codecs/src/decoders/vp9/decoder.rs +++ b/media/cros-codecs/src/decoders/vp9/decoder.rs @@ -440,13 +440,13 @@ pub mod tests { use bytes::Buf; - use crate::decoders::vp9::backends::stateless::dummy::Backend; use crate::decoders::vp9::decoder::Decoder; use crate::decoders::vp9::parser::Header; use crate::decoders::BlockingMode; use crate::decoders::DecodedHandle; use crate::decoders::DynDecodedHandle; use crate::decoders::VideoDecoder; + use crate::utils::dummy::Backend; /// Read and return the data from the next IVF packet. Returns `None` if there is no more data /// to read. diff --git a/media/cros-codecs/src/utils/dummy.rs b/media/cros-codecs/src/utils/dummy.rs index d4430ea7f3..402bb95ef8 100644 --- a/media/cros-codecs/src/utils/dummy.rs +++ b/media/cros-codecs/src/utils/dummy.rs @@ -6,6 +6,7 @@ //! run so we can test it in isolation. use std::cell::RefCell; +use std::collections::HashSet; use std::rc::Rc; use crate::decoders::DecodedHandle; @@ -14,6 +15,8 @@ use crate::decoders::FrameInfo; use crate::decoders::MappableHandle; use crate::decoders::Picture; use crate::decoders::Result; +use crate::decoders::VideoDecoderBackend; +use crate::DecodedFormat; use crate::Resolution; pub struct BackendHandle; @@ -64,3 +67,36 @@ impl DecodedHandle for Handle> { fn set_display_order(&mut self, _: u64) {} } + +/// Dummy backend that can be used for any codec. +pub struct Backend; + +impl VideoDecoderBackend for Backend { + fn num_resources_total(&self) -> usize { + 1 + } + + fn num_resources_left(&self) -> usize { + 1 + } + + fn format(&self) -> Option { + None + } + + fn try_format(&mut self, _: DecodedFormat) -> crate::decoders::Result<()> { + Ok(()) + } + + fn supported_formats_for_stream(&self) -> crate::decoders::Result> { + Ok(HashSet::new()) + } + + fn coded_resolution(&self) -> Option { + None + } + + fn display_resolution(&self) -> Option { + None + } +}