diff mbox series

media: mediatek: vcodec: Only apply 4K frame sizes on decoder formats

Message ID 20230422103905.1995271-1-treapking@chromium.org
State Accepted
Commit ed17f89e9502f03af493e130620a9bb74c07cf28
Headers show
Series media: mediatek: vcodec: Only apply 4K frame sizes on decoder formats | expand

Commit Message

Pin-yen Lin April 22, 2023, 10:39 a.m. UTC
When VCODEC_CAPABILITY_4K_DISABLED is not set in dec_capability, skip
formats that are not MTK_FMT_DEC so only decoder formats is updated in
mtk_init_vdec_params.

Fixes: e25528e1dbe5 ("media: mediatek: vcodec: Use 4K frame size when supported by stateful decoder")
Signed-off-by: Pin-yen Lin <treapking@chromium.org>
---

 .../media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c   | 3 +++
 1 file changed, 3 insertions(+)

Comments

Chen-Yu Tsai April 25, 2023, 6:38 a.m. UTC | #1
On Sat, Apr 22, 2023 at 6:39 PM Pin-yen Lin <treapking@chromium.org> wrote:
>
> When VCODEC_CAPABILITY_4K_DISABLED is not set in dec_capability, skip
> formats that are not MTK_FMT_DEC so only decoder formats is updated in
> mtk_init_vdec_params.
>
> Fixes: e25528e1dbe5 ("media: mediatek: vcodec: Use 4K frame size when supported by stateful decoder")
> Signed-off-by: Pin-yen Lin <treapking@chromium.org>

Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>

> ---
>
>  .../media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c   | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> index 29991551cf61..0fbd030026c7 100644
> --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> @@ -584,6 +584,9 @@ static void mtk_init_vdec_params(struct mtk_vcodec_ctx *ctx)
>
>         if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED)) {
>                 for (i = 0; i < num_supported_formats; i++) {
> +                       if (mtk_video_formats[i].type != MTK_FMT_DEC)
> +                               continue;
> +
>                         mtk_video_formats[i].frmsize.max_width =
>                                 VCODEC_DEC_4K_CODED_WIDTH;
>                         mtk_video_formats[i].frmsize.max_height =
> --
> 2.40.0.634.g4ca3ef3211-goog
>
Yunfei Dong (董云飞) April 25, 2023, 11:29 a.m. UTC | #2
On Sat, 2023-04-22 at 18:39 +0800, Pin-yen Lin wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> When VCODEC_CAPABILITY_4K_DISABLED is not set in dec_capability, skip
> formats that are not MTK_FMT_DEC so only decoder formats is updated
> in
> mtk_init_vdec_params.
> 
> Fixes: e25528e1dbe5 ("media: mediatek: vcodec: Use 4K frame size when
> supported by stateful decoder")
> Signed-off-by: Pin-yen Lin <treapking@chromium.org>
> ---
> 
Reviewed-by: Yunfei Dong <yunfei.dong@mediatek.com>
>  .../media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c   | 3
> +++
>  1 file changed, 3 insertions(+)
> 
> diff --git
> a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> index 29991551cf61..0fbd030026c7 100644
> ---
> a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> +++
> b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
> @@ -584,6 +584,9 @@ static void mtk_init_vdec_params(struct
> mtk_vcodec_ctx *ctx)
> 
>         if (!(ctx->dev->dec_capability &
> VCODEC_CAPABILITY_4K_DISABLED)) {
>                 for (i = 0; i < num_supported_formats; i++) {
> +                       if (mtk_video_formats[i].type != MTK_FMT_DEC)
> +                               continue;
> +
>                         mtk_video_formats[i].frmsize.max_width =
>                                 VCODEC_DEC_4K_CODED_WIDTH;
>                         mtk_video_formats[i].frmsize.max_height =
> --
> 2.40.0.634.g4ca3ef3211-goog
>
diff mbox series

Patch

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
index 29991551cf61..0fbd030026c7 100644
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c
@@ -584,6 +584,9 @@  static void mtk_init_vdec_params(struct mtk_vcodec_ctx *ctx)
 
 	if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED)) {
 		for (i = 0; i < num_supported_formats; i++) {
+			if (mtk_video_formats[i].type != MTK_FMT_DEC)
+				continue;
+
 			mtk_video_formats[i].frmsize.max_width =
 				VCODEC_DEC_4K_CODED_WIDTH;
 			mtk_video_formats[i].frmsize.max_height =