diff options
Diffstat (limited to 'src/lib/util/avhuff.h')
-rw-r--r-- | src/lib/util/avhuff.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/util/avhuff.h b/src/lib/util/avhuff.h index ca1bd4cec49..9d00ed423e6 100644 --- a/src/lib/util/avhuff.h +++ b/src/lib/util/avhuff.h @@ -66,12 +66,12 @@ public: } bitmap_yuy16 video; // pointer to video bitmap - UINT32 maxsamples; // maximum number of samples per channel - UINT32 * actsamples; // actual number of samples per channel - INT16 * audio[16]; // pointer to individual audio channels - UINT32 maxmetalength; // maximum length of metadata - UINT32 * actmetalength; // actual length of metadata - UINT8 * metadata; // pointer to metadata buffer + uint32_t maxsamples; // maximum number of samples per channel + uint32_t * actsamples; // actual number of samples per channel + int16_t * audio[16]; // pointer to individual audio channels + uint32_t maxmetalength; // maximum length of metadata + uint32_t * actmetalength; // actual length of metadata + uint8_t * metadata; // pointer to metadata buffer }; @@ -85,12 +85,12 @@ public: avhuff_encoder(); // encode/decode - avhuff_error encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength); + avhuff_error encode_data(const uint8_t *source, uint8_t *dest, uint32_t &complength); // static helpers - static UINT32 raw_data_size(const UINT8 *data); - static UINT32 raw_data_size(UINT32 width, UINT32 height, UINT8 channels, UINT32 numsamples, UINT32 metadatasize = 0) { return 12 + channels * numsamples * 2 + width * height * 2; } - static avhuff_error assemble_data(std::vector<UINT8> &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata = nullptr, UINT32 metadatasize = 0); + static uint32_t raw_data_size(const uint8_t *data); + static uint32_t raw_data_size(uint32_t width, uint32_t height, uint8_t channels, uint32_t numsamples, uint32_t metadatasize = 0) { return 12 + channels * numsamples * 2 + width * height * 2; } + static avhuff_error assemble_data(std::vector<uint8_t> &buffer, bitmap_yuy16 &bitmap, uint8_t channels, uint32_t numsamples, int16_t **samples, uint8_t *metadata = nullptr, uint32_t metadatasize = 0); private: // delta-RLE Huffman encoder @@ -102,24 +102,24 @@ private: : m_rlecount(0) { } // histogramming - UINT16 *rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count); + uint16_t *rle_and_histo_bitmap(const uint8_t *source, uint32_t items_per_row, uint32_t item_advance, uint32_t row_count); // encoding void flush_rle() { m_rlecount = 0; } - void encode_one(bitstream_out &bitbuf, UINT16 *&rleptr); + void encode_one(bitstream_out &bitbuf, uint16_t *&rleptr); huffman_error export_tree_rle(bitstream_out &bitbuf) { return m_encoder.export_tree_rle(bitbuf); } private: // internal state int m_rlecount; huffman_encoder<256 + 16> m_encoder; - std::vector<UINT16> m_rlebuffer; + std::vector<uint16_t> m_rlebuffer; }; // internal helpers - avhuff_error encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes); - avhuff_error encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength); - avhuff_error encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength); + avhuff_error encode_audio(const uint8_t *source, int channels, int samples, uint8_t *dest, uint8_t *sizes); + avhuff_error encode_video(const uint8_t *source, int width, int height, uint8_t *dest, uint32_t &complength); + avhuff_error encode_video_lossless(const uint8_t *source, int width, int height, uint8_t *dest, uint32_t &complength); // video encoding contexts deltarle_encoder m_ycontext; @@ -127,7 +127,7 @@ private: deltarle_encoder m_crcontext; // audio encoding contexts - std::vector<UINT8> m_audiobuffer; + std::vector<uint8_t> m_audiobuffer; #if AVHUFF_USE_FLAC flac_encoder m_flac_encoder; #else @@ -150,7 +150,7 @@ public: void configure(const avhuff_decompress_config &config); // encode/decode - avhuff_error decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest); + avhuff_error decode_data(const uint8_t *source, uint32_t complength, uint8_t *dest); private: // delta-RLE Huffman decoder @@ -166,21 +166,21 @@ private: // decoding void flush_rle() { m_rlecount = 0; } - UINT32 decode_one(bitstream_in &bitbuf); + uint32_t decode_one(bitstream_in &bitbuf); huffman_error import_tree_rle(bitstream_in &bitbuf) { return m_decoder.import_tree_rle(bitbuf); } private: // internal state int m_rlecount; - UINT8 m_prevdata; + uint8_t m_prevdata; huffman_decoder<256 + 16> m_decoder; }; // internal helpers - avhuff_error decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes); - avhuff_error decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor); - avhuff_error decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor); + avhuff_error decode_audio(int channels, int samples, const uint8_t *source, uint8_t **dest, uint32_t dxor, const uint8_t *sizes); + avhuff_error decode_video(int width, int height, const uint8_t *source, uint32_t complength, uint8_t *dest, uint32_t dstride, uint32_t dxor); + avhuff_error decode_video_lossless(int width, int height, const uint8_t *source, uint32_t complength, uint8_t *dest, uint32_t dstride, uint32_t dxor); // internal state avhuff_decompress_config m_config; |