From patchwork Tue May 8 18:24:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Rusak X-Patchwork-Id: 8877 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4330314jad; Tue, 8 May 2018 11:31:21 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpzHWW6h9Yy26LurdUPKflfevMGxi9kEJjjnz/6oo13OTIH7VU5igLTIPG+AIC6NfNbMP/S X-Received: by 2002:a1c:6489:: with SMTP id y131-v6mr3832421wmb.82.1525804281437; Tue, 08 May 2018 11:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525804281; cv=none; d=google.com; s=arc-20160816; b=EawvsjHX4VU7rHKo4pBQIs9ajqk9ZN15WKj3s+HoJnoGwJukbdWuKTBqJ2+QLNF+4k ttltPBnJzpEpoeZxa834udK8kxqF27jExJI0FHZG0kqrbCXS7vqgoc0dlMH8jZzWqOI6 RXhV483enFps7Wcm9TScC9TLWqpiS72lzLYDOH9aKaDzu6p9UVNrGi4sWs8L9+IOJHSU znJn6xj3AdBbWjFcG8pQ/C/5kg22diqIFABQ9xfS0fV4UIgwzqzwlMBsPvG+B8jNOvb+ hK6TCH43iXuuE16jaNJELBHkufGbt2eEXm5PMaVUDOYuK8lLPocNl0HYUYOfFQTwxGcL pNFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=33Aocd/q5gfkM+r1S2K92OozYdzDtoLa5QzrOZTiOrk=; b=r1iJWQ4YC//+vnpUqz83kEWf5Zk+h1qOBtP2/nk4uPq1xu6lOmVuus2uNYd/jbDA+d J2c9842u9sTQFZbm89qtN4OiAd2S+hrdKppTjo1KW4YK+p3rxncZqzZ9duepcxcpAAp/ q6R/nfl0NSOzDuaYudgK4NPTGZrR8mZoWkCHC6/rHeF+mjx9cI+GnhWe+qk5gKeSRAZY RyuR74ARLrr5pKYyuSoTLLlGdfUkW44esFYULlN2NMhkRsXk3nEKfVQ8WvEZvhKFRI/M 4DmmNpjeCaKRkaUSgomGy04hqmtfHr5KbB32VsMykq/Iz0Q8MMS6u/A43jjUNIc6tKI6 w5jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rlPLEm4J; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b79-v6si22324021wrd.260.2018.05.08.11.31.21; Tue, 08 May 2018 11:31:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rlPLEm4J; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAB5768A758; Tue, 8 May 2018 21:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4999568A743 for ; Tue, 8 May 2018 21:30:38 +0300 (EEST) Received: by mail-pl0-f65.google.com with SMTP id c11-v6so2720788plr.5 for ; Tue, 08 May 2018 11:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=no3awMDijMuaNYT4GNDxeaRnPPkbdEuXEmjan8p7fTg=; b=rlPLEm4JMiaQwzd6mQMkyY4V0flZgfuLEj++iOjHSLi3FaNH0ek7jdKxuQfGAmrUQg 6adUcQL8MrJMYzjANK5ETYuphQ8VYZDyBSMNzw8zP0pkWguukXOEaeKOFIKLS8Z8AGT8 +6RETpV0zn6ZXWwYhfW9aE6Nk44slGqkN+YXBsMHtbU+H3FU2ZB98XHeHPL2HeM0Upok ZYBsoRHSZnP9blYM8Yh3/2NuEpshvWVViuAzQ5eAVBiQmE7pTTtTVg60v+YjsVKKx92t U8N5J7edNM6hJ9piVxiPIc8AMvM71dJGJCeT+DqRXHKOYMP2Rtb/p1NXqK4ED/1109IB Ih5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=no3awMDijMuaNYT4GNDxeaRnPPkbdEuXEmjan8p7fTg=; b=YdN1gI9yXKYrbZ/OKgOzh0Q1+YOwrYDPae+vpeYmCciu5n3gyua0v8er2H78ShhMhC Af2sFly7o70Sz+wQ+McyM2lVkccQMxsY8MbNYD677a8lyuinI2KA15m2sJQ/6s6+Q33S dtccvRoypqrELARU/rD1oUxJnRyiBwFvQ39P53HVy0MYECfk55NCDlJHkFBgJPFRt1pO 994qG6zmXLNv2cxTeHAIY41tzXV4DozS7vGK/P1J3amXtIEUFp8APZs/BrqGThtLusq5 2onyqUiNoXlKfxdpzNbHYgeWGvSD01xEaVvtYb4I7SuCGSYMLF4BcCDbRwrejp87F5W6 Y+lg== X-Gm-Message-State: ALQs6tCt0TLFDfTJcTRT2hRF/7wgHtUMdONkdIvZXmMUvtJxIDXdd5q1 HUEHpfTqPzQZ46Nsnkelpx4OZ8pu X-Received: by 2002:a17:902:229:: with SMTP id 38-v6mr16910605plc.384.1525803848156; Tue, 08 May 2018 11:24:08 -0700 (PDT) Received: from localhost.localdomain (d154-20-200-72.bchsia.telus.net. [154.20.200.72]) by smtp.gmail.com with ESMTPSA id w184-v6sm38311189pgb.20.2018.05.08.11.24.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 11:24:07 -0700 (PDT) From: Lukas Rusak To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 May 2018 11:24:04 -0700 Message-Id: <20180508182406.8846-1-lorusak@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/3] libavcodec: v4l2m2m: fix indentation and add M2MDEC_CLASS X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is just some formatting that is taken from the rkmpp decoder. I find that this make is more readable. --- libavcodec/v4l2_m2m_dec.c | 44 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index bca45be148..ed5193ecc1 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -202,28 +202,30 @@ static const AVOption options[] = { { NULL}, }; +#define M2MDEC_CLASS(NAME) \ + static const AVClass v4l2_m2m_ ## NAME ## _dec_class = { \ + .class_name = #NAME "_v4l2_m2m_decoder", \ + .item_name = av_default_item_name, \ + .option = options, \ + .version = LIBAVUTIL_VERSION_INT, \ + }; + #define M2MDEC(NAME, LONGNAME, CODEC, bsf_name) \ -static const AVClass v4l2_m2m_ ## NAME ## _dec_class = {\ - .class_name = #NAME "_v4l2_m2m_decoder",\ - .item_name = av_default_item_name,\ - .option = options,\ - .version = LIBAVUTIL_VERSION_INT,\ -};\ -\ -AVCodec ff_ ## NAME ## _v4l2m2m_decoder = { \ - .name = #NAME "_v4l2m2m" ,\ - .long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder wrapper"),\ - .type = AVMEDIA_TYPE_VIDEO,\ - .id = CODEC ,\ - .priv_data_size = sizeof(V4L2m2mPriv),\ - .priv_class = &v4l2_m2m_ ## NAME ## _dec_class,\ - .init = v4l2_decode_init,\ - .receive_frame = v4l2_receive_frame,\ - .close = ff_v4l2_m2m_codec_end,\ - .bsfs = bsf_name, \ - .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ - .wrapper_name = "v4l2m2m", \ -}; + M2MDEC_CLASS(NAME) \ + AVCodec ff_ ## NAME ## _v4l2m2m_decoder = { \ + .name = #NAME "_v4l2m2m" , \ + .long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " decoder wrapper"), \ + .type = AVMEDIA_TYPE_VIDEO, \ + .id = CODEC , \ + .priv_data_size = sizeof(V4L2m2mPriv), \ + .priv_class = &v4l2_m2m_ ## NAME ## _dec_class, \ + .init = v4l2_decode_init, \ + .receive_frame = v4l2_receive_frame, \ + .close = ff_v4l2_m2m_codec_end, \ + .bsfs = bsf_name, \ + .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ + .wrapper_name = "v4l2m2m", \ + }; M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb");