From patchwork Sat Aug 4 00:40:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Rusak X-Patchwork-Id: 9880 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp726198jad; Fri, 3 Aug 2018 17:40:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdAy1cjl0aTY6IoATNCoXng1aGlswA/JBLN0xO4VhpVLWL7R38QR6K3jErmFmMr/YpOv3gO X-Received: by 2002:adf:f8c7:: with SMTP id f7-v6mr3702811wrq.237.1533343246876; Fri, 03 Aug 2018 17:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533343246; cv=none; d=google.com; s=arc-20160816; b=jyE0nkH3mKdCk9UptQxalH7ro+KzbBjufvbnHLVFczB8c+ZPZjJoowStvEL8F4cXbQ KdXIzu9OhuzbXmMb0wK6RwjYShqxtMKPVrPBKcdIpY/pM+u0xFhE1ZhTbmQvxF8CXVpT IlNQndfeUuX4uhqPwNJjgxlex8UIt5rv2bUFVWJnVxI3XLiRB5PqpXS3c/hMsq639e2N 7olCt/ETW2d50Rm1sEjo1cMicnJiLAUdBdDsdtATyRQVFNQnl7k4ww6aKPMEuSZrJUYi X6Ns0ro31PPCB8geB3hdjpXxXT8e4xdrCnA9VRoCSFztcsLTYIC+Wu/w5gnKreyhogZI DBEg== 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=6xMrvzXnofTu1pbaJFrmFDbz97AnLB/1sOIMTe17vPM=; b=O9gsM78EWnOfHL2xFsP0sEYByxl5/6bbjf9KQ2Y+Rj2BeaJZFyJLMIbmCvLNOpHgNC 4SWnt1hYflYr8j9FonezhDTJP3QNbonkKz+dHVMCwJSUbW/K9ON0BiOnlW2Fvdb+iCG1 59GZql0bRRkFJfJKOuwJzTy8m7lsfqcnFXi49hEjYoleocqQn2ITWGI3+E68QqDr+tyh vIw0TyXmhWh82Gnv7NbzubkprHYEzXY5+AogyrI0T8QiyJzgDYWAg1j/s1JQ4+irGJJa Qz+W7N+uwy1Ls0SwmiYZYNbs9ZnhsGsiPlBNf/gZgN4I9VtJ7WPSh7YLtGjuH3CcKvvg DM+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Ss7B7v82; 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 k3-v6si4398518wrn.158.2018.08.03.17.40.45; Fri, 03 Aug 2018 17:40:46 -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=Ss7B7v82; 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 2AB3F689723; Sat, 4 Aug 2018 03:40:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E02ED689A69 for ; Sat, 4 Aug 2018 03:40:17 +0300 (EEST) Received: by mail-pl0-f48.google.com with SMTP id w19-v6so1588883ply.8 for ; Fri, 03 Aug 2018 17:40:36 -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=zYdYv82PL+BzU9Il3UPX4R7NFn+J70iWmAo7Y5cbuSE=; b=Ss7B7v82mCDBJV3H7JPxmONP8mS/SLi6HiFW6gwGP8v4s4+3+rGz6gK4O5/tQ0ytaZ rc9ZpR1cD002upiFgMgNWuYGGeT1KNjIZA/X19MfhyrSCB+iEhp+zhDyUmpElYAEibY+ ZMBF7XhPIhZokxaakGLyv9dSak28bnZ8kXzvytj95ZKjIDgbaVkAYDkSz5P3WzrX8naL OXIFv0MJaWCedy3etWs+cDkAyCeIgNqOJJNrvnIcOZ6NvN+t5ndaP+aByedkT2DLzUvP fmH1Tz6IlfDkzg/el/ENqN7Lv0Yj5p+ek29tqpdn7aRD8G8ardLAfPjIl/bOZanubj1s DocQ== 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=zYdYv82PL+BzU9Il3UPX4R7NFn+J70iWmAo7Y5cbuSE=; b=q4alm4t9pm+89Yvg6mfJ7FK5aSfsE+sNJ8iM/1PCKmtLlJVT7tQNr0DnaA9mNX3aoy XWcC2mzWLMzecXYNj0chPHbvg73LJO7+tRJL7RXEf1bxrRrXZUmuLHj5GCA7iGjE0dAt zU4/t4D2XOdvMd5asa6+eBsd/8UfH9CWdNbsQGssnaZs0mfolGTcim1Vet6Zjbwg3HAL slQCMLMt3sdl7AM/v84BiQB3/ISrJL0z1t4FOvbKeZjNZO9Z7K4Xt8ze85KtBMvnaTgH VobYAUdzs+NcRkMdl8POhf2tENg3Ll2gwnW9CTb1C8AIlyH4ev4QmJQE3kpAb6y7QFGg wBkQ== X-Gm-Message-State: AOUpUlEGTjqmJegeM9YF6Ca3mQfAFD1W8TKn8fAC9Xi8CTy5nuwaPH4m XNhHScdBfBSkUTkzWIXrIkADl3GH X-Received: by 2002:a17:902:722:: with SMTP id 31-v6mr5525655pli.207.1533343234160; Fri, 03 Aug 2018 17:40:34 -0700 (PDT) Received: from localhost.localdomain (d154-20-200-72.bchsia.telus.net. [154.20.200.72]) by smtp.gmail.com with ESMTPSA id e8-v6sm1107265pfj.16.2018.08.03.17.40.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 17:40:33 -0700 (PDT) From: Lukas Rusak To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Aug 2018 17:40:28 -0700 Message-Id: <20180804004031.12143-1-lorusak@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] 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 just makes the M2MDEC_CLASS similar to how it is done in rkmpp. It looks clean and has proper indentation --- libavcodec/v4l2_m2m_dec.c | 46 ++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 710e40efd8..7926e25efa 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -205,29 +205,31 @@ 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 | \ - AV_CODEC_CAP_AVOID_PROBING, \ - .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, \ + AV_CODEC_CAP_AVOID_PROBING, \ + .wrapper_name = "v4l2m2m", \ + }; M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb");