liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Buffer overruns should not pause the stream unless we are actually at the end of the video.

This commit is contained in:
David Wendt 2024-01-14 20:01:32 -05:00 committed by kmeisthax
parent 14dec5dcce
commit 56c14be708
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/streams.rs
View File

@ -1108,7 +1108,7 @@ impl<'gc> NetStream<'gc> {
let buffer = slice.data(); let buffer = slice.data();
let end_time = write.stream_time + dt; let end_time = write.stream_time + dt;
let mut end_of_video = false; let mut buffer_underrun = false;
let mut error = false; let mut error = false;
let mut max_lookahead_audio_tags = 5; let mut max_lookahead_audio_tags = 5;
let mut is_lookahead_tag = false; let mut is_lookahead_tag = false;
@ -1126,7 +1126,7 @@ impl<'gc> NetStream<'gc> {
// those tags "for realsies" // those tags "for realsies"
if !is_lookahead_tag && matches!(e, FlvError::EndOfData) { if !is_lookahead_tag && matches!(e, FlvError::EndOfData) {
//TODO: Check expected total length for streaming / progressive download //TODO: Check expected total length for streaming / progressive download
end_of_video = true; buffer_underrun = true;
} else if !is_lookahead_tag { } else if !is_lookahead_tag {
//Corrupt tag or out of data //Corrupt tag or out of data
tracing::error!("FLV tag parsing failed: {}", e); tracing::error!("FLV tag parsing failed: {}", e);
@ -1192,20 +1192,29 @@ impl<'gc> NetStream<'gc> {
} }
drop(write); drop(write);
if end_of_video { if buffer_underrun {
let is_end_of_video = self.0.read().expected_length.is_none();
self.trigger_status_event( self.trigger_status_event(
context, context,
vec![("code", "NetStream.Buffer.Flush"), ("level", "status")], vec![("code", "NetStream.Buffer.Flush"), ("level", "status")],
); );
self.trigger_status_event(
context, if is_end_of_video {
vec![("code", "NetStream.Play.Stop"), ("level", "status")], self.trigger_status_event(
); context,
vec![("code", "NetStream.Play.Stop"), ("level", "status")],
);
}
self.trigger_status_event( self.trigger_status_event(
context, context,
vec![("code", "NetStream.Buffer.Empty"), ("level", "status")], vec![("code", "NetStream.Buffer.Empty"), ("level", "status")],
); );
self.pause(context, false);
if is_end_of_video {
self.pause(context, false);
}
} }
if error { if error {