diff --git a/mux/mp4/src/mp4mux/boxes.rs b/mux/mp4/src/mp4mux/boxes.rs index b40ec202..d238254b 100644 --- a/mux/mp4/src/mp4mux/boxes.rs +++ b/mux/mp4/src/mp4mux/boxes.rs @@ -410,7 +410,7 @@ fn write_tkhd( // Width/height match s.name().as_str() { - "video/x-h264" | "video/x-h265" | "video/x-vp9" | "image/jpeg" => { + "video/x-h264" | "video/x-h265" | "video/x-vp8" | "video/x-vp9" | "image/jpeg" => { let width = s.get::("width").context("video caps without width")? as u32; let height = s .get::("height") @@ -511,7 +511,7 @@ fn write_hdlr( let s = stream.caps.structure(0).unwrap(); let (handler_type, name) = match s.name().as_str() { - "video/x-h264" | "video/x-h265" | "video/x-vp9" | "image/jpeg" => { + "video/x-h264" | "video/x-h265" | "video/x-vp8" | "video/x-vp9" | "image/jpeg" => { (b"vide", b"VideoHandler\0".as_slice()) } "audio/mpeg" | "audio/x-opus" | "audio/x-alaw" | "audio/x-mulaw" | "audio/x-adpcm" => { @@ -541,7 +541,7 @@ fn write_minf( let s = stream.caps.structure(0).unwrap(); match s.name().as_str() { - "video/x-h264" | "video/x-h265" | "video/x-vp9" | "image/jpeg" => { + "video/x-h264" | "video/x-h265" | "video/x-vp8" | "video/x-vp9" | "image/jpeg" => { // Flags are always 1 for unspecified reasons write_full_box(v, b"vmhd", FULL_BOX_VERSION_0, 1, |v| write_vmhd(v, header))? } @@ -700,7 +700,7 @@ fn write_stsd( let s = stream.caps.structure(0).unwrap(); match s.name().as_str() { - "video/x-h264" | "video/x-h265" | "video/x-vp9" | "image/jpeg" => { + "video/x-h264" | "video/x-h265" | "video/x-vp8" | "video/x-vp9" | "image/jpeg" => { write_visual_sample_entry(v, header, stream)? } "audio/mpeg" | "audio/x-opus" | "audio/x-alaw" | "audio/x-mulaw" | "audio/x-adpcm" => { @@ -753,6 +753,7 @@ fn write_visual_sample_entry( } } "image/jpeg" => b"jpeg", + "video/x-vp8" => b"vp08", "video/x-vp9" => b"vp09", _ => unreachable!(), }; @@ -885,7 +886,7 @@ fn write_visual_sample_entry( Ok(()) })?; } - "image/jpeg" => { + "video/x-vp8" | "image/jpeg" => { // Nothing to do here } _ => unreachable!(), diff --git a/mux/mp4/src/mp4mux/imp.rs b/mux/mp4/src/mp4mux/imp.rs index 964815c5..58d6fc4b 100644 --- a/mux/mp4/src/mp4mux/imp.rs +++ b/mux/mp4/src/mp4mux/imp.rs @@ -878,6 +878,9 @@ impl MP4Mux { } delta_frames = super::DeltaFrames::Bidirectional; } + "video/x-vp8" => { + delta_frames = super::DeltaFrames::PredictiveOnly; + } "video/x-vp9" => { if !s.has_field_with_type("colorimetry", str::static_type()) { gst::error!(CAT, obj: pad, "Received caps without colorimetry"); @@ -1476,6 +1479,10 @@ impl ElementImpl for ISOMP4Mux { .field("width", gst::IntRange::new(1, u16::MAX as i32)) .field("height", gst::IntRange::new(1, u16::MAX as i32)) .build(), + gst::Structure::builder("video/x-vp8") + .field("width", gst::IntRange::new(1, u16::MAX as i32)) + .field("height", gst::IntRange::new(1, u16::MAX as i32)) + .build(), gst::Structure::builder("video/x-vp9") .field("profile", gst::List::new(["0", "1", "2", "3"])) .field("chroma-format", gst::List::new(["4:2:0", "4:2:2", "4:4:4"]))