Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1846562ybl; Sat, 1 Feb 2020 07:36:08 -0800 (PST) X-Google-Smtp-Source: APXvYqykns1u0ikCewNrgYK6PInJd9HvkNz+ydepJRbcFGptFKFwEr5Uetj4bEmzlJm/suxe4Vmz X-Received: by 2002:aca:d4c1:: with SMTP id l184mr9812845oig.172.1580571368520; Sat, 01 Feb 2020 07:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580571368; cv=none; d=google.com; s=arc-20160816; b=e3YNoTpJpgTUW38mImNTjRjOzXyVpRshc56fBwbFa0i5XYo1UbgATJjN9n76J37Et0 m8bbV2gzhisAI4l+B94JXyUVq3vW2PF5KO1AIZ7RU8lA6OC5g8ASRKnGDjy6mPE/kwZR sE+iaoOphY1ndnnPQpWCTST5+EdjOgUTFRnzNtPZZBRs6vKafxjN4GfeNXFIFkgQsUp2 Z3chOtvqgm1e6hkZPTltWJhbPqVQ6nq0631e03H8UVlTraGLTSafcQwH/sC9fF699UBp 1CZ+O6MT4onXMRNL+IoMlfDdohk17iGK962+y+6l4hdvYJdj8NNoO3TTShKwUGCCxNF5 OlGw== 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=wAyXNl606tjgDk9/MADAdf/nIELswBsElmeCFUMnvTY=; b=NQweqCELiTuDHVQH6hU6aeoGt2+67m3yJrDYZArfOew6yqb/cuWEap+BJvRD/fth14 saweN/zRu3cHEnDoPvV6LjSIjR7s9rKSDDtD1CWq+P3pA8dvXxp9eM868mYvtAv7xrFl 9HNq2zOTHZHVYxg5O67Uuyb3A4kBeNsndAp3a/RhdCLIjHwujyJ399XB65WIHuOmvfAm XVn+tp2xWIldKjzfj34uXAacklsjoSeJMRBRNjxbR8ki7uFbxtBRKpU19HYDG7JsbIOd BcQl2GyvVFlLeHT4CI4zuqisLSGI3GfjOKZX40RntnuVNpZO8tty5JKlcY0/xtsvBpFF GjyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ndufresne-ca.20150623.gappssmtp.com header.s=20150623 header.b=S3i37Yn+; 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 t26si5935460otq.264.2020.02.01.07.35.56; Sat, 01 Feb 2020 07:36:08 -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=S3i37Yn+; 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 S1727091AbgBAPep (ORCPT + 99 others); Sat, 1 Feb 2020 10:34:45 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:35306 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726837AbgBAPeo (ORCPT ); Sat, 1 Feb 2020 10:34:44 -0500 Received: by mail-qt1-f196.google.com with SMTP id n17so6769651qtv.2 for ; Sat, 01 Feb 2020 07:34:42 -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=wAyXNl606tjgDk9/MADAdf/nIELswBsElmeCFUMnvTY=; b=S3i37Yn+zi2ai/lOnIhJ68CHEfnfNgFy+nm+3WdQA9k6AaU6ISyKUsUroOlHwvSlfT hHWZyjCCEDhGI6aEUXHRDicetp5YFletDyclo/ft/yEdtJU+5BtV4IfoUDO5QUvvoXdL zums7F+fJSnxv025/W4BiCJgcTzslM7nuNbsw7V31m2LdaZ4vff5D6sow6EGylwVCENu jvGLmv1ZjRv41vS0xGTMyPI5j95brGcKljex5oWx9eg2t7nGfnNV6lPynA8JTX5PkuA4 Z6Rkbi02FZ2wwCSdf8Mo4anG5xfNNPP73x/GsHohmW1jJG/mG2GAABLXv5cGrvsgB2H1 KwDQ== 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=wAyXNl606tjgDk9/MADAdf/nIELswBsElmeCFUMnvTY=; b=nW4uWIABFBZb/bgVJ6/+BHpxUbSFC8laIoQrO45arHyyfGcNiUBw/utBQ4JUT3RBez zPCl6TJkhVCQLe5bpuYRkkoRxH1ygVq29ClaiAHUfjzDVr6oh8TbzdyB8IdoIspB6OHW RBc0alTvEZjp7Cy2GtuDcAROz3MsVUwTSZtcq8QuNPvHPT0I8qyQRaKIga6oja1DNAB3 3hSJ0PT6bvx+aU7PEyH1bcJYkg6F3/ia6XxfDX5tK2Ykir4YMfaUgk9pYk1kEmzdKhHt izKC6HVMbomb1wYjvbyY091wylCsXSP8rvb1/rsr/8x4G7NkiI1yf0paFxnRgAogNPB6 NAVA== X-Gm-Message-State: APjAAAXmXCQPtnyjIvPy2kCbgy4Evxxu5IycUJ4qwl2AKtnKa2il9ug3 BfJA+bWsSk1nNLCjYH+Aa7ir8Q== X-Received: by 2002:ac8:38e6:: with SMTP id g35mr16222933qtc.120.1580571282131; Sat, 01 Feb 2020 07:34:42 -0800 (PST) Received: from skullcanyon ([192.222.193.21]) by smtp.gmail.com with ESMTPSA id t23sm6680989qto.88.2020.02.01.07.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 07:34:41 -0800 (PST) Message-ID: <371bccfa68c4a9924137f087ef45c732e64bf808.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:34:40 -0500 In-Reply-To: <20200116133025.1903-1-narmstrong@baylibre.com> References: <20200116133025.1903-1-narmstrong@baylibre.com> 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 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 > > 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 >