[FFmpeg-soc] [soc]: r5611 - in indeo5: ivi_common.c ivi_common.h ivi_dsp.c ivi_dsp.h
kostya
subversion at mplayerhq.hu
Wed Jan 27 17:33:36 CET 2010
Author: kostya
Date: Wed Jan 27 17:33:36 2010
New Revision: 5611
Log:
Add const qualifiers where appropriate and remove where not
Modified:
indeo5/ivi_common.c
indeo5/ivi_common.h
indeo5/ivi_dsp.c
indeo5/ivi_dsp.h
Modified: indeo5/ivi_common.c
==============================================================================
--- indeo5/ivi_common.c Wed Jan 27 17:30:28 2010 (r5610)
+++ indeo5/ivi_common.c Wed Jan 27 17:33:36 2010 (r5611)
@@ -192,8 +192,7 @@ void av_cold ff_ivi_free_buffers(IVIPlan
}
}
-int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, const int tile_width,
- const int tile_height)
+int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height)
{
int p, b, x, y, x_tiles, y_tiles, t_width, t_height;
IVIBandDesc *band;
@@ -278,8 +277,8 @@ int ff_ivi_decode_blocks(GetBitContext *
uint32_t cbp, sym, lo, hi, quant, buf_offs, q;
IVIMbInfo *mb;
RVMapDesc *rvmap = band->rv_map;
- void (*mc_with_delta_func)(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type);
- void (*mc_no_delta_func) (int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type);
+ void (*mc_with_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+ void (*mc_no_delta_func) (int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
const uint8_t *base_tab, *scale_tab;
prev_dc = 0; /* init intra prediction for the DC coefficient */
@@ -412,7 +411,7 @@ void ff_ivi_process_empty_tile(AVCodecCo
IVIMbInfo *mb, *ref_mb;
const int16_t *src;
int16_t *dst;
- void (*mc_no_delta_func)(int16_t *buf, int16_t *ref_buf, uint32_t pitch,
+ void (*mc_no_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch,
int mc_type);
offs = tile->ypos * band->pitch + tile->xpos;
@@ -514,7 +513,7 @@ uint16_t ivi_calc_band_checksum (IVIBand
return checksum;
}
-int ivi_check_band (IVIBandDesc *band, uint8_t *ref, int pitch)
+int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch)
{
int x, y, result;
uint8_t t1, t2;
@@ -540,7 +539,7 @@ int ivi_check_band (IVIBandDesc *band, u
}
#endif
-void ff_ivi_output_plane(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch)
+void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch)
{
int x, y;
const int16_t *src = plane->bands[0].buf;
Modified: indeo5/ivi_common.h
==============================================================================
--- indeo5/ivi_common.h Wed Jan 27 17:30:28 2010 (r5610)
+++ indeo5/ivi_common.h Wed Jan 27 17:33:36 2010 (r5611)
@@ -253,7 +253,7 @@ void ff_ivi_free_buffers(IVIPlaneDesc *p
* @param tile_height [in] tile height
* @return result code: 0 - OK
*/
-int ff_ivi_init_tiles(IVIPlaneDesc *planes, const int tile_width, const int tile_height);
+int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height);
/**
* Decodes size of the tile data.
@@ -300,7 +300,7 @@ void ff_ivi_process_empty_tile(AVCodecCo
* @param dst [out] pointer to the buffer receiving converted pixels
* @param dst_pitch [in] pitch for moving to the next y line
*/
-void ff_ivi_output_plane(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch);
+void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch);
#if IVI_DEBUG
/**
Modified: indeo5/ivi_dsp.c
==============================================================================
--- indeo5/ivi_dsp.c Wed Jan 27 17:30:28 2010 (r5610)
+++ indeo5/ivi_dsp.c Wed Jan 27 17:33:36 2010 (r5611)
@@ -216,7 +216,7 @@ void ff_ivi_recompose53(const IVIPlaneDe
d3 = COMPENSATE(s3);\
d4 = COMPENSATE(s4);}
-void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags)
+void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
{
int i, t1;
int32_t *src, *dst, tmp[64];
@@ -254,7 +254,7 @@ void ff_ivi_inverse_slant_8x8(int32_t *i
#undef COMPENSATE
}
-void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags)
+void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
{
int i, t1;
int32_t *src, *dst, tmp[16];
@@ -289,7 +289,7 @@ void ff_ivi_inverse_slant_4x4(int32_t *i
#undef COMPENSATE
}
-void ff_ivi_dc_slant_2d(int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
{
int x, y;
int16_t dc_coeff;
@@ -302,7 +302,7 @@ void ff_ivi_dc_slant_2d(int32_t *in, int
}
}
-void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags)
+void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
{
int i, t1;
@@ -322,7 +322,7 @@ void ff_ivi_row_slant8(int32_t *in, int1
#undef COMPENSATE
}
-void ff_ivi_dc_row_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
{
int x, y;
int16_t dc_coeff;
@@ -340,7 +340,7 @@ void ff_ivi_dc_row_slant(int32_t *in, in
}
}
-void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags)
+void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
{
int i, t1, row2, row4, row8;
@@ -367,7 +367,7 @@ void ff_ivi_col_slant8(int32_t *in, int1
#undef COMPENSATE
}
-void ff_ivi_dc_col_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
{
int x, y;
int16_t dc_coeff;
@@ -382,7 +382,7 @@ void ff_ivi_dc_col_slant(int32_t *in, in
}
void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch,
- uint8_t *flags)
+ const uint8_t *flags)
{
int x, y;
@@ -391,7 +391,7 @@ void ff_ivi_put_pixels_8x8(int32_t *in,
out[x] = in[x];
}
-void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch,
+void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
int blk_size)
{
int y;
Modified: indeo5/ivi_dsp.h
==============================================================================
--- indeo5/ivi_dsp.h Wed Jan 27 17:30:28 2010 (r5610)
+++ indeo5/ivi_dsp.h Wed Jan 27 17:33:36 2010 (r5611)
@@ -53,7 +53,7 @@ void ff_ivi_recompose53(const IVIPlaneDe
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
-void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags);
+void ff_ivi_inverse_slant_8x8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
/**
* two-dimensional inverse slant 4x4 transform
@@ -65,7 +65,7 @@ void ff_ivi_inverse_slant_8x8(int32_t *i
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
-void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags);
+void ff_ivi_inverse_slant_4x4(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
/**
* DC-only two-dimensional inverse slant transform.
@@ -78,7 +78,7 @@ void ff_ivi_inverse_slant_4x4(int32_t *i
* @param pitch [in] pitch to move to the next y line
* @param blk_size [in] transform block size
*/
-void ff_ivi_dc_slant_2d(int32_t *in, int16_t *out, uint32_t pitch, int blk_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
@@ -88,7 +88,7 @@ void ff_ivi_dc_slant_2d(int32_t *in, int
* @param pitch [in] pitch to move to the next y line
* @param flags [in] pointer to the array of column flags (unused here)
*/
-void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags);
+void ff_ivi_row_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
/**
* inverse 1D column slant transform
@@ -100,28 +100,28 @@ void ff_ivi_row_slant8(int32_t *in, int1
* != 0 - non_empty column, 0 - empty one
* (this array must be filled by caller)
*/
-void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags);
+void ff_ivi_col_slant8(int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
/**
* DC-only inverse row slant transform
*/
-void ff_ivi_dc_row_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
/**
* DC-only inverse column slant transform
*/
-void ff_ivi_dc_col_slant(int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+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.
*/
-void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch, uint8_t *flags);
+void ff_ivi_put_pixels_8x8(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.
*/
-void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+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
More information about the FFmpeg-soc
mailing list