Skip to content

Commit 730deb9

Browse files
committed
Merge branch 'master' into fix-signaling-state
2 parents 8c7c39f + 1e2cfd5 commit 730deb9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

media/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "webrtc-media"
3-
version = "0.5.0"
3+
version = "0.5.1"
44
authors = ["Rain Liu <yliu@webrtc.rs>"]
55
edition = "2021"
66
description = "A pure Rust implementation of WebRTC Media API"

media/src/io/h264_reader/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl<R: Read> H264Reader<R> {
154154
}
155155
}
156156

157-
fn read(&mut self, num_to_read: usize) -> Bytes {
157+
fn read(&mut self, num_to_read: usize) -> Result<Bytes> {
158158
let buf = &mut self.temp_buf;
159159
while self.read_buffer.len() < num_to_read {
160160
let n = match self.reader.read(buf) {
@@ -164,7 +164,7 @@ impl<R: Read> H264Reader<R> {
164164
}
165165
n
166166
}
167-
Err(_) => break,
167+
Err(e) => return Err(Error::Io(e.into())),
168168
};
169169

170170
self.read_buffer.extend_from_slice(&buf[0..n]);
@@ -176,15 +176,15 @@ impl<R: Read> H264Reader<R> {
176176
self.read_buffer.len()
177177
};
178178

179-
Bytes::from(
179+
Ok(Bytes::from(
180180
self.read_buffer
181181
.drain(..num_should_read)
182182
.collect::<Vec<u8>>(),
183-
)
183+
))
184184
}
185185

186186
fn bit_stream_starts_with_h264prefix(&mut self) -> Result<usize> {
187-
let prefix_buffer = self.read(4);
187+
let prefix_buffer = self.read(4)?;
188188

189189
let n = prefix_buffer.len();
190190
if n == 0 {
@@ -228,7 +228,7 @@ impl<R: Read> H264Reader<R> {
228228
}
229229

230230
loop {
231-
let buffer = self.read(1);
231+
let buffer = self.read(1)?;
232232
let n = buffer.len();
233233

234234
if n != 1 {

webrtc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "webrtc"
3-
version = "0.7.1"
3+
version = "0.7.2"
44
authors = ["Rain Liu <yliu@webrtc.rs>"]
55
edition = "2021"
66
description = "A pure Rust implementation of WebRTC API"
@@ -19,7 +19,7 @@ dtls = { version = "0.7.1", path = "../dtls", package = "webrtc-dtls" }
1919
ice = { version = "0.9.0", path = "../ice", package = "webrtc-ice" }
2020
interceptor = { version = "0.8.2", path = "../interceptor" }
2121
mdns = { version = "0.5.0", path = "../mdns", package = "webrtc-mdns" }
22-
media = { version = "0.5.0", path = "../media", package = "webrtc-media" }
22+
media = { version = "0.5.1", path = "../media", package = "webrtc-media" }
2323
rtcp = { version = "0.7.0", path = "../rtcp" }
2424
rtp = { version = "0.6.7", path = "../rtp" }
2525
sctp = { version = "0.8.0", path = "../sctp", package = "webrtc-sctp" }

0 commit comments

Comments
 (0)