Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1848933ybl; Sat, 1 Feb 2020 07:39:21 -0800 (PST) X-Google-Smtp-Source: APXvYqzXaJJ/P0Z+ZgdxU/QYmWZYoshxKe4g68KPZPggPWmC87X3wdUzy2d3TYiAeLI1gBuadxha X-Received: by 2002:a05:6830:18c4:: with SMTP id v4mr11193297ote.265.1580571561369; Sat, 01 Feb 2020 07:39:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580571561; cv=none; d=google.com; s=arc-20160816; b=mm1WlHf4pq2/415Bueraqa/NIOC4HQOiw+iWN9isgNvWxJgLs6H/nGknH5mnyZFFi1 iB93I3VeOXVtYghRfiJykvghrFd1kbJux/1jcMgNw3m4CX83u9zZ+gRKGJF5TkSXkRF5 cpujU1zU1OwMvZBjbyuQsgCqaXHNGPeZVBjPNVdNID/6rKew/krc7h9Rj1CnAx2JvCmc G1S7LsfZQDaEkiSyeu6Scympv5DCyed03AQFStxF4yn3PQtmaQc4Uwuz99odZog/Msaa fxWdeEUR/TU1VZp2Mn+z7PlqI3IPL4+1L3ewM61r/4ROFRjaWWrB8mVLWsyFWFCtyfBJ PVoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature; bh=3kEK2XjtZG9+sMTSkooRTk52aEWFr6CfnNeISQKc/HM=; b=eyMKEdkjWDz+CTGAbZJk2dHzcCIhV5+Yerpou9vlrPKZUIwuWpiRroHpaOBRKZDz3/ biA9p1c/Y06SWZ4Z+XGJ9TRPsj/q4SGYqaMxMdS9NC7ItCFpu5ta3Q+zkM2zKxHCGwXc Amd15AJha+Is8qX6nOP8msqokDsrvxM6gX0vccBKNjv4mUsAYp4QanE+R1BXU5mYIyP+ ECBQ1A1slkNIQ+0NiBZFOqM/mJFfMaqxqs78OlATUdouX5t5KYI9IuxLw6+OTp22bVN8 SGIGafv2gHUM7wUzq57WnzW8ZtNYtf9fOTjkkY8tWmYoDht81s0CxZieZWvI52k18hHr 8HSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ndufresne-ca.20150623.gappssmtp.com header.s=20150623 header.b=rtclGkPX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k8si6527795otp.69.2020.02.01.07.39.09; Sat, 01 Feb 2020 07:39:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ndufresne-ca.20150623.gappssmtp.com header.s=20150623 header.b=rtclGkPX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727063AbgBAPiL (ORCPT + 99 others); Sat, 1 Feb 2020 10:38:11 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:36237 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbgBAPiL (ORCPT ); Sat, 1 Feb 2020 10:38:11 -0500 Received: by mail-qk1-f194.google.com with SMTP id w25so9815237qki.3 for ; Sat, 01 Feb 2020 07:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndufresne-ca.20150623.gappssmtp.com; s=20150623; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=3kEK2XjtZG9+sMTSkooRTk52aEWFr6CfnNeISQKc/HM=; b=rtclGkPXrcCLSmbYZXaT4dNrLsC+Dhp5/ws7T+fOXiaW5tp7zxcyILb2jwdGC0KI49 7E5QUPVPLp53VigLCKxJrktjrpxqg5shj2VzQZm9p/1g6L2DOnG0+Hfn8qNPXD8KZbMn tpkIsiHMN5/rf0D2xTJ78nowTeacrEHCIpM1Ge3AR9NFmtIabohqGUiblK84Za5R5768 7KzYRUhgY7kP1tgv5Fa0k7WssGZt27qk8vQrcUC+jZHgJPBzM9hD8W1V1YylOYFQVS4U cgLoRPiX/gJs4zJY6iCq9A1rEPTrvmL+XGg64CL+19wmczbyK+2Ymzw9jtc50J7zrcZf 6Lyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=3kEK2XjtZG9+sMTSkooRTk52aEWFr6CfnNeISQKc/HM=; b=aYgkBYczndp4oCuQAWo5NN4ghBB6lTjxcpNrsPqfXWMg9Cnt4zBb8h/asE51ODdJfS Ghwcbpn+8/576ynSTBsMigngWZLwvq5D784cvX2PatoMCgLJtaI3NLAOiJj6mnytc9uJ pXTSDeGK1tY7BFwrPgh75SciBPJ+Rms/FRjnL6PnvfAJQE4gVSQCa0NIxRIxJRyRhWNy 1evcsRDlEzW3DOTil579QEH0GA7GVBc073U3j4gXS/ZRwNrCvYdK53N6hx9s03lYRFcS H7cqm3KPqF9CJvBG/Rl7x9XZHRfwh+kRNOHBqn2lU9Zpu0jWi9fWI52NjI8tYh3rBiCQ vYfQ== X-Gm-Message-State: APjAAAV503ALaCqrMZ8CDYdzdkCzx5YmuXHMZrinRDUABOrqMyu0kI2s SFn3QYIsQfL0OFpAgOlnE4EUlQ== X-Received: by 2002:a05:620a:143a:: with SMTP id k26mr16354247qkj.450.1580571490198; Sat, 01 Feb 2020 07:38:10 -0800 (PST) Received: from skullcanyon ([192.222.193.21]) by smtp.gmail.com with ESMTPSA id e64sm6817326qtd.45.2020.02.01.07.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 07:38:09 -0800 (PST) Message-ID: <970b4e5b89db7f055217676a07281e37f6dcd35a.camel@ndufresne.ca> Subject: Re: [PATCH v4 0/4] media: meson: vdec: Add compliant H264 support From: Nicolas Dufresne To: Neil Armstrong , mchehab@kernel.org, hans.verkuil@cisco.com Cc: linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Date: Sat, 01 Feb 2020 10:38:08 -0500 In-Reply-To: <371bccfa68c4a9924137f087ef45c732e64bf808.camel@ndufresne.ca> References: <20200116133025.1903-1-narmstrong@baylibre.com> <371bccfa68c4a9924137f087ef45c732e64bf808.camel@ndufresne.ca> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.3 (3.34.3-1.fc31) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le samedi 01 février 2020 à 10:34 -0500, Nicolas Dufresne a écrit : > Le jeudi 16 janvier 2020 à 14:30 +0100, Neil Armstrong a écrit : > > Hello, > > > > This patch series aims to bring H.264 support as well as compliance update > > to the amlogic stateful video decoder driver. > > > > The issue in the V1 patchset at [1] is solved by patch #1 following comments > > and requirements from hans. It moves the full draining & stopped state tracking > > and handling from vicodec to core v4l2-mem2mem. > > > > The vicodec changes still passes the v4l2-utils "media-test" tests, log at [5]: > > [...] > > vicodec media controller compliance tests > > > > Thu Jan 16 13:00:56 UTC 2020 > > v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits > > [...] > > Summary: > > I've minimally tested this serie with GStreamer master. Play pause and > seek seems to work reliably now. It's a little bit spamy with > bbb_sunflower_1080p_30fps_normal.mp4: > > [ 725.304663] meson-vdec c8820000.video-codec: VIFIFO usage (16777763) > VIFIFO size (16777216) > > But there is no visual artifact or performance degradation. > > Tested-by: Nicolas Dufresne Sorry, I just notice that with kmssink, seek is broken. The kernel reports a series of: [ 1065.046970] meson-vdec c8820000.video-codec: Buffer 0 done but it doesn't exist in m2m_ctx > > > Total for vicodec device /dev/media3: 7, Succeeded: 7, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video13: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > Total for vicodec device /dev/video14: 51, Succeeded: 51, Failed: 0, Warnings: 0 > > > > Final Summary: 364, Succeeded: 364, Failed: 0, Warnings: 0 > > Thu Jan 16 13:02:59 UTC 2020 > > > > With this, it also passes vdec v4l2-compliance with H264 streaming on Amlogic G12A > > and Amlogic SM1 SoCs successfully. > > > > The compliance log is: > > # v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s > > v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits > > > > Compliance test for meson-vdec device /dev/video0: > > > > Driver Info: > > Driver name : meson-vdec > > Card type : Amlogic Video Decoder > > Bus info : platform:meson-vdec > > Driver version : 5.5.0 > > Capabilities : 0x84204000 > > Video Memory-to-Memory Multiplanar > > Streaming > > Extended Pix Format > > Device Capabilities > > Device Caps : 0x04204000 > > Video Memory-to-Memory Multiplanar > > Streaming > > Extended Pix Format > > Detected Stateful Decoder > > > > Required ioctls: > > test VIDIOC_QUERYCAP: OK > > > > Allow for multiple opens: > > test second /dev/video19 open: OK > > test VIDIOC_QUERYCAP: OK > > test VIDIOC_G/S_PRIORITY: OK > > test for unlimited opens: OK > > > > Debug ioctls: > > test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) > > test VIDIOC_LOG_STATUS: OK (Not Supported) > > > > Input ioctls: > > test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) > > test VIDIOC_G/S_FREQUENCY: OK (Not Supported) > > test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) > > test VIDIOC_ENUMAUDIO: OK (Not Supported) > > test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) > > test VIDIOC_G/S_AUDIO: OK (Not Supported) > > Inputs: 0 Audio Inputs: 0 Tuners: 0 > > > > Output ioctls: > > test VIDIOC_G/S_MODULATOR: OK (Not Supported) > > test VIDIOC_G/S_FREQUENCY: OK (Not Supported) > > test VIDIOC_ENUMAUDOUT: OK (Not Supported) > > test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) > > test VIDIOC_G/S_AUDOUT: OK (Not Supported) > > Outputs: 0 Audio Outputs: 0 Modulators: 0 > > > > Input/Output configuration ioctls: > > test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) > > test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) > > test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) > > test VIDIOC_G/S_EDID: OK (Not Supported) > > > > Control ioctls: > > test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK > > test VIDIOC_QUERYCTRL: OK > > test VIDIOC_G/S_CTRL: OK > > test VIDIOC_G/S/TRY_EXT_CTRLS: OK > > test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK > > test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) > > Standard Controls: 2 Private Controls: 0 > > > > Format ioctls: > > test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK > > test VIDIOC_G/S_PARM: OK (Not Supported) > > test VIDIOC_G_FBUF: OK (Not Supported) > > test VIDIOC_G_FMT: OK > > test VIDIOC_TRY_FMT: OK > > test VIDIOC_S_FMT: OK > > test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) > > test Cropping: OK (Not Supported) > > test Composing: OK (Not Supported) > > test Scaling: OK (Not Supported) > > > > Codec ioctls: > > test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) > > test VIDIOC_G_ENC_INDEX: OK (Not Supported) > > test VIDIOC_(TRY_)DECODER_CMD: OK > > > > Buffer ioctls: > > test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK > > test VIDIOC_EXPBUF: OK > > test Requests: OK (Not Supported) > > > > Test input 0: > > > > Streaming ioctls: > > test read/write: OK (Not Supported) > > test blocking wait: OK > > Video Capture Multiplanar: Captured 60 buffers > > test MMAP (select): OK > > Video Capture Multiplanar: Captured 60 buffers > > test MMAP (epoll): OK > > test USERPTR (select): OK (Not Supported) > > test DMABUF: Cannot test, specify --expbuf-device > > > > Total for meson-vdec device /dev/video0: 49, Succeeded: 49, Failed: 0, Warnings: 0 > > > > > > Changes since v3 at [3]: > > - Fixed vicodec compliance > > - Fixed vdec compliance with v4l2 state management > > - fixed doc errors for v4l2-mem2mem.h > > > > Changes since v2 at [2]: > > - Move full draining & stopped state tracking into core v4l2-mem2mem > > - Adapt vicodec to use the core v4l2-mem2mem draining & stopped state tracking > > > > Changes since v1 at [1]: > > - fixed output_size is never used reported by hans > > - rebased on G12A and SM1 patches > > - added handling of qbuf after STREAMON and STOP before enought buffer queued > > > > [1] https://lore.kernel.org/linux-media/20191007145909.29979-1-mjourdan@baylibre.com > > [2] https://lore.kernel.org/linux-media/20191126093733.32404-1-narmstrong@baylibre.com > > [3] https://lore.kernel.org/linux-media/20191209122028.13714-1-narmstrong@baylibre.com > > [4] https://people.freedesktop.org/~narmstrong/vicodec-compliance-7ead0e1856b89f2e19369af452bb03fd0cd16793-20200116.log > > > > Maxime Jourdan (2): > > media: meson: vdec: bring up to compliance > > media: meson: vdec: add H.264 decoding support > > > > Neil Armstrong (2): > > media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last > > states > > media: vicodec: use v4l2-mem2mem draining, stopped and > > next-buf-is-last states handling > > > > drivers/media/platform/vicodec/vicodec-core.c | 162 ++---- > > drivers/media/v4l2-core/v4l2-mem2mem.c | 172 ++++++- > > drivers/staging/media/meson/vdec/Makefile | 2 +- > > drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ > > drivers/staging/media/meson/vdec/codec_h264.h | 14 + > > drivers/staging/media/meson/vdec/esparser.c | 58 +-- > > drivers/staging/media/meson/vdec/vdec.c | 89 ++-- > > drivers/staging/media/meson/vdec/vdec.h | 14 +- > > .../staging/media/meson/vdec/vdec_helpers.c | 85 ++- > > .../staging/media/meson/vdec/vdec_helpers.h | 6 +- > > .../staging/media/meson/vdec/vdec_platform.c | 71 +++ > > include/media/v4l2-mem2mem.h | 95 ++++ > > 12 files changed, 1021 insertions(+), 229 deletions(-) > > create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c > > create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h > >