X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fcodecs%2Fh263%2Fdata.rs;h=4f6a7057535dbd2c926219c62c36e729d778d969;hb=23eeced96736873d96bcdab904cd21244643ed99;hp=029c5bbecf8160b6946d0bae8a4b12ec2419d93a;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git diff --git a/nihav-core/src/codecs/h263/data.rs b/nihav-core/src/codecs/h263/data.rs index 029c5bb..4f6a705 100644 --- a/nihav-core/src/codecs/h263/data.rs +++ b/nihav-core/src/codecs/h263/data.rs @@ -114,7 +114,7 @@ pub const H263_CHROMA_QUANT: [u8; 32] = [ pub struct H263ShortCodeReader { tab: &'static [(u8, u8)] } impl H263ShortCodeReader { - pub fn new(tab: &'static [(u8, u8)]) -> Self { H263ShortCodeReader { tab: tab } } + pub fn new(tab: &'static [(u8, u8)]) -> Self { H263ShortCodeReader { tab } } } impl CodebookDescReader for H263ShortCodeReader { @@ -127,10 +127,10 @@ impl CodebookDescReader for H263ShortCodeReader { #[derive(Clone,Copy)] pub struct H263RLSym { run: u8, level: i8 } impl H263RLSym { - pub fn get_run(&self) -> u8 { self.run } - pub fn is_last(&self) -> bool { self.level < 0 } - pub fn is_escape(&self) -> bool { (self.run == 0) && (self.level == 0) } - pub fn get_level(&self) -> i16 { if self.level < 0 { -self.level as i16 } else { self.level as i16 } } + pub fn get_run(self) -> u8 { self.run } + pub fn is_last(self) -> bool { self.level < 0 } + pub fn is_escape(self) -> bool { (self.run == 0) && (self.level == 0) } + pub fn get_level(self) -> i16 { if self.level < 0 { -self.level as i16 } else { self.level as i16 } } } pub struct H263RLCodeDesc { code: u8, bits: u8, sym: H263RLSym } @@ -202,7 +202,7 @@ pub const H263_RL_CODES_AIC: &[H263RLCodeDesc] = rlcodes!( pub struct H263RLCodeReader { tab: &'static [H263RLCodeDesc] } impl H263RLCodeReader { - pub fn new(tab: &'static [H263RLCodeDesc]) -> Self { H263RLCodeReader { tab: tab } } + pub fn new(tab: &'static [H263RLCodeDesc]) -> Self { H263RLCodeReader { tab } } } impl CodebookDescReader for H263RLCodeReader {