From f8f9aff03ee174f19329e264fb9fbd9ba9ff0ea9 Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezylemon@proton.me>
Date: Wed, 26 Apr 2023 20:52:31 +0200
Subject: [PATCH 1/4] Improve log msg for deprecated Elements

---
 Cargo.toml         |  1 +
 src/ebml/mod.rs    | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 src/ebml/parse.rs  |  4 ++--
 src/permutation.rs | 11 ++++++++---
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 97d08b5..aef8eba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,7 @@ circular = "0.3"
 log = "0.4"
 crc = "3.0.1"
 uuid = "1.3.0"
+phf = { version = "0.11.1", features = ["macros"] }
 
 [dev-dependencies]
 quickcheck = "1"
diff --git a/src/ebml/mod.rs b/src/ebml/mod.rs
index 8d1b26b..a1c9db6 100644
--- a/src/ebml/mod.rs
+++ b/src/ebml/mod.rs
@@ -25,3 +25,50 @@ self::macros::impl_ebml_master! {
 pub fn ebml_header(input: &[u8]) -> EbmlResult<EbmlHeader> {
     ebml_element(0x1A45DFA3)(input)
 }
+
+/// Map of known deprecated Element IDs and their EBML Paths
+pub static DEPRECATED: phf::Map<u32, &'static str> = phf::phf_map! {
+    0x8E_u32 => r"\Segment\Cluster\BlockGroup\Slices",
+    0x97_u32 => r"\Segment\Cues\CuePoint\CueTrackPositions\CueReference\CueRefCluster",
+    0xA2_u32 => r"\Segment\Cluster\BlockGroup\BlockVirtual",
+    0xAA_u32 => r"\Segment\Tracks\TrackEntry\CodecDecodeAll",
+    0xAF_u32 => r"\Segment\Cluster\EncryptedBlock",
+    0xC0_u32 => r"\Segment\Tracks\TrackEntry\TrickTrackUID",
+    0xC1_u32 => r"\Segment\Tracks\TrackEntry\TrickTrackSegmentUID",
+    0xC4_u32 => r"\Segment\Tracks\TrackEntry\TrickMasterTrackSegmentUID",
+    0xC6_u32 => r"\Segment\Tracks\TrackEntry\TrickTrackFlag",
+    0xC7_u32 => r"\Segment\Tracks\TrackEntry\TrickMasterTrackUID",
+    0xC8_u32 => r"\Segment\Cluster\BlockGroup\ReferenceFrame",
+    0xC9_u32 => r"\Segment\Cluster\BlockGroup\ReferenceFrame\ReferenceOffset",
+    0xCA_u32 => r"\Segment\Cluster\BlockGroup\ReferenceFrame\ReferenceTimestamp",
+    0xCB_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice\BlockAdditionID",
+    0xCC_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice\LaceNumber",
+    0xCD_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice\FrameNumber",
+    0xCE_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice\Delay",
+    0xCF_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice\SliceDuration",
+    0xE8_u32 => r"\Segment\Cluster\BlockGroup\Slices\TimeSlice",
+    0xEB_u32 => r"\Segment\Cues\CuePoint\CueTrackPositions\CueReference\CueRefCodecState",
+    0xFD_u32 => r"\Segment\Cluster\BlockGroup\ReferenceVirtual",
+    0x44B4_u32 => r"\Segment\Tags\Tag\+SimpleTag\TagDefaultBogus",
+    0x4661_u32 => r"\Segment\Attachments\AttachedFile\FileUsedStartTime",
+    0x4662_u32 => r"\Segment\Attachments\AttachedFile\FileUsedEndTime",
+    0x4675_u32 => r"\Segment\Attachments\AttachedFile\FileReferral",
+    0x47E3_u32 => r"\Segment\Tracks\TrackEntry\ContentEncodings\ContentEncoding\ContentEncryption\ContentSignature",
+    0x47E4_u32 => r"\Segment\Tracks\TrackEntry\ContentEncodings\ContentEncoding\ContentEncryption\ContentSigKeyID",
+    0x47E5_u32 => r"\Segment\Tracks\TrackEntry\ContentEncodings\ContentEncoding\ContentEncryption\ContentSigAlgo",
+    0x47E6_u32 => r"\Segment\Tracks\TrackEntry\ContentEncodings\ContentEncoding\ContentEncryption\ContentSigHashAlgo",
+    0x535F_u32 => r"\Segment\Cues\CuePoint\CueTrackPositions\CueReference\CueRefNumber",
+    0x537F_u32 => r"\Segment\Tracks\TrackEntry\TrackOffset",
+    0x54B3_u32 => r"\Segment\Tracks\TrackEntry\Video\AspectRatioType",
+    0x5854_u32 => r"\Segment\Cluster\SilentTracks",
+    0x58D7_u32 => r"\Segment\Cluster\SilentTracks\SilentTrackNumber",
+    0x6DE7_u32 => r"\Segment\Tracks\TrackEntry\MinCache",
+    0x6DF8_u32 => r"\Segment\Tracks\TrackEntry\MaxCache",
+    0x6FAB_u32 => r"\Segment\Tracks\TrackEntry\TrackOverlay",
+    0x7D7B_u32 => r"\Segment\Tracks\TrackEntry\Audio\ChannelPositions",
+    0x2383E3_u32 => r"\Segment\Tracks\TrackEntry\Video\FrameRate",
+    0x26B240_u32 => r"\Segment\Tracks\TrackEntry\CodecDownloadURL",
+    0x2FB523_u32 => r"\Segment\Tracks\TrackEntry\Video\GammaValue",
+    0x3A9697_u32 => r"\Segment\Tracks\TrackEntry\CodecSettings",
+    0x3B4040_u32 => r"\Segment\Tracks\TrackEntry\CodecInfoURL",
+};
diff --git a/src/ebml/parse.rs b/src/ebml/parse.rs
index 3bb8737..81152e7 100644
--- a/src/ebml/parse.rs
+++ b/src/ebml/parse.rs
@@ -152,8 +152,8 @@ pub fn void(input: &[u8]) -> EbmlResult<&[u8]> {
     ebml_element(0xEC)(input)
 }
 
