Skip to content

Commit

Permalink
Changes for updated zerocopy crate, update other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
emarsden committed Oct 19, 2024
1 parent d1a7eb3 commit f0ca7b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ edition = "2021"
[dependencies]
serde = { version = "1.0.210", features = ["derive"] }
serde_path_to_error = "0.1.16"
serde_with = { version = "3.10.0", features = ["base64"] }
serde_with = { version = "3.11.0", features = ["base64"] }
serde-xml-rs = "0.6.0"
serde_json = "1.0.128"
zerocopy = { version = "0.7.35", features = ["derive"] }
serde_json = "1.0.131"
zerocopy = { version = "0.8.6", features = ["derive"] }
quick-xml = { version = "0.36.2", features = ["serialize", "overlapped-lists", "serde-types"] }
prost = { version = "0.13.3", features = ["prost-derive"] }
prost-types = "0.13.3"
Expand All @@ -31,7 +31,7 @@ bstr = "1.10.0"
num_enum = "0.7.3"
base64 = "0.22.1"
tracing = { version = "0.1.40", features = ["attributes"] }
anyhow = "1.0.89"
anyhow = "1.0.90"

[dev-dependencies]
clap = { version = "=4.4.18", features = ["cargo", "unicode", "wrap_help"] }
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use std::fmt;
use std::io::{Cursor, Read, Write};
use hex_literal::hex;
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
use zerocopy::{FromZeroes, FromBytes};
use zerocopy::FromBytes;
use serde::{Serialize, Deserialize};
use prost::Message;
use base64::prelude::{Engine as _, BASE64_STANDARD};
Expand Down Expand Up @@ -92,7 +92,7 @@ impl ToBytes for PsshData {
}

/// The identifier for a DRM system.
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, FromZeroes, FromBytes)]
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, FromBytes)]
pub struct DRMSystemId {
id: [u8; 16],
}
Expand Down Expand Up @@ -212,7 +212,7 @@ pub const NAGRA_SYSTEM_ID: DRMSystemId = DRMSystemId { id: hex!("adb41c242dbf4a6
pub const WISEPLAY_SYSTEM_ID: DRMSystemId = DRMSystemId { id: hex!("3d5e6d359b9a41e8b843dd3c6e72c42c") };

/// The Content Key or default_KID.
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, FromZeroes, FromBytes)]
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, FromBytes)]
pub struct DRMKeyId {
id: [u8; 16],
}
Expand Down

0 comments on commit f0ca7b8

Please sign in to comment.