media: cros-codecs: dummy: remove generic parameter
This generic parameter is not necessary.
BUG=b:214478588
TEST=cargo test --features vaapi -p cros-codecs
Change-Id: I79a360dab3143efee4c7bd1eeaefe996a29bd61a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4164539
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Alexandre Courbot <acourbot@chromium.org>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.corp-partner.google.com>
diff --git a/src/decoders/h264/backends/dummy.rs b/src/decoders/h264/backends/dummy.rs
index dc1be16..2e259ec 100644
--- a/src/decoders/h264/backends/dummy.rs
+++ b/src/decoders/h264/backends/dummy.rs
@@ -20,7 +20,7 @@
use crate::decoders::BlockingMode;
use crate::utils::dummy::*;
-impl StatelessDecoderBackend for Backend<BackendHandle> {
+impl StatelessDecoderBackend for Backend {
fn new_sequence(&mut self, _: &Sps) -> StatelessBackendResult<()> {
Ok(())
}
@@ -75,7 +75,7 @@
}
}
-impl Decoder<Handle<BackendHandle>> {
+impl Decoder<Handle> {
// Creates a new instance of the decoder using the dummy backend.
pub fn new_dummy(blocking_mode: BlockingMode) -> anyhow::Result<Self> {
Self::new(Box::new(Backend::new()), blocking_mode)
diff --git a/src/decoders/vp8/backends/dummy.rs b/src/decoders/vp8/backends/dummy.rs
index 77f0e71..2e48497 100644
--- a/src/decoders/vp8/backends/dummy.rs
+++ b/src/decoders/vp8/backends/dummy.rs
@@ -16,7 +16,7 @@
use crate::decoders::BlockingMode;
use crate::utils::dummy::*;
-impl StatelessDecoderBackend for Backend<BackendHandle> {
+impl StatelessDecoderBackend for Backend {
fn new_sequence(&mut self, _: &crate::decoders::vp8::parser::Header) -> super::Result<()> {
Ok(())
}
@@ -45,7 +45,7 @@
}
}
-impl Decoder<Handle<BackendHandle>> {
+impl Decoder<Handle> {
// Creates a new instance of the decoder using the dummy backend.
pub fn new_dummy(blocking_mode: BlockingMode) -> anyhow::Result<Self> {
Self::new(Box::new(Backend::new()), blocking_mode)
diff --git a/src/decoders/vp9/backends/dummy.rs b/src/decoders/vp9/backends/dummy.rs
index 3e9087b..9470556 100644
--- a/src/decoders/vp9/backends/dummy.rs
+++ b/src/decoders/vp9/backends/dummy.rs
@@ -17,7 +17,7 @@
use crate::decoders::BlockingMode;
use crate::utils::dummy::*;
-impl StatelessDecoderBackend for Backend<BackendHandle> {
+impl StatelessDecoderBackend for Backend {
fn new_sequence(&mut self, _: &crate::decoders::vp9::parser::Header) -> super::Result<()> {
Ok(())
}
@@ -43,7 +43,7 @@
}
}
-impl Decoder<Handle<BackendHandle>> {
+impl Decoder<Handle> {
// Creates a new instance of the decoder using the dummy backend.
pub fn new_dummy(blocking_mode: BlockingMode) -> anyhow::Result<Self> {
Self::new(Box::new(Backend::new()), blocking_mode)
diff --git a/src/utils/dummy.rs b/src/utils/dummy.rs
index 209936a..e85ab1e 100644
--- a/src/utils/dummy.rs
+++ b/src/utils/dummy.rs
@@ -7,7 +7,6 @@
use std::cell::RefCell;
use std::collections::VecDeque;
-use std::marker::PhantomData;
use std::rc::Rc;
use crate::decoders::BlockingMode;
@@ -38,11 +37,11 @@
}
}
-pub struct Handle<T> {
- pub handle: Rc<RefCell<T>>,
+pub struct Handle {
+ pub handle: Rc<RefCell<BackendHandle>>,
}
-impl<T> Clone for Handle<T> {
+impl Clone for Handle {
fn clone(&self) -> Self {
Self {
handle: Rc::clone(&self.handle),
@@ -50,7 +49,7 @@
}
}
-impl DecodedHandle for Handle<BackendHandle> {
+impl DecodedHandle for Handle {
type BackendHandle = BackendHandle;
fn handle_rc(&self) -> &Rc<RefCell<Self::BackendHandle>> {
@@ -73,19 +72,19 @@
}
/// Dummy backend that can be used for any codec.
-pub(crate) struct Backend<H>(PhantomData<H>);
+pub(crate) struct Backend;
-impl<H> Backend<H> {
+impl Backend {
pub(crate) fn new() -> Self {
- Self(Default::default())
+ Self
}
}
-impl<H> VideoDecoderBackend for Backend<H>
+impl VideoDecoderBackend for Backend
where
- Handle<H>: DecodedHandle,
+ Handle: DecodedHandle,
{
- type Handle = Handle<H>;
+ type Handle = Handle;
fn num_resources_total(&self) -> usize {
1
