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: Use root movie URL as base for relative NetStream URLs

This commit is contained in:
nosamu 2023-08-09 03:44:33 -05:00 committed by TÖRÖK Attila
parent fb01473bb3
commit 0b368f1223
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/streams.rs
View File

@ -28,6 +28,7 @@ use std::cmp::max;
use std::io::Seek; use std::io::Seek;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use swf::{VideoCodec, VideoDeblocking}; use swf::{VideoCodec, VideoDeblocking};
use url::Url;
/// Manager for all media streams. /// Manager for all media streams.
/// ///
@ -258,7 +259,13 @@ impl<'gc> NetStream<'gc> {
/// available in the buffer. /// available in the buffer.
pub fn play(self, context: &mut UpdateContext<'_, 'gc>, name: Option<AvmString<'gc>>) { pub fn play(self, context: &mut UpdateContext<'_, 'gc>, name: Option<AvmString<'gc>>) {
if let Some(name) = name { if let Some(name) = name {
let request = Request::get(name.to_string()); let request = if let Ok(stream_url) =
Url::parse(context.swf.url()).and_then(|url| url.join(name.to_string().as_str()))
{
Request::get(stream_url.to_string())
} else {
Request::get(name.to_string())
};
let mut write = self.0.write(context.gc_context); let mut write = self.0.write(context.gc_context);
write.url = Some(request.url().to_string()); write.url = Some(request.url().to_string());
write.preload_offset = 0; write.preload_offset = 0;