lkml.org 
[lkml]   [2017]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2 5/6] [media] s5p-jpeg: Add support for resolution change event
From
Date
Hi Andrzej,

On 16/06/2017 17:38, Andrzej Pietrasiewicz wrote:
> Hi Thierry,
>
> Thank you for the patch.
>
> Can you give a use case for resolution change event?
Unfortunately, the original commit does not mention any clear use case.
I've asked to the patch author for more information.

> Also plase see inline.
>
> W dniu 12.06.2017 o 19:13, Thierry Escande pisze:
>> From: henryhsu <henryhsu@chromium.org>
>> @@ -1611,8 +1612,6 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx
>> *ct, struct v4l2_format *f)
>> FMT_TYPE_OUTPUT : FMT_TYPE_CAPTURE;
>> q_data->fmt = s5p_jpeg_find_format(ct, pix->pixelformat, f_type);
>> - q_data->w = pix->width;
>> - q_data->h = pix->height;
>> if (q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG) {
>> /*
>> * During encoding Exynos4x12 SoCs access wider memory area
>> @@ -1620,6 +1619,8 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx
>> *ct, struct v4l2_format *f)
>> * the JPEG_IMAGE_SIZE register. In order to avoid sysmmu
>> * page fault calculate proper buffer size in such a case.
>> */
>> + q_data->w = pix->width;
>> + q_data->h = pix->height;
>
> Is this change related to what the patch is supposed to be doing?
Yes actually. From the author comments to the same question:
"We want to send a resolution change in the first frame. Without this,
q_data->w and h will be updated by s_fmt. Then we won't know the
resolution is changed from (0, 0) to (w, h) in qbuf function."

>> static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
>> {
>> struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
>> @@ -2499,9 +2545,20 @@ static void s5p_jpeg_buf_queue(struct
>> vb2_buffer *vb)
>> if (ctx->mode == S5P_JPEG_DECODE &&
>> vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
>> - struct s5p_jpeg_q_data tmp, *q_data;
>> -
>> - ctx->hdr_parsed = s5p_jpeg_parse_hdr(&tmp,
>> + static const struct v4l2_event ev_src_ch = {
>> + .type = V4L2_EVENT_SOURCE_CHANGE,
>> + .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION,
>> + };
>> + struct vb2_queue *dst_vq;
>> + u32 ori_w;
>> + u32 ori_h;
>> +
>> + dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
>> + V4L2_BUF_TYPE_VIDEO_CAPTURE);
>> + ori_w = ctx->out_q.w;
>> + ori_h = ctx->out_q.h;
>> +
>> + ctx->hdr_parsed = s5p_jpeg_parse_hdr(&ctx->out_q,
>> (unsigned long)vb2_plane_vaddr(vb, 0),
>> min((unsigned long)ctx->out_q.size,
>> vb2_get_plane_payload(vb, 0)), ctx);
>> @@ -2510,43 +2567,18 @@ static void s5p_jpeg_buf_queue(struct
>> vb2_buffer *vb)
>> return;
>> }
>> - q_data = &ctx->out_q;
>> - q_data->w = tmp.w;
>> - q_data->h = tmp.h;
>> - q_data->sos = tmp.sos;
>> - memcpy(q_data->dht.marker, tmp.dht.marker,
>> - sizeof(tmp.dht.marker));
>> - memcpy(q_data->dht.len, tmp.dht.len, sizeof(tmp.dht.len));
>> - q_data->dht.n = tmp.dht.n;
>> - memcpy(q_data->dqt.marker, tmp.dqt.marker,
>> - sizeof(tmp.dqt.marker));
>> - memcpy(q_data->dqt.len, tmp.dqt.len, sizeof(tmp.dqt.len));
>> - q_data->dqt.n = tmp.dqt.n;
>> - q_data->sof = tmp.sof;
>> - q_data->sof_len = tmp.sof_len;
>> -
>> - q_data = &ctx->cap_q;
>> - q_data->w = tmp.w;
>> - q_data->h = tmp.h;
>
>
> Why is this part removed?
This has not been removed.
The &tmp s5p_jpeg_q_data struct was passed to s5p_jpeg_parse_hdr() and
then copied field-by-field into ctx->out_q (through q_data pointer).
With this change ctx->out_q is passed to s5p_jpeg_parse_hdr() and this
avoids the copy.
Then ctx->cap_q width & height copy is done in
s5p_jpeg_set_capture_queue_data().

Regards,
Thierry

\
 
 \ /
  Last update: 2017-06-19 15:51    [W:0.201 / U:0.852 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site