mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-11 04:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: virtio: video: Use the fixed buffer for notifying EOS

Browse source 
When VDA requests crosvm to allocate N output buffers, crosvm will
request the userspace to allocate N+1 output buffers. Then crosvm
keeps one output buffer for notifying EOS.

Originally, after the preserved buffer is dequeued to notify EOS,
crosvm might keep another output buffer for next EOS. If so, then
crosvm will register all the N+1 buffers to VDA.

This CL changes to fix the preserved buffer until VDA requests another
set of output buffers. Also, it introduces another variable to track
the resource ids of queued buffers.

BUG=b:168557465
TEST=pass android.media.cts.AdaptivePlaybackTest#testVP8_eosFlushSeek
     with related CLs

Change-Id: I8a6018f9e889dc6a2b6ef67d4915d6202858a42a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2404512
Tested-by: Chih-Yu Huang <akahuang@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Auto-Submit: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
This commit is contained in:
Chih-Yu Huang 2020-09-11 17:25:03 +09:00 committed by Commit Bot
parent b3c70d2b46
commit d9f640c59d
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
devices/src/virtio/video/decoder/mod.rs
View file

@ -5,7 +5,7 @@
//! Implementation of a virtio video decoder device backed by LibVDA.
use std::collections::btree_map::Entry;
use std::collections::BTreeMap;
use std::collections::{BTreeMap, BTreeSet};
use std::convert::TryInto;
use std::fs::File;
use std::os::unix::io::{AsRawFd, IntoRawFd};
@ -84,9 +84,14 @@ struct Context {
// Once we have the way in the virtio-video protocol, we should remove this flag.
set_output_buffer_count: bool,
// Reserves output resource that will be used to notify EOS.
// This resource must not be enqueued to Chrome.
keep_notification_output_buffer: Option<OutputResourceId>,
// Store the resource id of the queued output buffers.
queued_output_res_ids: BTreeSet<OutputResourceId>,
// Reserves output resource ID that will be used to notify EOS.
// If a guest enqueues a resource with this ID, the resource must not be sent to the host.
// Once the value is set, it won't be changed until resolution is changed or a stream is
// destroyed.
eos_resource_id: Option<OutputResourceId>,
}
impl Context {
@ -147,6 +152,10 @@ impl Context {
}
}
fn dequeue_eos_resource_id(&mut self) -> Option<OutputResourceId> {
self.queued_output_res_ids.take(&self.eos_resource_id?)
}
/*
* Functions handling libvda events.
*/
@ -179,7 +188,7 @@ impl Context {
// Note that rect_width is sometimes smaller.
frame_width: width as u32,
frame_height: height as u32,
// Adding 1 to `min_buffers` to reserve a resource for `keep_notification_output_buffer`.
// Adding 1 to `min_buffers` to reserve a resource for `eos_resource_id`.
min_buffers: min_num_buffers + 1,
max_buffers: 32,
crop: Crop {
@ -219,7 +228,13 @@ impl Context {
}
};
Some(resource_id)
self.queued_output_res_ids.take(&resource_id).or_else(|| {
error!(
"resource_id {} is not enqueued for stream {:?}",
resource_id, self.stream_id
);
None
})
}
fn handle_notify_end_of_bitstream_buffer(&mut self, bitstream_id: i32) -> Option<ResourceId> {
@ -540,16 +555,21 @@ impl<'a> Decoder<'a> {
}
};
if ctx.keep_notification_output_buffer.is_none() {
if !ctx.queued_output_res_ids.insert(resource_id) {
error!("resource_id {} is already enqueued", resource_id);
return Err(VideoError::InvalidParameter);
}
if ctx.eos_resource_id.is_none() {
// Stores an output buffer to notify EOS.
// This is necessary because libvda is unable to indicate EOS along
// with returned buffers.
// For now, when a `Flush()` completes, this saved resource will be
// returned as a zero-sized buffer with the EOS flag.
// TODO(b/149725148): Remove this when libvda supports buffer flags.
ctx.keep_notification_output_buffer = Some(resource_id);
// Don't enqueue this resource to Chrome.
ctx.eos_resource_id = Some(resource_id);
}
if ctx.eos_resource_id == Some(resource_id) {
// Don't enqueue this resource to the host.
return Ok(());
}
@ -937,9 +957,12 @@ impl<'a> Device for Decoder<'a> {
FlushResponse(flush_response) => {
match flush_response {
libvda::decode::Response::Success => {
let eos_resource_id = match ctx.keep_notification_output_buffer.take() {
let eos_resource_id = match ctx.dequeue_eos_resource_id() {
Some(r) => r,
None => {
// TODO(b/168750131): Instead of trigger error, we should wait for
// the next output buffer enqueued, then dequeue the buffer with
// EOS flag.
error!(
"No EOS resource available on successful flush response (stream id {})",
stream_id);