Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mp4: Fix conversion of u16 track/disc numbers to BE bytes #341

Merged
merged 3 commits into from
Jan 13, 2024
Merged

mp4: Fix conversion of u16 track/disc numbers to BE bytes #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9add715
mp4: Fix conversion of u16 track/disc numbers to BE bytes
uklotzde Jan 13, 2024
9b9b179
mp4: Consider track/disc number <= 0 as invalid and missing
uklotzde Jan 13, 2024
80355e0
Delete redundant code
uklotzde Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions src/mp4/ilst/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ impl Accessor for Ilst {
}

fn set_track(&mut self, value: u32) {
let value = (value as u16).to_be_bytes();
let track_total = self.track_total().unwrap_or(0).to_be_bytes();
let track = (value as u16).to_be_bytes();
let track_total = (self.track_total().unwrap_or(0) as u16).to_be_bytes();

let data = vec![0, 0, value[0], value[1], track_total[0], track_total[1]];
let data = vec![0, 0, track[0], track[1], track_total[0], track_total[1]];
self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"trkn"), data));
}

Expand All @@ -430,19 +430,19 @@ impl Accessor for Ilst {
}

fn set_track_total(&mut self, value: u32) {
let value = (value as u16).to_be_bytes();
let track = self.track().unwrap_or(1).to_be_bytes();
let track_total = (value as u16).to_be_bytes();
let track = (self.track().unwrap_or(0) as u16).to_be_bytes();

let data = vec![0, 0, track[0], track[1], value[0], value[1]];
let data = vec![0, 0, track[0], track[1], track_total[0], track_total[1]];
self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"trkn"), data));
}

fn remove_track_total(&mut self) {
let track_num = self.track();
let track = self.track();
let _ = self.remove(&AtomIdent::Fourcc(*b"trkn"));

if let Some(track_num) = track_num {
let track_bytes = (track_num as u16).to_be_bytes();
if let Some(track) = track {
let track_bytes = (track as u16).to_be_bytes();
let data = vec![0, 0, track_bytes[0], track_bytes[1], 0, 0];

self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"trkn"), data));
Expand All @@ -454,10 +454,10 @@ impl Accessor for Ilst {
}

fn set_disk(&mut self, value: u32) {
let value = (value as u16).to_be_bytes();
let disk_total = self.disk_total().unwrap_or(0).to_be_bytes();
let disk = (value as u16).to_be_bytes();
let disk_total = (self.disk_total().unwrap_or(0) as u16).to_be_bytes();

let data = vec![0, 0, value[0], value[1], disk_total[0], disk_total[1]];
let data = vec![0, 0, disk[0], disk[1], disk_total[0], disk_total[1]];
self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"disk"), data));
}

Expand All @@ -470,19 +470,19 @@ impl Accessor for Ilst {
}

fn set_disk_total(&mut self, value: u32) {
let value = (value as u16).to_be_bytes();
let disk = self.disk().unwrap_or(1).to_be_bytes();
let disk_total = (value as u16).to_be_bytes();
let disk = (self.disk().unwrap_or(0) as u16).to_be_bytes();

let data = vec![0, 0, disk[0], disk[1], value[0], value[1]];
let data = vec![0, 0, disk[0], disk[1], disk_total[0], disk_total[1]];
self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"disk"), data));
}

fn remove_disk_total(&mut self) {
let disk_num = self.disk();
let disk = self.disk();
let _ = self.remove(&AtomIdent::Fourcc(*b"disk"));

if let Some(disk_num) = disk_num {
let disk_bytes = (disk_num as u16).to_be_bytes();
if let Some(disk) = disk {
let disk_bytes = (disk as u16).to_be_bytes();
let data = vec![0, 0, disk_bytes[0], disk_bytes[1], 0, 0];

self.replace_atom(Atom::unknown_implicit(AtomIdent::Fourcc(*b"disk"), data));
Expand Down Expand Up @@ -599,16 +599,24 @@ impl SplitTag for Ilst {
let current = u16::from_be_bytes([data[2], data[3]]);
let total = u16::from_be_bytes([data[4], data[5]]);

tag.insert_text(ItemKey::TrackNumber, current.to_string());
tag.insert_text(ItemKey::TrackTotal, total.to_string());
if current > 0 {
tag.insert_text(ItemKey::TrackNumber, current.to_string());
}
if total > 0 {
tag.insert_text(ItemKey::TrackTotal, total.to_string());
}
return false; // Atom consumed
},
b"disk" => {
let current = u16::from_be_bytes([data[2], data[3]]);
let total = u16::from_be_bytes([data[4], data[5]]);

tag.insert_text(ItemKey::DiscNumber, current.to_string());
tag.insert_text(ItemKey::DiscTotal, total.to_string());
if current > 0 {
tag.insert_text(ItemKey::DiscNumber, current.to_string());
}
if total > 0 {
tag.insert_text(ItemKey::DiscTotal, total.to_string());
}
return false; // Atom consumed
},
_ => {},
Expand Down
29 changes: 9 additions & 20 deletions src/tag/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,7 @@ impl Accessor for Tag {
);

fn track(&self) -> Option<u32> {
if let Some(i) = self.get_string(&ItemKey::TrackNumber) {
return i.parse::<u32>().ok();
}

None
self.get_u32_from_string(&ItemKey::TrackNumber)
}

fn set_track(&mut self, value: u32) {
Expand All @@ -141,11 +137,7 @@ impl Accessor for Tag {
}

fn track_total(&self) -> Option<u32> {
if let Some(i) = self.get_string(&ItemKey::TrackTotal) {
return i.parse::<u32>().ok();
}

None
self.get_u32_from_string(&ItemKey::TrackTotal)
}

fn set_track_total(&mut self, value: u32) {
Expand All @@ -157,11 +149,7 @@ impl Accessor for Tag {
}

fn disk(&self) -> Option<u32> {
if let Some(i) = self.get_string(&ItemKey::DiscNumber) {
return i.parse::<u32>().ok();
}

None
self.get_u32_from_string(&ItemKey::DiscNumber)
}

fn set_disk(&mut self, value: u32) {
Expand All @@ -173,11 +161,7 @@ impl Accessor for Tag {
}

fn disk_total(&self) -> Option<u32> {
if let Some(i) = self.get_string(&ItemKey::DiscTotal) {
return i.parse::<u32>().ok();
}

None
self.get_u32_from_string(&ItemKey::DiscTotal)
}

fn set_disk_total(&mut self, value: u32) {
Expand Down Expand Up @@ -274,6 +258,11 @@ impl Tag {
None
}

fn get_u32_from_string(&self, key: &ItemKey) -> Option<u32> {
let i = self.get_string(key)?;
i.parse::<u32>().ok()
}

/// Gets a byte slice from an [`ItemKey`]
///
/// Use `convert` to convert [`ItemValue::Text`] and [`ItemValue::Locator`] to byte slices
Expand Down