From 768b68f94aa31902c936328caa6f50de507e98bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 6 Nov 2017 23:16:32 +0200 Subject: [PATCH] Fix up Adapter's WouldBlock error message With the correct values of requested and available bytes. --- gst-plugin/src/adapter.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gst-plugin/src/adapter.rs b/gst-plugin/src/adapter.rs index ceb64a5e..e5cd36d7 100644 --- a/gst-plugin/src/adapter.rs +++ b/gst-plugin/src/adapter.rs @@ -258,21 +258,21 @@ impl Adapter { impl io::Read for Adapter { fn read(&mut self, buf: &mut [u8]) -> Result { - let mut len = self.get_available(); + let mut len = self.size; + + if len == 0 { + return Err(io::Error::new( + io::ErrorKind::WouldBlock, + format!("Missing data: requesting {} but only got {}.", + buf.len(), len))); + } if buf.len() < len { len = buf.len(); } - if self.size == 0 { - return Err(io::Error::new( - io::ErrorKind::WouldBlock, - format!("Missing data: requesting {} but only got {}.", - len, self.size))); - } - Self::copy_data(&self.deque, self.skip, buf, len); - self.flush(len); + self.flush(len).unwrap(); Ok(len) } }