Message ID | 20211117130635.11633-8-dafna.hirschfeld@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | media: mtk-vcodec: few fixes | expand |
Just noticed the headline typo: meida -> media cheers, Nicolas Le mercredi 17 novembre 2021 à 15:06 +0200, Dafna Hirschfeld a écrit : > The prarameter bs_size to function vpu_enc_encode > is not used. Remove it. > > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > --- > drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +++------ > drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +-- > drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 - > drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 - > 4 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > index b6a4f2074fa5..bf03888a824f 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > @@ -367,8 +367,7 @@ static int h264_encode_sps(struct venc_h264_inst *inst, > > mtk_vcodec_debug_enter(inst); > > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, > - bs_buf, bs_size, NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, bs_buf, NULL); > if (ret) > return ret; > > @@ -394,8 +393,7 @@ static int h264_encode_pps(struct venc_h264_inst *inst, > > mtk_vcodec_debug_enter(inst); > > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, > - bs_buf, bs_size, NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, bs_buf, NULL); > if (ret) > return ret; > > @@ -451,8 +449,7 @@ static int h264_encode_frame(struct venc_h264_inst *inst, > mtk_vcodec_debug(inst, "frm_count = %d,skip_frm_count =%d,frm_type=%d.\n", > frame_info.frm_count, frame_info.skip_frm_count, > frame_info.frm_type); > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, > - bs_buf, bs_size, &frame_info); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, bs_buf, &frame_info); > if (ret) > return ret; > > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > index 8267a9c4fd25..6b66957d5192 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > @@ -302,8 +302,7 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst, > > mtk_vcodec_debug(inst, "->frm_cnt=%d", inst->frm_cnt); > > - ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size, > - NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, NULL); > if (ret) > return ret; > > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > index be6d8790a41e..e7899d8a3e4e 100644 > --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > @@ -225,7 +225,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, > int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, > struct venc_frm_buf *frm_buf, > struct mtk_vcodec_mem *bs_buf, > - unsigned int *bs_size, > struct venc_frame_info *frame_info) > { > const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx); > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > index f9be9cab7ff7..f83bc1b3f2bf 100644 > --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > @@ -45,7 +45,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, > int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, > struct venc_frm_buf *frm_buf, > struct mtk_vcodec_mem *bs_buf, > - unsigned int *bs_size, > struct venc_frame_info *frame_info); > int vpu_enc_deinit(struct venc_vpu_inst *vpu); >
On Wed, Nov 17, 2021 at 10:07 PM Dafna Hirschfeld <dafna.hirschfeld@collabora.com> wrote: > > The prarameter bs_size to function vpu_enc_encode > is not used. Remove it. > > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Indeed, it's an output parameter of the calling functions and has no business being passed to vpu_enc_encode. With the typo in the headline fixed, Reviewed-by: Alexandre Courbot <acourbot@chromium.org> > --- > drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +++------ > drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +-- > drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 - > drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 - > 4 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > index b6a4f2074fa5..bf03888a824f 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > @@ -367,8 +367,7 @@ static int h264_encode_sps(struct venc_h264_inst *inst, > > mtk_vcodec_debug_enter(inst); > > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, > - bs_buf, bs_size, NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, bs_buf, NULL); > if (ret) > return ret; > > @@ -394,8 +393,7 @@ static int h264_encode_pps(struct venc_h264_inst *inst, > > mtk_vcodec_debug_enter(inst); > > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, > - bs_buf, bs_size, NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, bs_buf, NULL); > if (ret) > return ret; > > @@ -451,8 +449,7 @@ static int h264_encode_frame(struct venc_h264_inst *inst, > mtk_vcodec_debug(inst, "frm_count = %d,skip_frm_count =%d,frm_type=%d.\n", > frame_info.frm_count, frame_info.skip_frm_count, > frame_info.frm_type); > - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, > - bs_buf, bs_size, &frame_info); > + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, bs_buf, &frame_info); > if (ret) > return ret; > > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > index 8267a9c4fd25..6b66957d5192 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c > @@ -302,8 +302,7 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst, > > mtk_vcodec_debug(inst, "->frm_cnt=%d", inst->frm_cnt); > > - ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size, > - NULL); > + ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, NULL); > if (ret) > return ret; > > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > index be6d8790a41e..e7899d8a3e4e 100644 > --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c > @@ -225,7 +225,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, > int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, > struct venc_frm_buf *frm_buf, > struct mtk_vcodec_mem *bs_buf, > - unsigned int *bs_size, > struct venc_frame_info *frame_info) > { > const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx); > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > index f9be9cab7ff7..f83bc1b3f2bf 100644 > --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h > @@ -45,7 +45,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, > int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, > struct venc_frm_buf *frm_buf, > struct mtk_vcodec_mem *bs_buf, > - unsigned int *bs_size, > struct venc_frame_info *frame_info); > int vpu_enc_deinit(struct venc_vpu_inst *vpu); > > -- > 2.17.1 >
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c index b6a4f2074fa5..bf03888a824f 100644 --- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c @@ -367,8 +367,7 @@ static int h264_encode_sps(struct venc_h264_inst *inst, mtk_vcodec_debug_enter(inst); - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, - bs_buf, bs_size, NULL); + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, bs_buf, NULL); if (ret) return ret; @@ -394,8 +393,7 @@ static int h264_encode_pps(struct venc_h264_inst *inst, mtk_vcodec_debug_enter(inst); - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, - bs_buf, bs_size, NULL); + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, bs_buf, NULL); if (ret) return ret; @@ -451,8 +449,7 @@ static int h264_encode_frame(struct venc_h264_inst *inst, mtk_vcodec_debug(inst, "frm_count = %d,skip_frm_count =%d,frm_type=%d.\n", frame_info.frm_count, frame_info.skip_frm_count, frame_info.frm_type); - ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, - bs_buf, bs_size, &frame_info); + ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, bs_buf, &frame_info); if (ret) return ret; diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c index 8267a9c4fd25..6b66957d5192 100644 --- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c @@ -302,8 +302,7 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst, mtk_vcodec_debug(inst, "->frm_cnt=%d", inst->frm_cnt); - ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size, - NULL); + ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, NULL); if (ret) return ret; diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c index be6d8790a41e..e7899d8a3e4e 100644 --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c @@ -225,7 +225,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, struct venc_frm_buf *frm_buf, struct mtk_vcodec_mem *bs_buf, - unsigned int *bs_size, struct venc_frame_info *frame_info) { const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx); diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h index f9be9cab7ff7..f83bc1b3f2bf 100644 --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h @@ -45,7 +45,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu, int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode, struct venc_frm_buf *frm_buf, struct mtk_vcodec_mem *bs_buf, - unsigned int *bs_size, struct venc_frame_info *frame_info); int vpu_enc_deinit(struct venc_vpu_inst *vpu);
The prarameter bs_size to function vpu_enc_encode is not used. Remove it. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +++------ drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +-- drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 - drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 - 4 files changed, 4 insertions(+), 10 deletions(-)