diff options
author | 2015-06-24 23:33:18 +0200 | |
---|---|---|
committer | 2015-06-24 23:33:18 +0200 | |
commit | 7a07ecba2a16abf918cc87dc23367f9a97cea3a6 (patch) | |
tree | 1c70358b79b3e9c38e6848657f609f6a3842bd68 /src/lib/util/avhuff.c | |
parent | 3035213d045bc0edc31194fa5309c60ade5919ff (diff) | |
parent | cda316ccfea6017740fbbf8d76a732eff54047ff (diff) |
Merge pull request #3 from mamedev/master
merge with base
Diffstat (limited to 'src/lib/util/avhuff.c')
-rw-r--r-- | src/lib/util/avhuff.c | 250 |
1 files changed, 125 insertions, 125 deletions
diff --git a/src/lib/util/avhuff.c b/src/lib/util/avhuff.c index cb00ab23336..d9fdecb46cc 100644 --- a/src/lib/util/avhuff.c +++ b/src/lib/util/avhuff.c @@ -174,11 +174,11 @@ inline UINT32 avhuff_decoder::deltarle_decoder::decode_one(bitstream_in &bitbuf) //************************************************************************** /** - * @fn avhuff_encoder::avhuff_encoder() + * @fn avhuff_encoder::avhuff_encoder() * - * @brief ------------------------------------------------- - * avhuff_encoder - constructor - * -------------------------------------------------. + * @brief ------------------------------------------------- + * avhuff_encoder - constructor + * -------------------------------------------------. */ avhuff_encoder::avhuff_encoder() @@ -189,17 +189,17 @@ m_flac_encoder.set_strip_metadata(true); } /** - * @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength) + * @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength) * - * @brief ------------------------------------------------- - * encode_data - encode a block of data into a compressed data stream - * -------------------------------------------------. + * @brief ------------------------------------------------- + * encode_data - encode a block of data into a compressed data stream + * -------------------------------------------------. * - * @param source Source for the. - * @param [in,out] dest If non-null, destination for the. - * @param [in,out] complength The complength. + * @param source Source for the. + * @param [in,out] dest If non-null, destination for the. + * @param [in,out] complength The complength. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength) @@ -278,15 +278,15 @@ avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT3 } /** - * @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) + * @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) * - * @brief ------------------------------------------------- - * raw_data_size - return the raw data size of a raw stream based on the header - * -------------------------------------------------. + * @brief ------------------------------------------------- + * raw_data_size - return the raw data size of a raw stream based on the header + * -------------------------------------------------. * - * @param data The data. + * @param data The data. * - * @return An UINT32. + * @return An UINT32. */ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) @@ -308,21 +308,21 @@ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) } /** - * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) + * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) * - * @brief ------------------------------------------------- - * assemble_data - assemble a datastream from raw bits - * -------------------------------------------------. + * @brief ------------------------------------------------- + * assemble_data - assemble a datastream from raw bits + * -------------------------------------------------. * - * @param [in,out] buffer The buffer. - * @param [in,out] bitmap The bitmap. - * @param channels The channels. - * @param numsamples The numsamples. - * @param [in,out] samples If non-null, the samples. - * @param [in,out] metadata If non-null, the metadata. - * @param metadatasize The metadatasize. + * @param [in,out] buffer The buffer. + * @param [in,out] bitmap The bitmap. + * @param channels The channels. + * @param numsamples The numsamples. + * @param [in,out] samples If non-null, the samples. + * @param [in,out] metadata If non-null, the metadata. + * @param metadatasize The metadatasize. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) @@ -378,19 +378,19 @@ avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 } /** - * @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes) + * @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes) * - * @brief ------------------------------------------------- - * encode_audio - encode raw audio data to the destination - * -------------------------------------------------. + * @brief ------------------------------------------------- + * encode_audio - encode raw audio data to the destination + * -------------------------------------------------. * - * @param source Source for the. - * @param channels The channels. - * @param samples The samples. - * @param [in,out] dest If non-null, destination for the. - * @param [in,out] sizes If non-null, the sizes. + * @param source Source for the. + * @param channels The channels. + * @param samples The samples. + * @param [in,out] dest If non-null, destination for the. + * @param [in,out] sizes If non-null, the sizes. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes) @@ -511,19 +511,19 @@ avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int } /** - * @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) + * @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) * - * @brief ------------------------------------------------- - * encode_video - encode raw video data to the destination - * -------------------------------------------------. + * @brief ------------------------------------------------- + * encode_video - encode raw video data to the destination + * -------------------------------------------------. * - * @param source Source for the. - * @param width The width. - * @param height The height. - * @param [in,out] dest If non-null, destination for the. - * @param [in,out] complength The complength. + * @param source Source for the. + * @param width The width. + * @param height The height. + * @param [in,out] dest If non-null, destination for the. + * @param [in,out] complength The complength. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) @@ -533,20 +533,20 @@ avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int he } /** - * @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) + * @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) * - * @brief ------------------------------------------------- - * encode_video_lossless - do a lossless video encoding using deltas and huffman - * encoding - * -------------------------------------------------. + * @brief ------------------------------------------------- + * encode_video_lossless - do a lossless video encoding using deltas and huffman + * encoding + * -------------------------------------------------. * - * @param source Source for the. - * @param width The width. - * @param height The height. - * @param [in,out] dest If non-null, destination for the. - * @param [in,out] complength The complength. + * @param source Source for the. + * @param width The width. + * @param height The height. + * @param [in,out] dest If non-null, destination for the. + * @param [in,out] complength The complength. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) @@ -601,18 +601,18 @@ avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int widt //************************************************************************** /** - * @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count) + * @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count) * - * @brief ------------------------------------------------- - * rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data - * -------------------------------------------------. + * @brief ------------------------------------------------- + * rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data + * -------------------------------------------------. * - * @param source Source for the. - * @param items_per_row The items per row. - * @param item_advance The item advance. - * @param row_count Number of rows. + * @param source Source for the. + * @param items_per_row The items per row. + * @param item_advance The item advance. + * @param row_count Number of rows. * - * @return null if it fails, else an UINT16*. + * @return null if it fails, else an UINT16*. */ UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count) @@ -679,11 +679,11 @@ UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *sour //************************************************************************** /** - * @fn avhuff_decoder::avhuff_decoder() + * @fn avhuff_decoder::avhuff_decoder() * - * @brief ------------------------------------------------- - * avhuff_decoder - constructor - * -------------------------------------------------. + * @brief ------------------------------------------------- + * avhuff_decoder - constructor + * -------------------------------------------------. */ avhuff_decoder::avhuff_decoder() @@ -691,13 +691,13 @@ avhuff_decoder::avhuff_decoder() } /** - * @fn void avhuff_decoder::configure(const avhuff_decompress_config &config) + * @fn void avhuff_decoder::configure(const avhuff_decompress_config &config) * - * @brief ------------------------------------------------- - * configure - configure decompression parameters - * -------------------------------------------------. + * @brief ------------------------------------------------- + * configure - configure decompression parameters + * -------------------------------------------------. * - * @param config The configuration. + * @param config The configuration. */ void avhuff_decoder::configure(const avhuff_decompress_config &config) @@ -712,17 +712,17 @@ void avhuff_decoder::configure(const avhuff_decompress_config &config) } /** - * @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest) + * @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest) * - * @brief ------------------------------------------------- - * decode_data - decode both audio and video from a raw data stream - * -------------------------------------------------. + * @brief ------------------------------------------------- + * decode_data - decode both audio and video from a raw data stream + * -------------------------------------------------. * - * @param source Source for the. - * @param complength The complength. - * @param [in,out] dest If non-null, destination for the. + * @param source Source for the. + * @param complength The complength. + * @param [in,out] dest If non-null, destination for the. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest) @@ -853,23 +853,23 @@ avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, } /** - * @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes) + * @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes) * - * @brief ------------------------------------------------- - * decode_audio - decode audio from a compressed data stream - * -------------------------------------------------. + * @brief ------------------------------------------------- + * decode_audio - decode audio from a compressed data stream + * -------------------------------------------------. * - * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error - * condition occurs. + * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error + * condition occurs. * - * @param channels The channels. - * @param samples The samples. - * @param source Source for the. - * @param [in,out] dest If non-null, destination for the. - * @param dxor The dxor. - * @param sizes The sizes. + * @param channels The channels. + * @param samples The samples. + * @param source Source for the. + * @param [in,out] dest If non-null, destination for the. + * @param dxor The dxor. + * @param sizes The sizes. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes) @@ -991,21 +991,21 @@ avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 } /** - * @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) + * @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) * - * @brief ------------------------------------------------- - * decode_video - decode video from a compressed data stream - * -------------------------------------------------. + * @brief ------------------------------------------------- + * decode_video - decode video from a compressed data stream + * -------------------------------------------------. * - * @param width The width. - * @param height The height. - * @param source Source for the. - * @param complength The complength. - * @param [in,out] dest If non-null, destination for the. - * @param dstride The dstride. - * @param dxor The dxor. + * @param width The width. + * @param height The height. + * @param source Source for the. + * @param complength The complength. + * @param [in,out] dest If non-null, destination for the. + * @param dstride The dstride. + * @param dxor The dxor. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) @@ -1018,22 +1018,22 @@ avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *so } /** - * @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) + * @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) * - * @brief ------------------------------------------------- - * decode_video_lossless - do a lossless video decoding using deltas and huffman - * encoding - * -------------------------------------------------. + * @brief ------------------------------------------------- + * decode_video_lossless - do a lossless video decoding using deltas and huffman + * encoding + * -------------------------------------------------. * - * @param width The width. - * @param height The height. - * @param source Source for the. - * @param complength The complength. - * @param [in,out] dest If non-null, destination for the. - * @param dstride The dstride. - * @param dxor The dxor. + * @param width The width. + * @param height The height. + * @param source Source for the. + * @param complength The complength. + * @param [in,out] dest If non-null, destination for the. + * @param dstride The dstride. + * @param dxor The dxor. * - * @return An avhuff_error. + * @return An avhuff_error. */ avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) |