lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 14/15] media: vimc: cap: Add support for multiplanar formats
    Date
    Adapt vimc-capture to support multiplanar formats, copying
    each plane to the correct buffer.

    Signed-off-by: André Almeida <andrealmeid@collabora.com>
    ---
    Change in v2: none

    drivers/media/platform/vimc/vimc-capture.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
    index fae42b778711..f5bfb36a145c 100644
    --- a/drivers/media/platform/vimc/vimc-capture.c
    +++ b/drivers/media/platform/vimc/vimc-capture.c
    @@ -606,6 +606,8 @@ static struct vimc_frame *vimc_cap_process_frame(struct vimc_ent_device *ved,
    struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device,
    ved);
    struct vimc_cap_buffer *vimc_buf;
    + unsigned long plane_size;
    + unsigned int i;
    void *vbuf;

    spin_lock(&vcap->qlock);
    @@ -628,13 +630,17 @@ static struct vimc_frame *vimc_cap_process_frame(struct vimc_ent_device *ved,
    vimc_buf->vb2.sequence = vcap->sequence++;
    vimc_buf->vb2.field = vcap->format.fmt.pix.field;

    - vbuf = vb2_plane_vaddr(&vimc_buf->vb2.vb2_buf, 0);
    + /* For each plane, copy the pixels */
    + for (i = 0; i < vimc_buf->vb2.vb2_buf.num_planes; i++) {
    + vbuf = vb2_plane_vaddr(&vimc_buf->vb2.vb2_buf, i);
    + plane_size = frame->sizeimage[i];
    +
    + memcpy(vbuf, frame->plane_addr[i], plane_size);

    - memcpy(vbuf, frame->plane_addr[0], vcap->format.fmt.pix.sizeimage);
    + /* Set it as ready */
    + vb2_set_plane_payload(&vimc_buf->vb2.vb2_buf, i, plane_size);
    + }

    - /* Set it as ready */
    - vb2_set_plane_payload(&vimc_buf->vb2.vb2_buf, 0,
    - vcap->format.fmt.pix.sizeimage);
    vb2_buffer_done(&vimc_buf->vb2.vb2_buf, VB2_BUF_STATE_DONE);
    return NULL;
    }
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-03-27 16:20    [W:4.212 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site