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: Stop stream sound when gaps are encountered 

Generally there is one SoundStreamBlock per frame in a MovieClip.
However, if there are gaps between stream sounds, the stream must
stop and then pick up when the next block is encountered.

TODO: Sometimes Flash will do weird stuff and export a stream that
is plainly out of sync if there are gaps between sounds (the old
trick was to put a silent stream across the entire timeline to fix
this). This happens when the streams are too close together with
MP3 encoding. Investigate this more.
This commit is contained in:
Mike Welsh 2019-10-29 13:27:44 -07:00
parent 1a7959b96d
commit 443dcfaeea
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/display_object/movie_clip.rs
View File

@ -250,7 +250,7 @@ impl<'gc> MovieClip<'gc> {
let _tag_pos = self.tag_stream_pos;
let mut reader = self.reader(context);
let mut has_stream_block = false;
use swf::TagCode;
let tag_callback = |reader: &mut _, tag_code, tag_len| match tag_code {
@ -271,12 +271,23 @@ impl<'gc> MovieClip<'gc> {
TagCode::RemoveObject2 if run_display_actions => self.remove_object(context, reader, 2),
TagCode::SetBackgroundColor => self.set_background_color(context, reader),
TagCode::StartSound => self.start_sound_1(context, reader),
TagCode::SoundStreamBlock => self.sound_stream_block(context, reader),
TagCode::SoundStreamBlock => {
has_stream_block = true;
self.sound_stream_block(context, reader)
}
_ => Ok(()),
};
let _ = tag_utils::decode_tags(&mut reader, tag_callback, TagCode::ShowFrame);
self.tag_stream_pos = reader.get_ref().position();
// If we are playing a streaming sound, there should(?) be a `SoundStreamBlock` on each frame.
if let Some(audio_stream) = self.audio_stream {
if !has_stream_block {
context.audio.stop_stream(audio_stream);
self.audio_stream = None;
}
}
}
fn instantiate_child(