[FFmpeg-soc] [soc]: r5588 - in indeo5: ivi_common.c ivi_common.h ivi_dsp.c ivi_dsp.h

[kostya]

Author: kostya
Date: Fri Jan 15 10:36:07 2010
New Revision: 5588

Log:
ff_ivi_put_pixels* belong to DSP, not mere common code

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	Fri Jan 15 10:30:31 2010	(r5587)
+++ indeo5/ivi_common.c	Fri Jan 15 10:36:07 2010	(r5588)
@@ -252,29 +252,6 @@ int av_cold ff_ivi_init_tiles(IVIPlaneDe
     return 0;
 }
 
-void ff_ivi_put_pixels_8x8(int32_t *in, int16_t *out, uint32_t pitch,
-                           uint8_t *flags)
-{
-    int     x, y;
-
-    for (y = 0; y < 8; out += pitch, in += 8, y++)
-        for (x = 0; x < 8; x++)
-            out[x] = in[x];
-}
-
-void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch,
-                             int blk_size)
-{
-    int     y;
-
-    out[0] = in[0];
-    memset(&out[1], 0, 7*sizeof(int16_t));
-    out += pitch;
-
-    for (y = 1; y < 8; out += pitch, y++)
-        memset(out, 0, 8*sizeof(int16_t));
-}
-
 int ff_ivi_dec_tile_data_size(GetBitContext *gb)
 {
     int    len;

Modified: indeo5/ivi_common.h
==============================================================================
--- indeo5/ivi_common.h	Fri Jan 15 10:30:31 2010	(r5587)
+++ indeo5/ivi_common.h	Fri Jan 15 10:36:07 2010	(r5588)
@@ -304,17 +304,6 @@ void ff_ivi_process_empty_tile(AVCodecCo
  */
 void ff_ivi_output_plane(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch);
 
-/**
- *  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);
-
-/**
- *  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);
-
 #ifdef IVI_DEBUG
 /**
  *  Calculates band checksum from band data.

Modified: indeo5/ivi_dsp.c
==============================================================================
--- indeo5/ivi_dsp.c	Fri Jan 15 10:30:31 2010	(r5587)
+++ indeo5/ivi_dsp.c	Fri Jan 15 10:36:07 2010	(r5588)
@@ -381,6 +381,29 @@ 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)
+{
+    int     x, y;
+
+    for (y = 0; y < 8; out += pitch, in += 8, y++)
+        for (x = 0; x < 8; x++)
+            out[x] = in[x];
+}
+
+void ff_ivi_put_dc_pixel_8x8(int32_t *in, int16_t *out, uint32_t pitch,
+                             int blk_size)
+{
+    int     y;
+
+    out[0] = in[0];
+    memset(&out[1], 0, 7*sizeof(int16_t));
+    out += pitch;
+
+    for (y = 1; y < 8; out += pitch, y++)
+        memset(out, 0, 8*sizeof(int16_t));
+}
+
 void ff_ivi_mc_8x8_delta(int16_t *buf, int16_t *ref_buf, uint32_t pitch, int mc_type)
 {
     int     i, j;

Modified: indeo5/ivi_dsp.h
==============================================================================
--- indeo5/ivi_dsp.h	Fri Jan 15 10:30:31 2010	(r5587)
+++ indeo5/ivi_dsp.h	Fri Jan 15 10:36:07 2010	(r5588)
@@ -114,6 +114,17 @@ void ff_ivi_dc_row_slant(int32_t *in, in
 void ff_ivi_dc_col_slant(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);
+
+/**
+ *  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);
+
+/**
  *  8x8 block motion compensation with adding delta
  *
  *  @param  buf     [in,out] pointer to the block in the current frame buffer containing delta