/*
* DSP functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
*
- * Copyright (c) 2009 Maxim Poliakovski
+ * Copyright (c) 2009-2011 Maxim Poliakovski
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavcodec/ivi_dsp.h
+ * @file
* DSP functions (inverse transforms, motion compensations, wavelet recompostion)
* for Indeo Video Interactive codecs.
*/
/**
* 5/3 wavelet recomposition filter for Indeo5
*
- * @param plane [in] pointer to the descriptor of the plane being processed
- * @param dst [out] pointer to the destination buffer
- * @param dst_pitch [in] pitch of the destination buffer
- * @param num_bands [in] number of wavelet bands to be processed
+ * @param[in] plane pointer to the descriptor of the plane being processed
+ * @param[out] dst pointer to the destination buffer
+ * @param[in] dst_pitch pitch of the destination buffer
*/
void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
- const int dst_pitch, const int num_bands);
+ const int dst_pitch);
+
+/**
+ * Haar wavelet recomposition filter for Indeo 4
+ *
+ * @param[in] plane pointer to the descriptor of the plane being processed
+ * @param[out] dst pointer to the destination buffer
+ * @param[in] dst_pitch pitch of the destination buffer
+ */
+void ff_ivi_recompose_haar(const IVIPlaneDesc *plane, uint8_t *dst,
+ const int dst_pitch);
+
+/**
+ * two-dimensional inverse Haar 8x8 transform for Indeo 4
+ *
+ * @param[in] in pointer to the vector of transform coefficients
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] flags pointer to the array of column flags:
+ * != 0 - non_empty column, 0 - empty one
+ * (this array must be filled by caller)
+ */
+void ff_ivi_inverse_haar_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
+ const uint8_t *flags);
+
+/**
+ * DC-only two-dimensional inverse Haar transform for Indeo 4.
+ * Performing the inverse transform in this case is equivalent to
+ * spreading DC_coeff >> 3 over the whole block.
+ *
+ * @param[in] in pointer to the dc coefficient
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] blk_size transform block size
+ */
+void ff_ivi_dc_haar_2d(const int32_t *in, int16_t *out, uint32_t pitch,
+ int blk_size);
/**
* two-dimensional inverse slant 8x8 transform
*
- * @param in [in] pointer to the vector of transform coefficients
- * @param out [out] pointer to the output buffer (frame)
- * @param pitch [in] pitch to move to the next y line
- * @param flags [in] pointer to the array of column flags:
+ * @param[in] in pointer to the vector of transform coefficients
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] flags pointer to the array of column flags:
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
/**
* two-dimensional inverse slant 4x4 transform
*
- * @param in [in] pointer to the vector of transform coefficients
- * @param out [out] pointer to the output buffer (frame)
- * @param pitch [in] pitch to move to the next y line
- * @param flags [in] pointer to the array of column flags:
+ * @param[in] in pointer to the vector of transform coefficients
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] flags pointer to the array of column flags:
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
* spreading (DC_coeff + 1)/2 over the whole block.
* It works much faster than performing the slant transform on a vector of zeroes.
*
- * @param in [in] pointer to the dc coefficient
- * @param out [out] pointer to the output buffer (frame)
- * @param pitch [in] pitch to move to the next y line
- * @param blk_size [in] transform block size
+ * @param[in] in pointer to the dc coefficient
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] blk_size transform block size
*/
void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
/**
* inverse 1D row slant transform
*
- * @param in [in] pointer to the vector of transform coefficients
- * @param out [out] pointer to the output buffer (frame)
- * @param pitch [in] pitch to move to the next y line
- * @param flags [in] pointer to the array of column flags (unused here)
+ * @param[in] in pointer to the vector of transform coefficients
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] flags pointer to the array of column flags (unused here)
*/
void ff_ivi_row_slant8(const int32_t *in, int16_t *out, uint32_t pitch,
const uint8_t *flags);
/**
* inverse 1D column slant transform
*
- * @param in [in] pointer to the vector of transform coefficients
- * @param out [out] pointer to the output buffer (frame)
- * @param pitch [in] pitch to move to the next y line
- * @param flags [in] pointer to the array of column flags:
+ * @param[in] in pointer to the vector of transform coefficients
+ * @param[out] out pointer to the output buffer (frame)
+ * @param[in] pitch pitch to move to the next y line
+ * @param[in] flags pointer to the array of column flags:
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
/**
- * Copies the pixels into the frame buffer.
+ * Copy the pixels into the frame buffer.
*/
void ff_ivi_put_pixels_8x8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
/**
- * Copies the DC coefficient into the first pixel of the block and
- * zeroes all others.
+ * Copy the DC coefficient into the first pixel of the block and
+ * zero all others.
*/
void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
/**
* 8x8 block motion compensation with adding delta
*
- * @param buf [in,out] pointer to the block in the current frame buffer containing delta
- * @param ref_buf [in] pointer to the corresponding block in the reference frame
- * @param pitch [in] pitch for moving to the next y line
- * @param mc_type [in] interpolation type
+ * @param[in,out] buf pointer to the block in the current frame buffer containing delta
+ * @param[in] ref_buf pointer to the corresponding block in the reference frame
+ * @param[in] pitch pitch for moving to the next y line
+ * @param[in] mc_type interpolation type
*/
void ff_ivi_mc_8x8_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
/**
* 4x4 block motion compensation with adding delta
*
- * @param buf [in,out] pointer to the block in the current frame buffer containing delta
- * @param ref_buf [in] pointer to the corresponding block in the reference frame
- * @param pitch [in] pitch for moving to the next y line
- * @param mc_type [in] interpolation type
+ * @param[in,out] buf pointer to the block in the current frame buffer containing delta
+ * @param[in] ref_buf pointer to the corresponding block in the reference frame
+ * @param[in] pitch pitch for moving to the next y line
+ * @param[in] mc_type interpolation type
*/
void ff_ivi_mc_4x4_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
/**
* motion compensation without adding delta
*
- * @param buf [in,out] pointer to the block in the current frame receiving the result
- * @param ref_buf [in] pointer to the corresponding block in the reference frame
- * @param pitch [in] pitch for moving to the next y line
- * @param mc_type [in] interpolation type
+ * @param[in,out] buf pointer to the block in the current frame receiving the result
+ * @param[in] ref_buf pointer to the corresponding block in the reference frame
+ * @param[in] pitch pitch for moving to the next y line
+ * @param[in] mc_type interpolation type
*/
void ff_ivi_mc_8x8_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
/**
* 4x4 block motion compensation without adding delta
*
- * @param buf [in,out] pointer to the block in the current frame receiving the result
- * @param ref_buf [in] pointer to the corresponding block in the reference frame
- * @param pitch [in] pitch for moving to the next y line
- * @param mc_type [in] interpolation type
+ * @param[in,out] buf pointer to the block in the current frame receiving the result
+ * @param[in] ref_buf pointer to the corresponding block in the reference frame
+ * @param[in] pitch pitch for moving to the next y line
+ * @param[in] mc_type interpolation type
*/
void ff_ivi_mc_4x4_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
projects / ffmpeg / blobdiff