|
@@ -378,7 +378,7 @@ static int s5p_mfc_set_dec_stream_buffer_v5(struct s5p_mfc_ctx *ctx,
|
|
/* Set decoding frame buffer */
|
|
/* Set decoding frame buffer */
|
|
static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
|
|
static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
|
|
{
|
|
{
|
|
- unsigned int frame_size, i;
|
|
|
|
|
|
+ unsigned int frame_size_lu, i;
|
|
unsigned int frame_size_ch, frame_size_mv;
|
|
unsigned int frame_size_ch, frame_size_mv;
|
|
struct s5p_mfc_dev *dev = ctx->dev;
|
|
struct s5p_mfc_dev *dev = ctx->dev;
|
|
unsigned int dpb;
|
|
unsigned int dpb;
|
|
@@ -466,10 +466,10 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
|
|
ctx->codec_mode);
|
|
ctx->codec_mode);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
- frame_size = ctx->luma_size;
|
|
|
|
|
|
+ frame_size_lu = ctx->luma_size;
|
|
frame_size_ch = ctx->chroma_size;
|
|
frame_size_ch = ctx->chroma_size;
|
|
frame_size_mv = ctx->mv_size;
|
|
frame_size_mv = ctx->mv_size;
|
|
- mfc_debug(2, "Frm size: %d ch: %d mv: %d\n", frame_size, frame_size_ch,
|
|
|
|
|
|
+ mfc_debug(2, "Frm size: %d ch: %d mv: %d\n", frame_size_lu, frame_size_ch,
|
|
frame_size_mv);
|
|
frame_size_mv);
|
|
for (i = 0; i < ctx->total_dpb_count; i++) {
|
|
for (i = 0; i < ctx->total_dpb_count; i++) {
|
|
/* Bank2 */
|
|
/* Bank2 */
|
|
@@ -497,7 +497,7 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
|
|
mfc_debug(2, "Not enough memory has been allocated\n");
|
|
mfc_debug(2, "Not enough memory has been allocated\n");
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
- s5p_mfc_write_info_v5(ctx, frame_size, ALLOC_LUMA_DPB_SIZE);
|
|
|
|
|
|
+ s5p_mfc_write_info_v5(ctx, frame_size_lu, ALLOC_LUMA_DPB_SIZE);
|
|
s5p_mfc_write_info_v5(ctx, frame_size_ch, ALLOC_CHROMA_DPB_SIZE);
|
|
s5p_mfc_write_info_v5(ctx, frame_size_ch, ALLOC_CHROMA_DPB_SIZE);
|
|
if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC)
|
|
if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC)
|
|
s5p_mfc_write_info_v5(ctx, frame_size_mv, ALLOC_MV_SIZE);
|
|
s5p_mfc_write_info_v5(ctx, frame_size_mv, ALLOC_MV_SIZE);
|