mirror of
https://github.com/alfg/mp4-rust.git
synced 2025-04-16 16:54:14 +00:00
Remove prefix "get_" from method names
This commit is contained in:
parent
e21980c5d0
commit
f5f031c38d
25 changed files with 34 additions and 34 deletions
|
@ -57,7 +57,7 @@ impl Mp4Box for Avc1Box {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for Avc1Box {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
reader.read_u32::<BigEndian>()?; // reserved
|
||||
reader.read_u16::<BigEndian>()?; // reserved
|
||||
|
@ -172,7 +172,7 @@ impl Mp4Box for AvcCBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for AvcCBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let configuration_version = reader.read_u8()?;
|
||||
let avc_profile_indication = reader.read_u8()?;
|
||||
|
|
|
@ -22,7 +22,7 @@ impl Mp4Box for Co64Box {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for Co64Box {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ impl Mp4Box for CttsBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for CttsBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ impl Mp4Box for EdtsBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for EdtsBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut edts = EdtsBox::new();
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ impl Mp4Box for ElstBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for ElstBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ impl Mp4Box for FtypBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for FtypBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let major = reader.read_u32::<BigEndian>()?;
|
||||
let minor = reader.read_u32::<BigEndian>()?;
|
||||
|
|
|
@ -23,7 +23,7 @@ impl Mp4Box for HdlrBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for HdlrBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ impl Mp4Box for MdhdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for MdhdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
@ -71,7 +71,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MdhdBox {
|
|||
)
|
||||
};
|
||||
let language_code = reader.read_u16::<BigEndian>()?;
|
||||
let language = get_language_string(language_code);
|
||||
let language = language_string(language_code);
|
||||
|
||||
skip_read_to(reader, start + size)?;
|
||||
|
||||
|
@ -107,7 +107,7 @@ impl<W: Write> WriteBox<&mut W> for MdhdBox {
|
|||
writer.write_u32::<BigEndian>(self.duration as u32)?;
|
||||
}
|
||||
|
||||
let language_code = get_language_code(&self.language);
|
||||
let language_code = language_code(&self.language);
|
||||
writer.write_u16::<BigEndian>(language_code)?;
|
||||
writer.write_u16::<BigEndian>(0)?; // pre-defined
|
||||
|
||||
|
@ -115,7 +115,7 @@ impl<W: Write> WriteBox<&mut W> for MdhdBox {
|
|||
}
|
||||
}
|
||||
|
||||
fn get_language_string(language: u16) -> String {
|
||||
fn language_string(language: u16) -> String {
|
||||
let mut lang: [u16; 3] = [0; 3];
|
||||
|
||||
lang[0] = ((language >> 10) & 0x1F) + 0x60;
|
||||
|
@ -130,7 +130,7 @@ fn get_language_string(language: u16) -> String {
|
|||
return lang_str;
|
||||
}
|
||||
|
||||
fn get_language_code(language: &str) -> u16 {
|
||||
fn language_code(language: &str) -> u16 {
|
||||
let mut lang = language.encode_utf16();
|
||||
let mut code = (lang.next().unwrap_or(0) & 0x1F) << 10;
|
||||
code += (lang.next().unwrap_or(0) & 0x1F) << 5;
|
||||
|
@ -145,8 +145,8 @@ mod tests {
|
|||
use std::io::Cursor;
|
||||
|
||||
fn test_language_code(lang: &str) {
|
||||
let code = get_language_code(lang);
|
||||
let lang2 = get_language_string(code);
|
||||
let code = language_code(lang);
|
||||
let lang2 = language_string(code);
|
||||
assert_eq!(lang, lang2);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ impl Mp4Box for MdiaBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for MdiaBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut mdhd = None;
|
||||
let mut hdlr = None;
|
||||
|
|
|
@ -30,7 +30,7 @@ impl Mp4Box for MinfBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for MinfBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut vmhd = None;
|
||||
let mut smhd = None;
|
||||
|
|
|
@ -180,7 +180,7 @@ pub fn write_box_header_ext<W: Write>(w: &mut W, v: u8, f: u32) -> Result<u64> {
|
|||
Ok(4)
|
||||
}
|
||||
|
||||
pub fn get_box_start<R: Seek>(reader: &mut R) -> Result<u64> {
|
||||
pub fn box_start<R: Seek>(reader: &mut R) -> Result<u64> {
|
||||
Ok(reader.seek(SeekFrom::Current(0))? - HEADER_SIZE)
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ pub fn skip_read_to<R: Read + Seek>(reader: &mut R, pos: u64) -> Result<()> {
|
|||
}
|
||||
|
||||
pub fn skip_box<R: Read + Seek>(reader: &mut R, size: u64) -> Result<()> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
skip_read_to(reader, start + size)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ impl Mp4Box for MoovBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut mvhd = None;
|
||||
let mut traks = Vec::new();
|
||||
|
|
|
@ -48,7 +48,7 @@ impl Mp4Box for Mp4aBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for Mp4aBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
reader.read_u32::<BigEndian>()?; // reserved
|
||||
reader.read_u16::<BigEndian>()?; // reserved
|
||||
|
@ -130,7 +130,7 @@ impl Mp4Box for EsdsBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for EsdsBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ impl Mp4Box for MvhdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for MvhdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ impl Mp4Box for SmhdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for SmhdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ impl Mp4Box for StblBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StblBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut stsd = None;
|
||||
let mut stts = None;
|
||||
|
|
|
@ -22,7 +22,7 @@ impl Mp4Box for StcoBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StcoBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ impl Mp4Box for StscBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StscBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ impl Mp4Box for StsdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StsdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ impl Mp4Box for StssBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StssBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ impl Mp4Box for StszBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for StszBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ impl Mp4Box for SttsBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for SttsBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ impl Mp4Box for TkhdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for TkhdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ impl Mp4Box for TrakBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for TrakBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let mut tkhd = None;
|
||||
let mut edts = None;
|
||||
|
|
|
@ -30,7 +30,7 @@ impl Mp4Box for VmhdBox {
|
|||
|
||||
impl<R: Read + Seek> ReadBox<&mut R> for VmhdBox {
|
||||
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
||||
let start = get_box_start(reader)?;
|
||||
let start = box_start(reader)?;
|
||||
|
||||
let (version, flags) = read_box_header_ext(reader)?;
|
||||
|
||||
|
|
Loading…
Reference in a new issue