-/// Consumes an entire Master Element, and returns the ID if successful.
-pub fn skip_master(input: &[u8]) -> EbmlResult<u32> {
+/// Consumes an entire EBML Element, and returns the ID if successful.
+pub fn skip_element(input: &[u8]) -> EbmlResult<u32> {
     let (i, (id, size, crc)) = tuple((vid, elem_size, crc))(input)?;
     let size = if crc.is_some() { size - 6 } else { size };
     checksum(crc, take(size))(i)?;
diff --git a/src/permutation.rs b/src/permutation.rs
index 0b1f56b..53fdac8 100644
--- a/src/permutation.rs
+++ b/src/permutation.rs
@@ -116,9 +116,14 @@ macro_rules! permutation_trait_impl(
           // Have all parsers (including void) failed?
           if l == input.len() {
             // Skip unknown Element if possible.
-            if let Error { id: _, kind: crate::ebml::ErrorKind::MissingElement } = err {
-              if let Ok((i, id)) = crate::ebml::skip_master(input) {
-                log::warn!("Skipped unknown Element 0x{id:X}");
+            if let Error { id: _, kind: $crate::ebml::ErrorKind::MissingElement } = err {
+              if let Ok((i, id)) = $crate::ebml::skip_element(input) {
+                if let Some(name) = $crate::ebml::DEPRECATED.get(&id) {
+                  log::warn!("Skipped deprecated Element '{name}' ({id:#0X})");
+                } else {
+                  log::warn!("Skipped unknown Element {id:#0X}");
+                }
+
                 input = i;
                 continue;
               }

From b0c4ea2a34aa84a8582a60217238546726736b85 Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezylemon@proton.me>
Date: Wed, 26 Apr 2023 21:30:15 +0200
Subject: [PATCH 2/4] Remove deprecated Matroska Elements

---
 src/demuxer.rs             | 38 +-------------------
 src/elements.rs            | 35 ------------------
 src/muxer.rs               |  4 ---
 src/serializer/elements.rs | 72 ++++----------------------------------
 tools/src/matroska_info.rs |  8 -----
 5 files changed, 8 insertions(+), 149 deletions(-)

diff --git a/src/demuxer.rs b/src/demuxer.rs
index 32b6901..36df403 100644
--- a/src/demuxer.rs
+++ b/src/demuxer.rs
@@ -210,15 +210,9 @@ fn track_entry_audio_kind(audio: &Audio) -> Option<MediaKind> {
     let rate = audio
         .output_sampling_frequency
         .unwrap_or(audio.sampling_frequency);
-    // TODO: complete it
-    let map = if audio.channel_positions.is_none() {
-        Some(ChannelMap::default_map(audio.channels as usize))
-    } else {
-        unimplemented!("Convert matroska map to rust-av map")
-    };
     let a = AudioInfo {
         rate: rate as usize,
-        map,
+        map: Some(ChannelMap::default_map(audio.channels as usize)),
         format: None,
     };
     Some(MediaKind::Audio(a))
@@ -406,12 +400,9 @@ mod tests {
                         flag_default: 1,
                         flag_forced: 0,
                         flag_lacing: 0,
-                        min_cache: None,
-                        max_cache: None,
                         default_duration: None,
                         default_decoded_field_duration: None,
                         track_timestamp_scale: 1.0,
-                        track_offset: None,
                         max_block_addition_id: 0,
                         name: None,
                         language: String::from("eng"),
@@ -420,18 +411,8 @@ mod tests {
                         codec_private: None,
                         codec_name: None,
                         attachment_link: None,
-                        codec_settings: None,
-                        codec_info_url: None,
-                        codec_download_url: None,
-                        codec_decode_all: None,
-                        track_overlay: None,
                         codec_delay: 0,
                         seek_pre_roll: 0,
-                        trick_track_uid: None,
-                        trick_track_segment_uid: None,
-                        trick_track_flag: None,
-                        trick_master_track_uid: None,
-                        trick_master_track_segment_uid: None,
                         video: Some(Video {
                             flag_interlaced: 0,
                             field_order: 2,
@@ -447,10 +428,7 @@ mod tests {
                             display_width: Some(640),
                             display_height: Some(360),
                             display_unit: 3,
-                            aspect_ratio_type: None,
                             colour_space: None,
-                            gamma_value: None,
-                            frame_rate: None,
                             colour: None,
                             projection: None
                         }),
@@ -468,12 +446,9 @@ mod tests {
                         flag_default: 1,
                         flag_forced: 0,
                         flag_lacing: 0,
-                        min_cache: None,
-                        max_cache: None,
                         default_duration: None,
                         default_decoded_field_duration: None,
                         track_timestamp_scale: 1.0,
-                        track_offset: None,
                         max_block_addition_id: 0,
                         name: None,
                         language: String::from("eng"),
@@ -485,24 +460,13 @@ mod tests {
                         ]),
                         codec_name: None,
                         attachment_link: None,
-                        codec_settings: None,
-                        codec_info_url: None,
-                        codec_download_url: None,
-                        codec_decode_all: None,
-                        track_overlay: None,
                         codec_delay: 6500000,
                         seek_pre_roll: 0,
-                        trick_track_uid: None,
-                        trick_track_segment_uid: None,
-                        trick_track_flag: None,
-                        trick_master_track_uid: None,
-                        trick_master_track_segment_uid: None,
                         video: None,
                         audio: Some(Audio {
                             sampling_frequency: 48000.0,
                             output_sampling_frequency: None,
                             channels: 1,
-                            channel_positions: None,
                             bit_depth: Some(32),
                         }),
                         track_translate: vec![],
diff --git a/src/elements.rs b/src/elements.rs
index a74336d..af1cb44 100644
--- a/src/elements.rs
+++ b/src/elements.rs
@@ -120,20 +120,10 @@ impl_ebml_master! {
     #[derive(Debug, Clone, PartialEq)]
     struct Cluster<'a> {
         [0xE7] timestamp: (u64),
-        [0x5854] silent_tracks: (Option<SilentTracks>),
         [0xA7] position: (Option<u64>),
         [0xAB] prev_size: (Option<u64>),
         [0xA3] simple_block: (Vec<&'a [u8]>) [0..],
         [0xA0] block_group: (Vec<BlockGroup<'a>>) [0..],
-        [0xAF] encrypted_block: (Option<&'a [u8]>),
-    }
-}
-
-impl_ebml_master! {
-    // Element ID 0x5854
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    struct SilentTracks {
-        [0x58D7] numbers: (Vec<u64>) [0..],
     }
 }
 
@@ -142,16 +132,12 @@ impl_ebml_master! {
     #[derive(Debug, Clone, PartialEq, Eq)]
     struct BlockGroup<'a> {
         [0xA1] block: (&'a [u8]),
-        [0xA2] block_virtual: (Option<Vec<u8>>),
         // [0x75A1] block_additions: (Option<BlockAdditions>),
         [0x9B] block_duration: (Option<u64>),
         [0xFA] reference_priority: (u64) = 0,
         [0xFB] reference_block: (Option<u64>),
-        [0xFD] reference_virtual: (Option<i64>),
         [0xA4] codec_state: (Option<Vec<u8>>),
         [0x75A2] discard_padding: (Option<i64>),
-        // [0x8E] slices: (Option<Slices>),
-        // [0xC8] reference_frame: (Option<ReferenceFrame>),
     }
 }
 
@@ -300,13 +286,10 @@ impl_ebml_master! {
         [0x88] flag_default: (u64) = 1,
         [0x55AA] flag_forced: (u64) = 0,
         [0x9C] flag_lacing: (u64) = 1,
-        [0x6DE7] min_cache: (Option<u64>),
-        [0x6DF8] max_cache: (Option<u64>),
         [0x23E383] default_duration: (Option<u64>),
         [0x234E7A] default_decoded_field_duration: (Option<u64>),
         // FIXME: reimplement float_or handling
         [0x23314F] track_timestamp_scale: (f64) = 1.0,
-        [0x537F] track_offset: (Option<i64>),
         [0x55EE] max_block_addition_id: (u64) = 0,
         [0x536E] name: (Option<String>),
         [0x22B59C] language: (String) = String::from("eng"),
@@ -315,18 +298,8 @@ impl_ebml_master! {
         [0x63A2] codec_private: (Option<Vec<u8>>),
         [0x258688] codec_name: (Option<String>),
         [0x7446] attachment_link: (Option<u64>),
-        [0x3A9697] codec_settings: (Option<String>),
-        [0x3B4040] codec_info_url: (Option<String>),
-        [0x26B240] codec_download_url: (Option<String>),
-        [0xAA] codec_decode_all: (Option<u64>),
-        [0x6FAB] track_overlay: (Option<u64>),
         [0x56AA] codec_delay: (u64) = 0,
         [0x56BB] seek_pre_roll: (u64) = 0,
-        [0xC0] trick_track_uid: (Option<u64>),
-        [0xC1] trick_track_segment_uid: (Option<Uuid>),
-        [0xC6] trick_track_flag: (Option<u64>),
-        [0xC7] trick_master_track_uid: (Option<u64>),
-        [0xC4] trick_master_track_segment_uid: (Option<Uuid>),
         [0xE0] video: (Option<Video>),
         [0xE1] audio: (Option<Audio>),
         [0x6624] track_translate: (Vec<TrackTranslate>) [0..],
@@ -419,10 +392,6 @@ impl_ebml_master! {
     struct ContentEncryption {
         [0x47E1] enc_algo: (u64) = 0,
         [0x47E2] enc_key_id: (Option<Vec<u8>>),
-        [0x47E3] signature: (Option<Vec<u8>>),
-        [0x47E4] sig_key_id: (Option<Vec<u8>>),
-        [0x47E5] sig_algo: (Option<u64>),
-        [0x47E6] sig_hash_algo: (Option<u64>),
     }
 }
 
@@ -434,7 +403,6 @@ impl_ebml_master! {
         [0xB5] sampling_frequency: (f64) = 5360.0,
         [0x7885] output_sampling_frequency: (Option<f64>),
         [0x9F] channels: (u64),
-        [0x7D7B] channel_positions: (Option<Vec<u8>>),
         [0x6264] bit_depth: (Option<u64>),
     }
 }
@@ -457,10 +425,7 @@ impl_ebml_master! {
         [0x54B0] display_width: (Option<u64>),
         [0x54BA] display_height: (Option<u64>),
         [0x54B2] display_unit: (u64) = 0,
-        [0x54B3] aspect_ratio_type: (Option<u64>),
         [0x2EB524] colour_space: (Option<Vec<u8>>),
-        [0x2FB523] gamma_value: (Option<f64>),
-        [0x2383E3] frame_rate: (Option<f64>),
         [0x55B0] colour: (Option<Colour>),
         [0x55D0] projection: (Option<Projection>),
     }
diff --git a/src/muxer.rs b/src/muxer.rs
index 9a9fede..171d2d2 100644
--- a/src/muxer.rs
+++ b/src/muxer.rs
@@ -346,12 +346,10 @@ impl Muxer for MkvMuxer {
 
                 let cluster = Cluster {
                     timestamp: self.timestamp.take().unwrap(),
-                    silent_tracks: None,
                     position: None,
                     prev_size: None,
                     simple_block: simple_blocks,
                     block_group: Vec::new(),
-                    encrypted_block: None,
                 };
 
                 let mut buf: Vec<u8> = vec![0; cluster.size(0x1F43B675)];
@@ -398,12 +396,10 @@ impl Muxer for MkvMuxer {
 
             let cluster = Cluster {
                 timestamp: self.timestamp.take().unwrap(),
-                silent_tracks: None,
                 position: None,
                 prev_size: None,
                 simple_block: simple_blocks,
                 block_group: Vec::new(),
-                encrypted_block: None,
             };
 
             let mut buf: Vec<u8> = vec![0; cluster.size(0x1F43B675)];
diff --git a/src/serializer/elements.rs b/src/serializer/elements.rs
index ba121ef..74ce8e3 100644
--- a/src/serializer/elements.rs
+++ b/src/serializer/elements.rs
@@ -4,7 +4,7 @@ use cookie_factory::GenError;
 use crate::{
     elements::{
         Audio, Cluster, Colour, Info, Lacing, MasteringMetadata, Projection, Seek, SeekHead,
-        SilentTracks, SimpleBlock, TrackEntry, Tracks, Video,
+        SimpleBlock, TrackEntry, Tracks, Video,
     },
     serializer::cookie_utils::{gen_many, gen_opt, gen_opt_copy, set_be_i16, tuple},
     serializer::ebml::{
@@ -128,12 +128,9 @@ impl EbmlSize for TrackEntry {
             + self.flag_default.size(0x88)
             + self.flag_forced.size(0x55AA)
             + self.flag_lacing.size(0x9C)
-            + self.min_cache.size(0x6DE7)
-            + self.max_cache.size(0x6DF8)
             + self.default_duration.size(0x23E383)
             + self.default_decoded_field_duration.size(0x234E7A)
             + self.track_timestamp_scale.size(0x23314F)
-            + self.track_offset.size(0x537F)
             + self.max_block_addition_id.size(0x55EE)
             + self.name.size(0x536E)
             + self.language.size(0x22B59C)
@@ -142,20 +139,10 @@ impl EbmlSize for TrackEntry {
             + self.codec_private.size(0x63A2)
             + self.codec_name.size(0x258688)
             + self.attachment_link.size(0x7446)
-            + self.codec_settings.size(0x3A9697)
-            + self.codec_info_url.size(0x3B4040)
-            + self.codec_download_url.size(0x26B240)
-            + self.codec_decode_all.size(0xAA)
-            + self.track_overlay.size(0x6FAB)
             + self.codec_delay.size(0x56AA)
             + self.seek_pre_roll.size(0x56BB)
             + self.video.size(0xE0)
             + self.audio.size(0xE1)
-            + self.trick_track_uid.size(0xC0)
-            + self.trick_track_segment_uid.size(0xC1)
-            + self.trick_track_flag.size(0xC6)
-            + self.trick_master_track_uid.size(0xC7)
-            + self.trick_master_track_segment_uid.size(0xC4)
     }
 }
 
@@ -177,14 +164,11 @@ fn gen_track_entry<'a, 'b>(
                 gen_ebml_uint(0x88, t.flag_default),
                 gen_ebml_uint(0x55AA, t.flag_forced),
                 gen_ebml_uint(0x9C, t.flag_lacing),
-                gen_opt_copy(t.min_cache, |v| gen_ebml_uint(0x6DE7, v)),
-                gen_opt_copy(t.max_cache, |v| gen_ebml_uint(0x6DF8, v)),
                 gen_opt_copy(t.default_duration, |v| gen_ebml_uint(0x23E383, v)),
                 gen_opt_copy(t.default_decoded_field_duration, |v| {
                     gen_ebml_uint(0x234E7A, v)
                 }),
                 gen_f64(0x23314F, t.track_timestamp_scale), // FIXME: don't serialize if default
-                gen_opt_copy(t.track_offset, |v| gen_ebml_int(0x537F, v)),
                 gen_ebml_uint(0x55EE, t.max_block_addition_id),
                 gen_opt(t.name.as_ref(), |v| gen_ebml_str(0x536E, v)),
                 gen_ebml_str(0x22B59C, &t.language),
@@ -193,24 +177,10 @@ fn gen_track_entry<'a, 'b>(
                 gen_opt(t.codec_private.as_ref(), |v| gen_ebml_binary(0x63A2, v)),
                 gen_opt(t.codec_name.as_ref(), |v| gen_ebml_str(0x258688, v)),
                 gen_opt_copy(t.attachment_link, |v| gen_ebml_uint(0x7446, v)),
-                gen_opt(t.codec_settings.as_ref(), |v| gen_ebml_str(0x3A9697, v)),
-                gen_opt(t.codec_info_url.as_ref(), |v| gen_ebml_str(0x3B4040, v)),
-                gen_opt(t.codec_download_url.as_ref(), |v| gen_ebml_str(0x26B240, v)),
-                gen_opt_copy(t.codec_decode_all, |v| gen_ebml_uint(0xAA, v)),
-                gen_opt_copy(t.track_overlay, |v| gen_ebml_uint(0x6FAB, v)),
                 gen_ebml_uint(0x56AA, t.codec_delay),
                 gen_ebml_uint(0x56BB, t.seek_pre_roll),
                 gen_opt(t.video.as_ref(), gen_track_entry_video),
                 gen_opt(t.audio.as_ref(), gen_track_entry_audio),
-                gen_opt_copy(t.trick_track_uid, |v| gen_ebml_uint(0xC0, v)),
-                gen_opt(t.trick_track_segment_uid.as_ref(), |v| {
-                    gen_ebml_binary(0xC1, v)
-                }),
-                gen_opt_copy(t.trick_track_flag, |v| gen_ebml_uint(0xC6, v)),
-                gen_opt_copy(t.trick_master_track_uid, |v| gen_ebml_uint(0xC7, v)),
-                gen_opt(t.trick_master_track_segment_uid.as_ref(), |v| {
-                    gen_ebml_binary(0xC4, v)
-                }),
             )),
         )(input)
     }
@@ -221,7 +191,6 @@ impl EbmlSize for Audio {
         self.sampling_frequency.size(0xB5)
             + self.output_sampling_frequency.size(0x78B5)
             + self.channels.size(0x9F)
-            + self.channel_positions.size(0x7D7B)
             + self.bit_depth.size(0x6264)
     }
 }
@@ -239,7 +208,6 @@ fn gen_track_entry_audio<'a, 'b>(
                 gen_f64(0xB5, a.sampling_frequency),
                 gen_opt_copy(a.output_sampling_frequency, |v| gen_f64(0x78B5, v)),
                 gen_ebml_uint(0x9F, a.channels),
-                gen_opt(a.channel_positions.as_ref(), |v| gen_ebml_binary(0x7D7B, v)),
                 gen_opt_copy(a.bit_depth, |v| gen_ebml_uint(0x6264, v)),
             )),
         )(input)
@@ -262,10 +230,7 @@ impl EbmlSize for Video {
             + self.display_width.size(0x54B0)
             + self.display_height.size(0x54BA)
             + self.display_unit.size(0x54B2)
-            + self.aspect_ratio_type.size(0x54B3)
             + self.colour_space.size(0x2EB524)
-            + self.gamma_value.size(0x2FB523)
-            + self.frame_rate.size(0x2383E3)
             + self.colour.size(0x55B0)
             + self.projection.size(0x7670)
     }
@@ -295,10 +260,7 @@ fn gen_track_entry_video<'a, 'b>(
                 gen_opt_copy(v.display_width, |v| gen_ebml_uint(0x54B0, v)),
                 gen_opt_copy(v.display_height, |v| gen_ebml_uint(0x54BA, v)),
                 gen_ebml_uint(0x54B2, v.display_unit),
-                gen_opt_copy(v.aspect_ratio_type, |v| gen_ebml_uint(0x54B3, v)),
                 gen_opt(v.colour_space.as_ref(), |v| gen_ebml_binary(0x2EB524, v)),
-                gen_opt_copy(v.gamma_value, |v| gen_f64(0x2FB523, v)),
-                gen_opt_copy(v.frame_rate, |v| gen_f64(0x2383E3, v)),
                 gen_opt(v.colour.as_ref(), gen_track_entry_video_colour),
                 gen_opt(v.projection.as_ref(), |v| {
                     gen_track_entry_video_projection(v)
@@ -432,11 +394,12 @@ fn gen_track_entry_video_projection<'a, 'b>(
 
 impl<'a> EbmlSize for Cluster<'a> {
     fn capacity(&self) -> usize {
-        self.timestamp.size(0xE7) + self.silent_tracks.size(0x5854) + self.position.size(0xA7) +
-      self.prev_size.size(0xAB) + self.simple_block.size(0xA3) +
-      // TODO: implement for BlockGroup
-      // self.block_group.size(0xA0) +
-      self.encrypted_block.size(0xAF)
+        self.timestamp.size(0xE7)
+            + self.position.size(0xA7)
+            + self.prev_size.size(0xAB)
+            + self.simple_block.size(0xA3)
+        // TODO: implement for BlockGroup
+        // + self.block_group.size(0xA0)
     }
 }
 
@@ -450,37 +413,16 @@ pub(crate) fn gen_cluster<'a, 'b>(
             byte_capacity,
             tuple((
                 gen_ebml_uint(0xE7, c.timestamp),
-                gen_opt(c.silent_tracks.as_ref(), gen_silent_tracks),
                 gen_opt_copy(c.position, |v| gen_ebml_uint(0xA7, v)),
                 gen_opt_copy(c.prev_size, |v| gen_ebml_uint(0xAB, v)),
                 gen_many(&c.simple_block, |v| gen_ebml_binary(0xA3, v)),
                 // TODO: implement for BlockGroup
                 // gen_many(&c.block_group, gen_block_group)
-                gen_opt(c.encrypted_block.as_ref(), |v| gen_ebml_binary(0xAF, v)),
             )),
         )(input)
     }
 }
 
-impl EbmlSize for SilentTracks {
-    fn capacity(&self) -> usize {
-        self.numbers.size(0x58D7)
-    }
-}
-
-fn gen_silent_tracks<'a, 'b>(
-    s: &'a SilentTracks,
-) -> impl Fn((&'b mut [u8], usize)) -> Result<(&'b mut [u8], usize), GenError> + 'a {
-    move |input| {
-        let byte_capacity = vint_size(s.capacity() as u64)?;
-        gen_ebml_master(
-            0x5854,
-            byte_capacity,
-            gen_many(&s.numbers, |v| gen_ebml_uint(0x58D7, *v)),
-        )(input)
-    }
-}
-
 pub(crate) fn gen_simple_block_header<'a, 'b>(
     s: &'a SimpleBlock,
 ) -> impl Fn((&'b mut [u8], usize)) -> Result<(&'b mut [u8], usize), GenError> + 'a {
diff --git a/tools/src/matroska_info.rs b/tools/src/matroska_info.rs
index 4bdc1c4..1c9ade0 100644
--- a/tools/src/matroska_info.rs
+++ b/tools/src/matroska_info.rs
@@ -239,9 +239,6 @@ fn run(filename: &str) -> Result<(), InfoError> {
                                 println!("|    + Output sampling freqeuncy: {}", frequency);
                             }
                             println!("|    + Channels: {}", a.channels);
-                            if let Some(ref channel_positions) = a.channel_positions {
-                                println!("|    + Channel position: {:?}", channel_positions);
-                            }
                             if let Some(bit_depth) = a.bit_depth {
                                 println!("|    + Bit depth: {}", bit_depth);
                             }
@@ -305,15 +302,10 @@ fn run(filename: &str) -> Result<(), InfoError> {
                 SegmentElement::Cluster(c) => {
                     println!("|+ Cluster");
                     println!("|+   Timestamp: {}", c.timestamp);
-                    println!("|+   Silent_tracks: {:?}", c.silent_tracks);
                     println!("|+   Position: {:?}", c.position);
                     println!("|+   Prev size: {:?}", c.prev_size);
                     println!("|+   Simple block: {} elements", c.simple_block.len());
                     println!("|+   Block group: {} elements", c.block_group.len());
-                    println!(
-                        "|+   Encrypted block: {:?} bytes",
-                        c.encrypted_block.as_ref().map(|s| s.len())
-                    );
                 }
                 SegmentElement::Void(s) => {
                     println!("|+ EbmlVoid (size: {})", s);

From 8f516a19760c1628b0f20024bbc7805bffce0b9e Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezylemon@proton.me>
Date: Wed, 26 Apr 2023 21:31:57 +0200
Subject: [PATCH 3/4] Remove unused serialization functions

---
 src/serializer/cookie_utils.rs |  7 +-----
 src/serializer/ebml.rs         | 45 +---------------------------------
 src/serializer/elements.rs     |  4 +--
 3 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/src/serializer/cookie_utils.rs b/src/serializer/cookie_utils.rs
index cd03df8..e7463ec 100644
--- a/src/serializer/cookie_utils.rs
+++ b/src/serializer/cookie_utils.rs
@@ -1,4 +1,4 @@
-use cookie_factory::bytes::{be_f64, be_i16, be_i8};
+use cookie_factory::bytes::{be_f64, be_i16};
 use cookie_factory::combinator::{skip, slice};
 use cookie_factory::gen::legacy_wrap;
 use cookie_factory::GenError;
@@ -89,11 +89,6 @@ pub(crate) fn gen_slice<'a, 'b>(
     move |input| legacy_wrap(slice(v), input)
 }
 
-#[inline]
-pub(crate) fn set_be_i8(x: (&mut [u8], usize), v: i8) -> Result<(&mut [u8], usize), GenError> {
-    legacy_wrap(be_i8(v), x)
-}
-
 #[inline]
 pub(crate) fn set_be_i16(x: (&mut [u8], usize), v: i16) -> Result<(&mut [u8], usize), GenError> {
     legacy_wrap(be_i16(v), x)
diff --git a/src/serializer/ebml.rs b/src/serializer/ebml.rs
index 481c7d7..6709b83 100644
--- a/src/serializer/ebml.rs
+++ b/src/serializer/ebml.rs
@@ -4,9 +4,7 @@ use cookie_factory::GenError;
 use nom::AsBytes;
 
 use crate::ebml::{Date, EbmlHeader};
-use crate::serializer::cookie_utils::{
-    gen_at_offset, gen_skip, gen_slice, set_be_f64, set_be_i8, tuple,
-};
+use crate::serializer::cookie_utils::{gen_at_offset, gen_skip, gen_slice, set_be_f64, tuple};
 
 const ALLOWED_ID_VALUES: u64 = (1u64 << 56) - 1;
 
@@ -93,32 +91,6 @@ pub(crate) fn gen_uint(
     }
 }
 
-//FIXME: is it the right implementation?
-pub(crate) fn gen_int(
-    num: i64,
-) -> impl Fn((&mut [u8], usize)) -> Result<(&mut [u8], usize), GenError> {
-    move |mut input| {
-        let needed_bytes = vint_size(num as u64)?;
-
-        let mut i = needed_bytes - 1;
-        loop {
-            match set_be_i8((input.0, input.1), (num >> (i * 8)) as i8) {
-                Ok(next) => {
-                    input = next;
-                }
-                Err(e) => return Err(e),
-            }
-
-            if i == 0 {
-                break;
-            }
-            i -= 1;
-        }
-
-        Ok(input)
-    }
-}
-
 fn gen_type<T: Copy, G>(
     id: u32,
     size: u64,
@@ -199,21 +171,6 @@ pub(crate) fn gen_ebml_uint(
     gen_ebml_uint_l(id, num, move || vint_size(num))
 }
 
-pub(crate) fn gen_ebml_int(
-    id: u32,
-    num: i64,
-) -> impl Fn((&mut [u8], usize)) -> Result<(&mut [u8], usize), GenError> {
-    move |input| {
-        let expected_size = vint_size(num as u64)?;
-        let needed_bytes = vint_size(expected_size as u64)?;
-
-        let (buf, ofs_len) = gen_vid(id)(input)?;
-        let (buf, start) = gen_skip(needed_bytes as usize)((buf, ofs_len))?;
-        let (buf, end) = gen_int(num)((buf, start))?;
-        gen_at_offset(ofs_len, gen_ebml_size(expected_size, end - start))((buf, end))
-    }
-}
-
 pub(crate) fn gen_ebml_str<'a, 'b>(
     id: u32,
     s: &'a str,
diff --git a/src/serializer/elements.rs b/src/serializer/elements.rs
index 74ce8e3..0a14819 100644
--- a/src/serializer/elements.rs
+++ b/src/serializer/elements.rs
@@ -8,8 +8,8 @@ use crate::{
     },
     serializer::cookie_utils::{gen_many, gen_opt, gen_opt_copy, set_be_i16, tuple},
     serializer::ebml::{
-        gen_ebml_binary, gen_ebml_int, gen_ebml_master, gen_ebml_str, gen_ebml_uint,
-        gen_ebml_uint_l, gen_f64, gen_vid, gen_vint, vint_size, EbmlSize,
+        gen_ebml_binary, gen_ebml_master, gen_ebml_str, gen_ebml_uint, gen_ebml_uint_l, gen_f64,
+        gen_vid, gen_vint, vint_size, EbmlSize,
     },
 };
 

From 703875e0706bcd9b3ae22afad44f644e59132d48 Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezylemon@proton.me>
Date: Wed, 26 Apr 2023 21:49:19 +0200
Subject: [PATCH 4/4] Fix bug in skip_element

---
 src/ebml/parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ebml/parse.rs b/src/ebml/parse.rs
index 81152e7..2675880 100644
--- a/src/ebml/parse.rs
+++ b/src/ebml/parse.rs
@@ -156,7 +156,7 @@ pub fn void(input: &[u8]) -> EbmlResult<&[u8]> {
 pub fn skip_element(input: &[u8]) -> EbmlResult<u32> {
     let (i, (id, size, crc)) = tuple((vid, elem_size, crc))(input)?;
     let size = if crc.is_some() { size - 6 } else { size };
-    checksum(crc, take(size))(i)?;
+    let (i, _) = checksum(crc, take(size))(i)?;
     Ok((i, id))
 }