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

[kostya]

Author: kostya
Date: Fri Jan 15 09:04:13 2010
New Revision: 5578

Log:
Rename mc_resolution to clearer is_halfpel

Modified:
   indeo5/indeo5.c
   indeo5/ivi_common.c
   indeo5/ivi_common.h

Modified: indeo5/indeo5.c
==============================================================================
--- indeo5/indeo5.c	Thu Jan 14 19:54:30 2010	(r5577)
+++ indeo5/indeo5.c	Fri Jan 15 09:04:13 2010	(r5578)
@@ -172,7 +172,7 @@ static int decode_gop_header(IVI5DecCont
         for (i = 0; i < (!p ? pic_conf.luma_bands : pic_conf.chroma_bands); i++) {
             band = &ctx->planes[p].bands[i]; /* select appropriate plane/band */
 
-            band->mc_resolution = get_bits1(&ctx->gb);
+            band->is_halfpel = get_bits1(&ctx->gb);
 
             /* decode block and macroblock sizes */
             mb_size  = get_bits1(&ctx->gb);
@@ -248,7 +248,7 @@ static int decode_gop_header(IVI5DecCont
         band2->height        = band1->height;
         band2->mb_size       = band1->mb_size;
         band2->blk_size      = band1->blk_size;
-        band2->mc_resolution = band1->mc_resolution;
+        band2->is_halfpel    = band1->is_halfpel;
         band2->quant_mat     = band1->quant_mat;
         band2->scan          = band1->scan;
         band2->inv_transform = band1->inv_transform;

Modified: indeo5/ivi_common.c
==============================================================================
--- indeo5/ivi_common.c	Thu Jan 14 19:54:30 2010	(r5577)
+++ indeo5/ivi_common.c	Fri Jan 15 09:04:13 2010	(r5578)
@@ -323,7 +323,7 @@ int ff_ivi_decode_blocks(GetBitContext *
         if (!is_intra) {
             mv_x = mb->mv_x;
             mv_y = mb->mv_y;
-            if (!band->mc_resolution) {
+            if (!band->is_halfpel) {
                 mc_type = 0; /* we have only fullpel vectors */
             } else {
                 mc_type = ((mv_y & 1) << 1) | (mv_x & 1);
@@ -496,7 +496,7 @@ void ff_ivi_process_empty_tile(AVCodecCo
             mv_x = mb->mv_x;
             mv_y = mb->mv_y;
             offs = mb->buf_offs;
-            if (!band->mc_resolution) {
+            if (!band->is_halfpel) {
                 mc_type = 0; /* we have only fullpel vectors */
             } else {
                 mc_type = ((mv_y & 1) << 1) | (mv_x & 1);

Modified: indeo5/ivi_common.h
==============================================================================
--- indeo5/ivi_common.h	Thu Jan 14 19:54:30 2010	(r5577)
+++ indeo5/ivi_common.h	Fri Jan 15 09:04:13 2010	(r5578)
@@ -111,7 +111,7 @@ typedef struct {
     uint8_t         is_empty;       ///< = 1 if this band doesn't contain any data
     uint8_t         mb_size;        ///< macroblock size
     uint8_t         blk_size;       ///< block size
-    uint8_t         mc_resolution;  ///< resolution of the motion compensation: 0 - fullpel, 1 - halfpel
+    uint8_t         is_halfpel;     ///< precision of the motion compensation: 0 - fullpel, 1 - halfpel
     int8_t          inherit_mv;
     int8_t          inherit_qdelta;
     int8_t          qdelta_present; ///< tells if Qdelta signal is present in the bitstream (Indeo5 only)