CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de)

[ffmpeg] / libavcodec / xvmcvideo.c

diff --git a/libavcodec/xvmcvideo.c b/libavcodec/xvmcvideo.c
index eed986033830a00b5409ddfbed809f213545a713..70f67b39f97c64dd4d776ced36a6ba973fde152c 100644 (file)
--- a/libavcodec/xvmcvideo.c
+++ b/libavcodec/xvmcvideo.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <limits.h>
@@ -55,32 +55,21 @@ xvmc_render_state_t * render;
 
 void XVMC_pack_pblocks(MpegEncContext *s, int cbp){
 int i,j;
-#define numblocks 6
+const int mb_block_count = 4+(1<<s->chroma_format);
 
     j=0;
-    for(i=0;i<numblocks;i++){
-        if(cbp & (1<<(numblocks-1-i)) ){
+    cbp<<= 12-mb_block_count;
+    for(i=0; i<mb_block_count; i++){
+        if(cbp & (1<<11)) {
            s->pblocks[i] = (short *)(&s->block[(j++)]);
         }else{
            s->pblocks[i] = NULL;
         }
+        cbp+=cbp;
 //        printf("s->pblocks[%d]=%p ,s->block=%p cbp=%d\n",i,s->pblocks[i],s->block,cbp);
     }
 }
 
-static int calc_cbp(MpegEncContext *s, int blocknum){
-/* compute cbp */
-// for I420 bit_offset=5
-int  i,cbp = 0;
-    for(i=0; i<blocknum; i++) {
-        if(s->block_last_index[i] >= 0)
-            cbp |= 1 << (5 - i);
-    }
-    return cbp;
-}
-
-
-
 //these functions should be called on every new field or/and frame
 //They should be safe if they are called few times for same field!
 int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx){
@@ -121,7 +110,7 @@ xvmc_render_state_t * render,* last, * next;
             assert(last->state & MP_XVMC_STATE_PREDICTION);
             render->p_past_surface = last->p_surface;
             return 0;
-     }
+    }
 
 return -1;
 }
@@ -147,7 +136,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
 
     if(s->encoding){
         av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n");
-       av_abort();
+        return -1;
     }
 
    //from MPV_decode_mb(),
@@ -159,7 +148,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
     }
 
    //MC doesn't skip blocks
-    s->mb_skiped = 0;
+    s->mb_skipped = 0;
 
 
    // do I need to export quant when I could not perform postprocessing?
@@ -173,7 +162,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
     assert(render->mv_blocks);
 
     //take the next free macroblock
-    mv_block = &render->mv_blocks[render->start_mv_blocks_num + 
+    mv_block = &render->mv_blocks[render->start_mv_blocks_num +
                                    render->filled_mv_blocks_num ];
 
 // memset(mv_block,0,sizeof(XvMCMacroBlock));
@@ -256,17 +245,20 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
     }//!intra
 //time to handle data blocks;
     mv_block->index = render->next_free_data_block_num;
+
     blocks_per_mb = 6;
-/*
-    switch( s->chroma_format){
-        case CHROMA_422:
-            blocks_per_mb = 8;
-            break;
-        case CHROMA_444:
-            blocks_per_mb = 12;
-            break;
+    if( s->chroma_format >= 2){
+        blocks_per_mb = 4 + (1 << (s->chroma_format));
+    }
+
+//  calculate cbp
+    cbp = 0;
+    for(i=0; i<blocks_per_mb; i++) {
+        cbp+= cbp;
+        if(s->block_last_index[i] >= 0)
+            cbp++;
     }
-*/
+
     if(s->flags & CODEC_FLAG_GRAY){
         if(s->mb_intra){//intra frames are alwasy full chroma block
             for(i=4; i<blocks_per_mb; i++){
@@ -274,10 +266,11 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
                 if(!render->unsigned_intra)
                     s->pblocks[i][0] = 1<<10;
             }
-        }else
+        }else{
+            cbp&= 0xf << (blocks_per_mb - 4);
             blocks_per_mb = 4;//Luminance blocks only
+        }
     }
-    cbp = calc_cbp(s,blocks_per_mb);
     mv_block->coded_block_pattern = cbp;
     if(cbp == 0)
         mv_block->macroblock_type &= ~XVMC_MB_TYPE_PATTERN;
@@ -299,7 +292,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
 /*              if(s->pblocks[i] != &render->data_blocks[
                         (render->next_free_data_block_num)*64]){
                    printf("ERROR mb(%d,%d) s->pblocks[i]=%p data_block[]=%p\n",
-                   s->mb_x,s->mb_y, s->pblocks[i], 
+                   s->mb_x,s->mb_y, s->pblocks[i],
                    &render->data_blocks[(render->next_free_data_block_num)*64]);
                 }*/
             }