From: Dafna Hirschfeld <dafna3@gmail.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, helen.koike@collabora.com,
Dafna Hirschfeld <dafna3@gmail.com>
Subject: [PATCH v5 11/21] media: vicodec: add field 'buf' to fwht_raw_frame
Date: Tue, 26 Feb 2019 09:05:04 -0800 [thread overview]
Message-ID: <20190226170514.86127-12-dafna3@gmail.com> (raw)
In-Reply-To: <20190226170514.86127-1-dafna3@gmail.com>
Add the field 'buf' to fwht_raw_frame to indicate
the start of the raw frame buffer.
This field will be used to copy the capture buffer
to the reference buffer in the next patch.
Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
---
drivers/media/platform/vicodec/codec-fwht.h | 1 +
drivers/media/platform/vicodec/vicodec-core.c | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/vicodec/codec-fwht.h b/drivers/media/platform/vicodec/codec-fwht.h
index c410512d47c5..8f0b790839f8 100644
--- a/drivers/media/platform/vicodec/codec-fwht.h
+++ b/drivers/media/platform/vicodec/codec-fwht.h
@@ -124,6 +124,7 @@ struct fwht_raw_frame {
unsigned int luma_alpha_step;
unsigned int chroma_step;
unsigned int components_num;
+ u8 *buf;
u8 *luma, *cb, *cr, *alpha;
};
diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 8128ea6d1948..42af0e922249 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -1352,7 +1352,8 @@ static int vicodec_start_streaming(struct vb2_queue *q,
state->stride = q_data->coded_width *
info->bytesperline_mult;
- state->ref_frame.luma = kvmalloc(total_planes_size, GFP_KERNEL);
+ state->ref_frame.buf = kvmalloc(total_planes_size, GFP_KERNEL);
+ state->ref_frame.luma = state->ref_frame.buf;
ctx->comp_max_size = total_planes_size;
new_comp_frame = kvmalloc(ctx->comp_max_size, GFP_KERNEL);
@@ -1401,7 +1402,9 @@ static void vicodec_stop_streaming(struct vb2_queue *q)
if ((!V4L2_TYPE_IS_OUTPUT(q->type) && !ctx->is_enc) ||
(V4L2_TYPE_IS_OUTPUT(q->type) && ctx->is_enc)) {
- kvfree(ctx->state.ref_frame.luma);
+ kvfree(ctx->state.ref_frame.buf);
+ ctx->state.ref_frame.buf = NULL;
+ ctx->state.ref_frame.luma = NULL;
ctx->comp_max_size = 0;
ctx->source_changed = false;
}
--
2.17.1
next prev parent reply other threads:[~2019-02-26 17:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 17:04 [PATCH v5 00/21] add support to stateless decoder Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 01/21] vb2: add requires_requests bit for stateless codecs Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 02/21] videodev2.h: add V4L2_BUF_CAP_REQUIRES_REQUESTS Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 03/21] cedrus: set requires_requests Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 04/21] media: vicodec: selection api should only check single buffer types Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 05/21] media: vicodec: upon release, call m2m release before freeing ctrl handler Dafna Hirschfeld
2019-02-26 17:04 ` [PATCH v5 06/21] media: v4l2-ctrl: v4l2_ctrl_request_setup returns with error upon failure Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 07/21] media: vicodec: change variable name for the return value of v4l2_fwht_encode Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 08/21] media: vicodec: bugfix - call v4l2_m2m_buf_copy_metadata also if decoding fails Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 09/21] media: vicodec: bugfix: free compressed_frame upon device release Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 10/21] media: vicodec: Move raw frame preparation code to a function Dafna Hirschfeld
2019-02-26 17:05 ` Dafna Hirschfeld [this message]
2019-02-26 17:05 ` [PATCH v5 12/21] media: vicodec: keep the ref frame according to the format in decoder Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 13/21] media: vicodec: Validate version dependent header values in a separate function Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 14/21] media: vicodec: rename v4l2_fwht_default_fmt to v4l2_fwht_find_nth_fmt Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 15/21] media: vicodec: add struct for encoder/decoder instance Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 16/21] media: vicodec: add documentation to V4L2_CID_FWHT_I/P_FRAME_QP Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 17/21] media: vicodec: add documentation to V4L2_CID_MPEG_VIDEO_FWHT_PARAMS Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 18/21] media: vicodec: add documentation to V4L2_PIX_FMT_FWHT_STATELESS Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 19/21] media: vicodec: Introducing stateless fwht defs and structs Dafna Hirschfeld
2019-02-27 16:21 ` kbuild test robot
2019-02-26 17:05 ` [PATCH v5 20/21] media: vicodec: Register another node for stateless decoder Dafna Hirschfeld
2019-02-26 17:05 ` [PATCH v5 21/21] media: vicodec: Add support " Dafna Hirschfeld
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=20190226170514.86127-12-dafna3@gmail.com \
--to=dafna3@gmail.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox