Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp3473218ybf; Tue, 3 Mar 2020 06:39:59 -0800 (PST) X-Google-Smtp-Source: ADFU+vumehhIfhZkvQeGhghEEyQUJLFD03oBZb6GhkUGU0ciS+jH80mwz45qqM3bho9f+9wdU3FF X-Received: by 2002:aca:eb57:: with SMTP id j84mr2742179oih.22.1583246399714; Tue, 03 Mar 2020 06:39:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583246399; cv=none; d=google.com; s=arc-20160816; b=sy0IT+mqbsn+x5XDS+LAUTpMWmRJzEGVwINTF79H8AnsHXIriDnNhfBcoKEVFlBUOk 1jOtH2XbUPSUsCtw+WRknWZeQ5wuhtoAw2lZuHshZYf5uKz29VQFgU8kI6U3i5l1GeKK lTv937/zWXkv+zK32jtD50/w9ZBi6W29Lnq+xuJGO5H4DsY+I7lJ2yFu2ALSI6vuTKpu OuFrsEQLqIvwCyOxSsxX/sFByWHDqAawOHM+MoJEuuzQxKw6iX8RUPFN0f1ODwB0zW4Z RA9Ho8LKvUj1pRcCObvAyvZjMpo+t3KI/P4e5b/CTUDE9BK3tnMd30Ju8D9Uxw06CfrG 3PKg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=7MF00UM1fpa9HYHO8SBKlNjIg6Uws9RTRAOVGceQtR8=; b=TglvNpftEtU3rfOj63mj6wTW6yIkXeGuz/NkrIARYb1qV4IEN7nWcs5nlaS4CqjiBN Jt2nbL+SWpLtWJ5EjHOOeJZ8RcyN2IsR/DvoF/4GgwMo3zcFGwG+PRPfRkEHpNAbvVob Q76LDDlWVm8e8rYJjr3B4/bPvygPSOvXbMp8JgQdrGC5RbXE7V2/bT2sNaWqrvByKDO3 U+MlBgsb6HWeDTGDm3sMKSW4eov9c9oveSv5o2q8hCCXACjryWvx15OEr1X0UvA5HK4Q 0O8iGc8UkcUVCIswOFLbTLllu+902jJxL1+4numTlZ3dHa7q0xrVtkTpkkmfDfwaTveF msDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=O3w2nmNb; 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 d2si8084170oth.267.2020.03.03.06.39.47; Tue, 03 Mar 2020 06:39:59 -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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=O3w2nmNb; 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 S1729318AbgCCOhh (ORCPT + 99 others); Tue, 3 Mar 2020 09:37:37 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45579 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728356AbgCCOhg (ORCPT ); Tue, 3 Mar 2020 09:37:36 -0500 Received: by mail-wr1-f68.google.com with SMTP id v2so4561495wrp.12 for ; Tue, 03 Mar 2020 06:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7MF00UM1fpa9HYHO8SBKlNjIg6Uws9RTRAOVGceQtR8=; b=O3w2nmNbOLHD0dzkSkWcx5e9MJIEXF8iFDrNGPDdENYEf5c8COTTMrdAiz2v+6M/uj 3HjvkAhoW+W119bQq5vs3WQxVLhlbC1w+kPU9KsHxb+acISCE3moVUT5E9tPS9TSMigU 1PekqKjGH8DdqTFOUhxnjEPC/DuibMhKlIQCy0seWnGvDJ/fnJpafc/orCRqroSNivPf 95aaQEcFZCdxgBYt5TxM1vjukEFlLFv4gXBbMHUIIJJueHdvAH6htuAGbeGfiqoDGztL y5eOb11H18S+JQGE0TmVcvt6I0xyxR2ge+/jV7bHpVpbrgmHxhi2WFH5MVWqlhdRyN6S 85UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7MF00UM1fpa9HYHO8SBKlNjIg6Uws9RTRAOVGceQtR8=; b=QX35e1Q3pe8hrt+5SHazNkSMOPhsUdxF6h4JHYKhL3l9XJvlleyLIcHfY181wDDSUQ iGtS+nuUKr9eX7EdGg8w0QKD+Jigl6n5198M2Ni4EwB94vclmIK6PgKBvhKBdDHy7/xe KvAahnBWUcVU/mreQaKoCDd8qu7Cm08NyCMxCM2TxLxb5YPePZYJ5bFVDvxN7SPgIDXU V2Gdv4rh83DE8jRM1A6LI/dnupZ0BY0sqRauKCggIjOu9+49GRgP+LSnrD31gp03xcQR Dk1uWv+lExYaKQp7r6rcmadUoDRXtfDm9T+4faj7r8ygDcS6Tvpzrt8jNlE0IN0zXRZv eFVg== X-Gm-Message-State: ANhLgQ0eLQ+fj8ZRm2Rx1WEOkZ5HvZSQOmhMDxUDhCRtDdTl1xeYk2hX 8eKYCcu5xGM7blxBMee28hf3RA== X-Received: by 2002:adf:ffd0:: with SMTP id x16mr5758258wrs.346.1583246254028; Tue, 03 Mar 2020 06:37:34 -0800 (PST) Received: from bender.baylibre.local (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id l4sm4652779wmf.38.2020.03.03.06.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 06:37:33 -0800 (PST) From: Neil Armstrong To: mchehab@kernel.org, hans.verkuil@cisco.com Cc: Neil Armstrong , linux-media@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 0/5] media: meson: vdec: Add VP9 decoding support Date: Tue, 3 Mar 2020 15:37:27 +0100 Message-Id: <20200303143732.762-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 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 Hello, This patchset aims to bring VP9 decoding support to Amlogic GXL, G12A & SM1 platforms for the amlogic stateful video decoder driver. With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully using the stream at [1] with a fixed pyv4l2compliance script for VP9 at [2]. The original script kept the IVF headers in the stream, confusing the decoder. The fixed script only extracts the payload from the IVF container. The decoder has been tested using the Google CTS TestVectorsIttiam VP9 yuv420 samples and the VP9 Decoder Performance streams at [5], decoding all streams from Profile 0 and 2 up to Level 4.1, with 10bit downsampling to 8bit. This patchset depends on : - H.264 and compliance v7 at [4] Changes since v5 at [9]: - Fixed sparse warnings in codec_hevc_common.h/codec_vp9.c/vdec_hevc.c - No smatch warnings issued Changes since v4 at [8]: - Fixes checkpatch warning on patches 3 & 5 Changes since v3 at [7]: - fixes necessary spare ref buffer handling in parser - added a comment to indicate how it's handled - fix VP9 on SM1, was working with G12A firmware, but needed some changed with SM1 specific firmware - pushed (gxl) and switched to missing (sm1) vp9 firmwares to linux-firmware repo Changes since v2 at [6]: - Rebased on H.264 and compliance at [4] Changes since v1 at [3]: - Fixed compliance for delta frame resize, but proper ref keeping is broken - Added warns for delta frame resize, to be fixed in a following patchset - Added VP9 probabilities parsing and transformation support to decore the VP9 performance streams - Fixed refs keeping, avoid deleting necessary refs for next frame - Properly used the kernel clamp_val() macros - Zeroed the workspace to avoid refs handling glitches - Add lock around the flush & stop to avoid race between IRQ and drain/stop [1] https://github.com/superna9999/pyv4l2compliance/raw/tests/output/Jellyfish_1080_10s_5MB.vp9.hdr [2] https://github.com/superna9999/pyv4l2compliance [3] https://lore.kernel.org/linux-media/20191205092454.26075-1-narmstrong@baylibre.com [4] https://lore.kernel.org/linux-media/20200303143320.32562-1-narmstrong@baylibre.com [5] https://www.webmproject.org/vp9/levels/ [6] https://lore.kernel.org/linux-media/20191217111939.10387-1-narmstrong@baylibre.com [7] https://lore.kernel.org/linux-media/20200116133437.2443-1-narmstrong@baylibre.com [8] https://lore.kernel.org/linux-media/20200206084152.7070-1-narmstrong@baylibre.com [9] https://lore.kernel.org/linux-media/20200219140958.23542-1-narmstrong@baylibre.com The compliance log is: # v4l2-compliance --stream-from-hdr Jellyfish_1080_10s_5MB.vp9.hdr -s 200 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/video0 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 198 buffers test MMAP (select): OK Video Capture Multiplanar: Captured 198 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 Maxime Jourdan (4): media: meson: vdec: add helpers for lossless framebuffer compression buffers media: meson: vdec: add common HEVC decoder support media: meson: vdec: add VP9 input support media: meson: vdec: add VP9 decoder support Neil Armstrong (1): media: meson: vdec: align stride on 32 bytes drivers/staging/media/meson/vdec/Makefile | 4 +- .../media/meson/vdec/codec_hevc_common.c | 284 +++ .../media/meson/vdec/codec_hevc_common.h | 80 + drivers/staging/media/meson/vdec/codec_vp9.c | 2141 +++++++++++++++++ drivers/staging/media/meson/vdec/codec_vp9.h | 13 + drivers/staging/media/meson/vdec/esparser.c | 150 +- drivers/staging/media/meson/vdec/hevc_regs.h | 218 ++ drivers/staging/media/meson/vdec/vdec.c | 15 +- .../staging/media/meson/vdec/vdec_helpers.c | 35 +- .../staging/media/meson/vdec/vdec_helpers.h | 4 + drivers/staging/media/meson/vdec/vdec_hevc.c | 231 ++ drivers/staging/media/meson/vdec/vdec_hevc.h | 13 + .../staging/media/meson/vdec/vdec_platform.c | 38 + 13 files changed, 3213 insertions(+), 13 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.c create mode 100644 drivers/staging/media/meson/vdec/codec_hevc_common.h create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.c create mode 100644 drivers/staging/media/meson/vdec/codec_vp9.h create mode 100644 drivers/staging/media/meson/vdec/hevc_regs.h create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.c create mode 100644 drivers/staging/media/meson/vdec/vdec_hevc.h -- 2.22.0