Video base/stub impls

core/src/character.rs

@@ -1,5 +1,7 @@
 use crate::backend::audio::SoundHandle;
-use crate::display_object::{Bitmap, Button, EditText, Graphic, MorphShape, MovieClip, Text};
+use crate::display_object::{
+    Bitmap, Button, EditText, Graphic, MorphShape, MovieClip, Text, Video,
+};
 use crate::font::Font;
 
 #[derive(Clone)]
@@ -13,6 +15,7 @@ pub enum Character<'gc> {
     MorphShape(MorphShape<'gc>),
     Text(Text<'gc>),
     Sound(SoundHandle),
+    Video(Video<'gc>),
 }
 
 unsafe impl<'gc> gc_arena::Collect for Character<'gc> {
@@ -28,6 +31,7 @@ unsafe impl<'gc> gc_arena::Collect for Character<'gc> {
             Character::MorphShape(c) => c.trace(cc),
             Character::Text(c) => c.trace(cc),
             Character::Sound(c) => c.trace(cc),
+            Character::Video(c) => c.trace(cc),
         }
     }
 }

core/src/display_object.rs

@@ -40,7 +40,7 @@ pub use graphic::Graphic;
 pub use morph_shape::{MorphShape, MorphShapeStatic};
 pub use movie_clip::{MovieClip, Scene};
 pub use text::Text;
-use video::Video;
+pub use video::Video;
 
 #[derive(Clone, Debug)]
 pub struct DisplayObjectBase<'gc> {

core/src/display_object/movie_clip.rs

@@ -16,6 +16,7 @@ use crate::context::{ActionType, RenderContext, UpdateContext};
 use crate::display_object::container::{ChildContainer, TDisplayObjectContainer};
 use crate::display_object::{
     Bitmap, Button, DisplayObjectBase, EditText, Graphic, MorphShapeStatic, TDisplayObject, Text,
+    Video,
 };
 use crate::drawing::Drawing;
 use crate::events::{ButtonKeyCode, ClipEvent, ClipEventResult};
@@ -32,7 +33,7 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::sync::Arc;
 use swf::read::SwfReadExt;
-use swf::{FillStyle, FrameLabelData, LineStyle};
+use swf::{FillStyle, FrameLabelData, LineStyle, Tag};
 
 type FrameNumber = u16;
 
@@ -288,6 +289,10 @@ impl<'gc> MovieClip<'gc> {
                 .0
                 .write(context.gc_context)
                 .define_sound(context, reader),
+            TagCode::DefineVideoStream => self
+                .0
+                .write(context.gc_context)
+                .define_video_stream(context, reader),
             TagCode::DefineSprite => self.0.write(context.gc_context).define_sprite(
                 context,
                 reader,
@@ -2606,6 +2611,27 @@ impl<'gc, 'a> MovieClipData<'gc> {
         Ok(())
     }
 
+    #[inline]
+    fn define_video_stream(
+        &mut self,
+        context: &mut UpdateContext<'_, 'gc, '_>,
+        reader: &mut SwfStream,
+    ) -> DecodeResult {
+        match reader.read_define_video_stream()? {
+            Tag::DefineVideoStream(streamdef) => {
+                let id = streamdef.id;
+                let video = Video::from_swf_tag(self.movie(), streamdef, context.gc_context);
+                context
+                    .library
+                    .library_for_movie_mut(self.movie())
+                    .register_character(id, Character::Video(video));
+            }
+            _ => unreachable!(),
+        };
+
+        Ok(())
+    }
+
     fn define_sprite(
         &mut self,
         context: &mut UpdateContext<'_, 'gc, '_>,

core/src/display_object/video.rs

@@ -5,8 +5,10 @@ use crate::display_object::{DisplayObjectBase, TDisplayObject};
 use crate::prelude::*;
 use crate::tag_utils::SwfMovie;
 use crate::types::{Degrees, Percent};
-use gc_arena::{Collect, Gc, GcCell};
-use swf::CharacterId;
+use gc_arena::{Collect, GcCell, MutationContext};
+use std::borrow::Borrow;
+use std::sync::Arc;
+use swf::{CharacterId, DefineVideoStream};
 
 /// A Video display object is a high-level interface to a video player.
 ///
@@ -22,30 +24,55 @@ pub struct Video<'gc>(GcCell<'gc, VideoData<'gc>>);
 #[collect(no_drop)]
 pub struct VideoData<'gc> {
     base: DisplayObjectBase<'gc>,
-    static_data: Gc<'gc, VideoStatic>,
+    source_stream: GcCell<'gc, VideoSource>,
 }
 
 #[derive(Clone, Debug, Collect)]
 #[collect(require_static)]
-pub struct VideoStatic {
-    movie: SwfMovie,
-    id: CharacterId,
-    width: Twips,
-    height: Twips,
+pub enum VideoSource {
+    SWF {
+        movie: Arc<SwfMovie>,
+        streamdef: DefineVideoStream,
+    },
+}
+
+impl<'gc> Video<'gc> {
+    /// Construct a Video object that is tied to a SWF file's video stream.
+    pub fn from_swf_tag(
+        movie: Arc<SwfMovie>,
+        streamdef: DefineVideoStream,
+        mc: MutationContext<'gc, '_>,
+    ) -> Self {
+        let source_stream = GcCell::allocate(mc, VideoSource::SWF { movie, streamdef });
+
+        Video(GcCell::allocate(
+            mc,
+            VideoData {
+                base: Default::default(),
+                source_stream,
+            },
+        ))
+    }
 }
 
 impl<'gc> TDisplayObject<'gc> for Video<'gc> {
     impl_display_object!(base);
 
     fn id(&self) -> CharacterId {
-        self.0.read().static_data.id
+        match (*self.0.read().source_stream.read()).borrow() {
+            VideoSource::SWF { streamdef, .. } => streamdef.id,
+        }
     }
 
     fn self_bounds(&self) -> BoundingBox {
         let mut bounding_box = BoundingBox::default();
 
-        bounding_box.set_width(self.0.read().static_data.width);
-        bounding_box.set_height(self.0.read().static_data.height);
+        match (*self.0.read().source_stream.read()).borrow() {
+            VideoSource::SWF { streamdef, .. } => {
+                bounding_box.set_width(Twips::from_pixels(streamdef.width as f64));
+                bounding_box.set_height(Twips::from_pixels(streamdef.height as f64));
+            }
+        }
 
         bounding_box
     }