mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-01-27 02:28:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enable video-decoder feature

Browse source 
This was disabled in https://crrev.com/c/3835500 due to the lack
of ffmgeg 5.0 in our dev containers.
The container has since been upgraded in https://crrev.com/c/3892621

BUG=b:244619658
TEST=presubmit

Change-Id: Ia2bd41fbd780bad7d7706e0ffe7554e202ec0eb1
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3907377
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Auto-Submit: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Dennis Kempin 2022-09-20 20:21:24 +00:00 committed by crosvm LUCI
parent 599a21392c
commit 8a38e8f36e
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -118,11 +118,13 @@ all-linux = [
"composite-disk",
"crash-report",
"default",
"ffmpeg",
"gdb",
"power-monitor-powerd",
"slirp",
"tpm",
"vtpm",
"video-decoder",
"virgl_renderer_next",
"virgl_renderer",
"wl-dmabuf",

4
devices/src/virtio/video/utils.rs
View file

@ -242,6 +242,7 @@ mod tests {
/// without depending on the "video-decoder" feature.
#[derive(Debug)]
pub enum TestEvent {
#[allow(dead_code)]
ProvidePictureBuffers {
min_num_buffers: u32,
width: i32,
@ -254,8 +255,11 @@ mod tests {
visible_rect: Rect,
},
NotifyEndOfBitstreamBuffer(u32),
#[allow(dead_code)]
NotifyError(VideoError),
#[allow(dead_code)]
FlushCompleted(VideoResult<()>),
#[allow(dead_code)]
ResetCompleted(VideoResult<()>),
}

1
media/ffmpeg/src/ffmpeg.rs
View file

@ -1,5 +1,6 @@
/* automatically generated by tools/bindgen-all-the-things */
#![allow(clippy::upper_case_acronyms)]
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]

5
tools/impl/bindgen-common.sh
View file

@ -18,6 +18,7 @@ export BINDGEN_OPTS=(
export BINDGEN_HEADER="/* automatically generated by tools/bindgen-all-the-things */
#![allow(clippy::upper_case_acronyms)]
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
@ -53,8 +54,8 @@ bindgen_cleanup() {
# Install Linux kernel headers for x86 and arm into temporary locations. These are used for KVM bindings.
if [[ -z "${BINDGEN_LINUX_X86_HEADERS+x}" || ! -d "${BINDGEN_LINUX_X86_HEADERS}" || \
-z "${BINDGEN_LINUX_ARM64_HEADERS+x}" || ! -d "${BINDGEN_LINUX_ARM64_HEADERS}" ]]; then
if [[ -z "${BINDGEN_LINUX_X86_HEADERS+x}" || ! -d "${BINDGEN_LINUX_X86_HEADERS}" ||
-z "${BINDGEN_LINUX_ARM64_HEADERS+x}" || ! -d "${BINDGEN_LINUX_ARM64_HEADERS}" ]]; then
export BINDGEN_LINUX_X86_HEADERS='/tmp/bindgen_linux_x86_headers'
export BINDGEN_LINUX_ARM64_HEADERS='/tmp/bindgen_linux_arm64_headers'

3
tools/impl/test_config.py
View file

@ -95,8 +95,7 @@ CRATE_OPTIONS: Dict[str, List[TestOption]] = {
TestOption.UNIT_AS_INTEGRATION_TEST,
],
"disk": [TestOption.DO_NOT_RUN_AARCH64, TestOption.DO_NOT_RUN_ARMHF], # b/202294155
# FFmpeg 5.0 not available on Debian Bullseye used in container images.
"ffmpeg": [TestOption.DO_NOT_BUILD],
"ffmpeg": [TestOption.DO_NOT_BUILD_ARMHF],
"cros-fuzz": [TestOption.DO_NOT_BUILD],
"fuzz": [TestOption.DO_NOT_BUILD],
"hypervisor": [