Merge pull request #5 from skibey/master

psb_video: refine VP8 Decoding API
intel · Apr 8, 2014 · 90d9485 · 90d9485
2 parents 2f61f04 + 8fe5053
commit 90d9485
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/tng_VP8.c b/src/tng_VP8.c
@@ -988,8 +988,8 @@ static void tng__VP8_set_slice_param(context_VP8_p ctx) {
     //ctx->cmd_header->ui32Cmd_AdditionalParams |= ((ctx->pic_params->partition_size[0] + ((ctx->pic_params->pic_fields.bits.key_frame == 0) ? 10 : 3)) & VP8_BUFFOFFSET_MASK) ;
     //ctx->cmd_header->ui32Cmd_AdditionalParams |= ((ctx->pic_params->num_of_partitions << VP8_PARTITIONSCOUNT_SHIFT) & VP8_PARTITIONSCOUNT_MASK) ; /* if the bistream is multistream */
 
-    (*ctx->dec_ctx.cmd_params) |= (ctx->slice_params->partition_size[0] & VP8_BUFFOFFSET_MASK);
-    (*ctx->dec_ctx.cmd_params) |= ((ctx->slice_params->num_of_partitions << VP8_PARTITIONSCOUNT_SHIFT) & VP8_PARTITIONSCOUNT_MASK) ; /* if the bistream is multistream */
+    (*ctx->dec_ctx.cmd_params) |= ((3 + ctx->slice_params->partition_size[0]) & VP8_BUFFOFFSET_MASK);
+    (*ctx->dec_ctx.cmd_params) |= (((ctx->slice_params->num_of_partitions - 1) << VP8_PARTITIONSCOUNT_SHIFT) & VP8_PARTITIONSCOUNT_MASK) ; /* if the bistream is multistream */
     // not used in fw ctx->cmd_header->ui32Cmd_AdditionalParams |= ((ctx->pic_params->frame_type << VP8_FRAMETYPE_SHIFT) & VP8_BUFFOFFSET_MASK) ;
 }
 
@@ -1011,7 +1011,7 @@ static void tng__VP8_FE_Registers_Write(context_VP8_p ctx) {
 
         REGIO_WRITE_FIELD_LITE(reg_value, MSVDX_VEC_VP8, CR_VEC_VP8_FE_PIC0, VP8_FE_FRAME_TYPE, (ctx->pic_params->pic_fields.bits.key_frame == 0)? 0 : 1 );
         REGIO_WRITE_FIELD_LITE(reg_value, MSVDX_VEC_VP8, CR_VEC_VP8_FE_PIC0, VP8_FE_UPDATE_SEGMENTATION_MAP, (ctx->pic_params->pic_fields.bits.update_mb_segmentation_map == 0 )? 0 : 1 );
-        REGIO_WRITE_FIELD_LITE(reg_value, MSVDX_VEC_VP8, CR_VEC_VP8_FE_PIC0, VP8_FE_NUM_PARTITION_MINUS1, ctx->slice_params->num_of_partitions - 1);
+        REGIO_WRITE_FIELD_LITE(reg_value, MSVDX_VEC_VP8, CR_VEC_VP8_FE_PIC0, VP8_FE_NUM_PARTITION_MINUS1, ctx->slice_params->num_of_partitions - 2);
 
        /* SEGMENTATION ID CONTROL */
        if(ctx->pic_params->pic_fields.bits.segmentation_enabled) {
@@ -1082,7 +1082,7 @@ static void tng__VP8_FE_Registers_Write(context_VP8_p ctx) {
        /* add the first partition offset */
        psb_cmdbuf_reg_start_block(cmdbuf, 0);
 
-       ctx->DCT_Base_Address_Offset = ctx->slice_params->partition_size[0] + 3 * (ctx->slice_params->num_of_partitions - 1) ;
+       ctx->DCT_Base_Address_Offset = (3 + ctx->slice_params->partition_size[0]) + 3 * (ctx->slice_params->num_of_partitions - 2) ;
        /* REGIO_WRITE_FIELD_LITE(reg_value, MSVDX_VEC_VP8, CR_VEC_VP8_FE_DCT_BASE_ADDRESS, VP8_FE_DCT_BASE_ADDRESS, ctx->DCT_Base_Address); */
        psb_cmdbuf_reg_set_address(cmdbuf, REGISTER_OFFSET (MSVDX_VEC_VP8, CR_VEC_VP8_FE_DCT_BASE_ADDRESS),
 				  ctx->dec_ctx.slice_data_buffer, ctx->DCT_Base_Address_Offset);