From: Nicolas Dufresne <nicolas.dufresne@collabora.com> To: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>, Philipp Zabel <p.zabel@pengutronix.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke <sebastian.fricke@collabora.com>, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 24/24] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Date: Tue, 26 Apr 2022 08:57:50 -0400 [thread overview] Message-ID: <20220426125751.108293-25-nicolas.dufresne@collabora.com> (raw) In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> This is needed to optimize field decoding. Each field will be decoded into the same capture buffer. To be able to queue multiple buffers, we need to be able to ask the driver to hold the capture buffer. Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- drivers/staging/media/hantro/hantro_v4l2.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c index 67148ba346f5..50d636678ff3 100644 --- a/drivers/staging/media/hantro/hantro_v4l2.c +++ b/drivers/staging/media/hantro/hantro_v4l2.c @@ -409,6 +409,30 @@ hantro_update_requires_request(struct hantro_ctx *ctx, u32 fourcc) } } +static void +hantro_update_requires_hold_capture_buf(struct hantro_ctx *ctx, u32 fourcc) +{ + struct vb2_queue *vq; + + vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, + V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); + + switch (fourcc) { + case V4L2_PIX_FMT_JPEG: + case V4L2_PIX_FMT_MPEG2_SLICE: + case V4L2_PIX_FMT_VP8_FRAME: + case V4L2_PIX_FMT_HEVC_SLICE: + case V4L2_PIX_FMT_VP9_FRAME: + vq->subsystem_flags &= ~(VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF); + break; + case V4L2_PIX_FMT_H264_SLICE: + vq->subsystem_flags |= VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF; + break; + default: + break; + } +} + static int hantro_set_fmt_out(struct hantro_ctx *ctx, struct v4l2_pix_format_mplane *pix_mp) { @@ -472,6 +496,7 @@ static int hantro_set_fmt_out(struct hantro_ctx *ctx, ctx->dst_fmt.quantization = pix_mp->quantization; hantro_update_requires_request(ctx, pix_mp->pixelformat); + hantro_update_requires_hold_capture_buf(ctx, pix_mp->pixelformat); vpu_debug(0, "OUTPUT codec mode: %d\n", ctx->vpu_src_fmt->codec_mode); vpu_debug(0, "fmt - w: %d, h: %d\n", -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Dufresne <nicolas.dufresne@collabora.com> To: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>, Philipp Zabel <p.zabel@pengutronix.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke <sebastian.fricke@collabora.com>, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 24/24] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Date: Tue, 26 Apr 2022 08:57:50 -0400 [thread overview] Message-ID: <20220426125751.108293-25-nicolas.dufresne@collabora.com> (raw) In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> This is needed to optimize field decoding. Each field will be decoded into the same capture buffer. To be able to queue multiple buffers, we need to be able to ask the driver to hold the capture buffer. Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- drivers/staging/media/hantro/hantro_v4l2.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c index 67148ba346f5..50d636678ff3 100644 --- a/drivers/staging/media/hantro/hantro_v4l2.c +++ b/drivers/staging/media/hantro/hantro_v4l2.c @@ -409,6 +409,30 @@ hantro_update_requires_request(struct hantro_ctx *ctx, u32 fourcc) } } +static void +hantro_update_requires_hold_capture_buf(struct hantro_ctx *ctx, u32 fourcc) +{ + struct vb2_queue *vq; + + vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, + V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); + + switch (fourcc) { + case V4L2_PIX_FMT_JPEG: + case V4L2_PIX_FMT_MPEG2_SLICE: + case V4L2_PIX_FMT_VP8_FRAME: + case V4L2_PIX_FMT_HEVC_SLICE: + case V4L2_PIX_FMT_VP9_FRAME: + vq->subsystem_flags &= ~(VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF); + break; + case V4L2_PIX_FMT_H264_SLICE: + vq->subsystem_flags |= VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF; + break; + default: + break; + } +} + static int hantro_set_fmt_out(struct hantro_ctx *ctx, struct v4l2_pix_format_mplane *pix_mp) { @@ -472,6 +496,7 @@ static int hantro_set_fmt_out(struct hantro_ctx *ctx, ctx->dst_fmt.quantization = pix_mp->quantization; hantro_update_requires_request(ctx, pix_mp->pixelformat); + hantro_update_requires_hold_capture_buf(ctx, pix_mp->pixelformat); vpu_debug(0, "OUTPUT codec mode: %d\n", ctx->vpu_src_fmt->codec_mode); vpu_debug(0, "fmt - w: %d, h: %d\n", -- 2.34.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-04-26 12:58 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-26 12:57 [PATCH v4 00/24] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 01/24] media: doc: Document dual use of H.264 pic_num/frame_num Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 02/24] media: v4l2-mem2mem: Trace on implicit un-hold Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 03/24] media: videobuf2-v4l2: Warn on holding buffers without support Nicolas Dufresne 2022-04-27 4:31 ` Tomasz Figa 2022-04-27 15:08 ` Nicolas Dufresne 2022-04-28 6:12 ` Hans Verkuil 2022-04-28 13:09 ` Nicolas Dufresne 2022-11-24 8:57 ` Hans Verkuil 2022-04-26 12:57 ` [PATCH v4 04/24] media: h264: Avoid wrapping long_term_frame_idx Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 05/24] media: h264: Use v4l2_h264_reference for reflist Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-05-05 0:42 ` Dmitry Osipenko 2022-05-05 0:42 ` Dmitry Osipenko 2022-05-05 0:42 ` Dmitry Osipenko 2022-05-05 0:42 ` Dmitry Osipenko 2022-04-26 12:57 ` [PATCH v4 06/24] media: h264: Increase reference lists size to 32 Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 07/24] media: h264: Store current picture fields Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 08/24] media: h264: Store all fields into the unordered list Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 09/24] media: v4l2: Trace calculated p/b0/b1 initial reflist Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 10/24] media: h264: Sort p/b reflist using frame_num Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 11/24] media: v4l2: Reorder field reflist Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 12/24] media: rkvdec: Stop overclocking the decoder Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 13/24] media: rkvdec: h264: Fix dpb_valid implementation Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 14/24] media: rkvdec: h264: Fix bit depth wrap in pps packet Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 15/24] media: rkvdec: Move H264 SPS validation in rkvdec-h264 Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 16/24] media: rkvdec: h264: Validate and use pic width and height in mbs Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 17/24] media: rkvdec: h264: Fix reference frame_num wrap for second field Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 18/24] media: rkvdec: Ensure decoded resolution fit coded resolution Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 19/24] media: rkvdec-h264: Add field decoding support Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 20/24] media: rkvdec: Enable capture buffer holding for H264 Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 21/24] media: hantro: Stop using H.264 parameter pic_num Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 22/24] media: hantro: h264: Make dpb entry management more robust Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-26 12:57 ` [PATCH v4 23/24] media: hantro: Add H.264 field decoding support Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne 2022-04-28 8:50 ` Hans Verkuil 2022-04-28 8:50 ` Hans Verkuil 2022-04-28 13:10 ` Nicolas Dufresne 2022-04-28 13:10 ` Nicolas Dufresne 2022-04-26 12:57 ` Nicolas Dufresne [this message] 2022-04-26 12:57 ` [PATCH v4 24/24] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Nicolas Dufresne
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220426125751.108293-25-nicolas.dufresne@collabora.com \ --to=nicolas.dufresne@collabora.com \ --cc=ezequiel@vanguardiasur.com.ar \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-staging@lists.linux.dev \ --cc=mchehab@kernel.org \ --cc=nicolas@ndufresne.ca \ --cc=p.zabel@pengutronix.de \ --cc=sebastian.fricke@collabora.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.