diff options
author | Zhaowei Yuan <zhaowei.yuan@samsung.com> | 2014-09-03 22:28:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-26 05:47:46 -0400 |
commit | 9aee8b80a8facefb29ad0077fdbcca116f25f6e6 (patch) | |
tree | 79db5ff6d48372cb6d7c7a89a3e92c5b157ddd08 /drivers/media/platform | |
parent | 00684dab287956573122815bfdc04cb4b4561033 (diff) |
[media] s5p_mfc: unify variable naming style
Variable frame_size represents the size of plane luminance
here, not just frame size, its naming style should be unified
as frame_size_ch and frame_size_mv.
Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c index f88290556e2a..96ac14e2fc6e 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | |||
@@ -378,7 +378,7 @@ static int s5p_mfc_set_dec_stream_buffer_v5(struct s5p_mfc_ctx *ctx, | |||
378 | /* Set decoding frame buffer */ | 378 | /* Set decoding frame buffer */ |
379 | static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx) | 379 | static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx) |
380 | { | 380 | { |
381 | unsigned int frame_size, i; | 381 | unsigned int frame_size_lu, i; |
382 | unsigned int frame_size_ch, frame_size_mv; | 382 | unsigned int frame_size_ch, frame_size_mv; |
383 | struct s5p_mfc_dev *dev = ctx->dev; | 383 | struct s5p_mfc_dev *dev = ctx->dev; |
384 | unsigned int dpb; | 384 | unsigned int dpb; |
@@ -466,10 +466,10 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx) | |||
466 | ctx->codec_mode); | 466 | ctx->codec_mode); |
467 | return -EINVAL; | 467 | return -EINVAL; |
468 | } | 468 | } |
469 | frame_size = ctx->luma_size; | 469 | frame_size_lu = ctx->luma_size; |
470 | frame_size_ch = ctx->chroma_size; | 470 | frame_size_ch = ctx->chroma_size; |
471 | frame_size_mv = ctx->mv_size; | 471 | frame_size_mv = ctx->mv_size; |
472 | mfc_debug(2, "Frm size: %d ch: %d mv: %d\n", frame_size, frame_size_ch, | 472 | mfc_debug(2, "Frm size: %d ch: %d mv: %d\n", frame_size_lu, frame_size_ch, |
473 | frame_size_mv); | 473 | frame_size_mv); |
474 | for (i = 0; i < ctx->total_dpb_count; i++) { | 474 | for (i = 0; i < ctx->total_dpb_count; i++) { |
475 | /* Bank2 */ | 475 | /* Bank2 */ |
@@ -497,7 +497,7 @@ static int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx) | |||
497 | mfc_debug(2, "Not enough memory has been allocated\n"); | 497 | mfc_debug(2, "Not enough memory has been allocated\n"); |
498 | return -ENOMEM; | 498 | return -ENOMEM; |
499 | } | 499 | } |
500 | s5p_mfc_write_info_v5(ctx, frame_size, ALLOC_LUMA_DPB_SIZE); | 500 | s5p_mfc_write_info_v5(ctx, frame_size_lu, ALLOC_LUMA_DPB_SIZE); |
501 | s5p_mfc_write_info_v5(ctx, frame_size_ch, ALLOC_CHROMA_DPB_SIZE); | 501 | s5p_mfc_write_info_v5(ctx, frame_size_ch, ALLOC_CHROMA_DPB_SIZE); |
502 | if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC) | 502 | if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC) |
503 | s5p_mfc_write_info_v5(ctx, frame_size_mv, ALLOC_MV_SIZE); | 503 | s5p_mfc_write_info_v5(ctx, frame_size_mv, ALLOC_MV_SIZE); |