aboutsummaryrefslogtreecommitdiff
path: root/image/codecs/indeo5.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-09-10 18:07:13 -0400
committerPaul Gilbert2016-09-10 18:07:13 -0400
commit9c6a55a2a660d2c59e9c0e22402e4d16e08ef987 (patch)
tree90be1342ca177e7de0d42339f10fde02e4fbd2ee /image/codecs/indeo5.h
parente06442afb6b154f749c4d839fd2a23e434e08dda (diff)
downloadscummvm-rg350-9c6a55a2a660d2c59e9c0e22402e4d16e08ef987.tar.gz
scummvm-rg350-9c6a55a2a660d2c59e9c0e22402e4d16e08ef987.tar.bz2
scummvm-rg350-9c6a55a2a660d2c59e9c0e22402e4d16e08ef987.zip
IMAGE: Cleanup of miscellaneous methods and arrays in Indeo decoders
Diffstat (limited to 'image/codecs/indeo5.h')
-rw-r--r--image/codecs/indeo5.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/image/codecs/indeo5.h b/image/codecs/indeo5.h
index 9832967d5d..169bef9794 100644
--- a/image/codecs/indeo5.h
+++ b/image/codecs/indeo5.h
@@ -112,12 +112,7 @@ private:
/**
* standard picture dimensions (width, height divided by 4)
*/
- static const uint8 _ivi5_common_pic_sizes[30];
-
- /**
- * standard picture dimensions (width, height divided by 4)
- */
- static const uint8 ivi5_common_pic_sizes[30];
+ static const uint8 _commonPicSizes[30];
/**
* Indeo5 dequantization matrixes consist of two tables: base table
@@ -128,17 +123,17 @@ private:
* ivi5_base_quant_bbb_ttt - base tables for block size 'bbb' of type 'ttt'
* ivi5_scale_quant_bbb_ttt - scale tables for block size 'bbb' of type 'ttt'
*/
- static const uint16 _ivi5_base_quant_8x8_inter[5][64];
- static const uint16 _ivi5_base_quant_8x8_intra[5][64];
+ static const uint16 _baseQuant8x8Inter[5][64];
+ static const uint16 _baseQuant8x8Intra[5][64];
- static const uint16 _ivi5_base_quant_4x4_inter[16];
- static const uint16 _ivi5_base_quant_4x4_intra[16];
+ static const uint16 _baseQuant4x4Inter[16];
+ static const uint16 _baseQuant4x4Intra[16];
- static const uint8 _ivi5_scale_quant_8x8_inter[5][24];
- static const uint8 _ivi5_scale_quant_8x8_intra[5][24];
+ static const uint8 _scaleQuant8x8Inter[5][24];
+ static const uint8 _scaleQuant8x8Intra[5][24];
- static const uint8 _ivi5_scale_quant_4x4_inter[24];
- static const uint8 _ivi5_scale_quant_4x4_intra[24];
+ static const uint8 _scaleQuant4x4Inter[24];
+ static const uint8 _scaleQuant4x4Intra[24];
};
} // End of namespace Image