From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 913EDC432C3 for ; Tue, 26 Nov 2019 09:37:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C9EA20748 for ; Tue, 26 Nov 2019 09:37:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="tAq0BQX9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727577AbfKZJhl (ORCPT ); Tue, 26 Nov 2019 04:37:41 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:40031 "EHLO mail-wr1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727426AbfKZJhk (ORCPT ); Tue, 26 Nov 2019 04:37:40 -0500 Received: by mail-wr1-f42.google.com with SMTP id 4so18284441wro.7 for ; Tue, 26 Nov 2019 01:37:36 -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=UzhDyQ56LBzm46HNNl3HQXj0Cwtw/+D8lGNvZCeLFfU=; b=tAq0BQX9fU6dNUlVbcSM20CfwA1J8XWvdziNBxNa2ERzJKecEWe4GyQ/n6mc0Bu1kA BK+RtS5EftHYJO/GOLGcR1sEzvmtEz+2e0fCsqNSbt4js84jN2bbfHTv3UWwonqchUJL BFjopSZEY7sTyFj0u88jTvB663o0wheQk7+Yd6Zs9rJPpwGIr7HvCyaWm1obmoNZMpnI EQnWdlvUOK5EdRn2+FwCiqAlEnC2fxv1w9oP8NKfYVsmPx38Zi76d9B+qzLrogW6yPfb n8XyiiTi2YF5r1+6zuPVXA8lY45qKWjEInTyPOlJNEZ5XFZiVs+hDcIutvI9ckRLdzxS Jp4w== 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=UzhDyQ56LBzm46HNNl3HQXj0Cwtw/+D8lGNvZCeLFfU=; b=Uw0IzHXDYn2vQX2kWLSksJKibdM3qgSw1OOCfKEcpxjhg2yhYvjCIOU2Yy/x6qIvS5 15cWUu9vbGDZZ/5UOB7w0pwgenbU4N2pKid6wWXkIFX/aYc7AAkAI9SAngUkf/1+rR3P 30mO+Rk0GoQhelLSUN2+Mm23AfStcVcR9UDs5flhnzo9BLnGHQFir+u06ER4SzQbWupJ XEXUXhtIJVJ5HckJ8xZh5n9uoBRESiwaH4V6z75DJY60OaQAza0rAiyO/aXQFQKYy9tP qX5wUNYyEVvPl3P993GpeDm9OmCCAWP8jDRHHypsgJorEGI/XpiuZKz5lVhggvBu5YCE 91aw== X-Gm-Message-State: APjAAAVrD9WdDXSc6wBTyd1/gylG8u2K7Nex1/5cJw3TR+UGwlSrEOyd sRsrvtY9mHLYD8H1ogmXxiYMTQ== X-Google-Smtp-Source: APXvYqwpcan2QJ1uHURAp0mno8I427wdib6hDOxjlnDdGOsDgMqMmd6oqGy2A4ymy5A8BZJ5B73VoQ== X-Received: by 2002:a05:6000:103:: with SMTP id o3mr3709043wrx.80.1574761055575; Tue, 26 Nov 2019 01:37:35 -0800 (PST) Received: from bender.baylibre.local (176-150-251-154.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id y67sm2464082wmy.31.2019.11.26.01.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 01:37:34 -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 v2 0/3] media: meson: vdec: Add compliant H264 support Date: Tue, 26 Nov 2019 10:37:30 +0100 Message-Id: <20191126093733.32404-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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. With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully. This patchset depends on G12A and SM1 enablement series at [2] and [3]. The compliance log is: # v4l2-compliance --stream-from-hdr test-25fps.h264.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.4.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 200 buffers test MMAP (select): OK Video Capture Multiplanar: Captured 200 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 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/20191120111430.29552-1-narmstrong@baylibre.com [3] https://lore.kernel.org/linux-media/20191121101429.23831-1-narmstrong@baylibre.com Maxime Jourdan (2): media: meson: vdec: bring up to compliance media: meson: vdec: add H.264 decoding support Neil Armstrong (1): media: v4l2-mem2mem: mark DONE any OUTPUT queued buffer after CMD_STOP drivers/media/v4l2-core/v4l2-mem2mem.c | 61 ++- 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 | 92 ++-- 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 | 14 + 11 files changed, 779 insertions(+), 120 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h -- 2.22.0