From patchwork Tue Sep 3 01:02:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14855 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D5885449F2B for ; Tue, 3 Sep 2019 04:03:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE76B6801E0; Tue, 3 Sep 2019 04:03:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA0AC687F25 for ; Tue, 3 Sep 2019 04:03:02 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id g16so3192990otp.12 for ; Mon, 02 Sep 2019 18:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Du6GmB3RD1Rd/79WYTYQIcxF8wyJbxmYHpXq6o4U/FY=; b=pewiC9ISztRnJl40ccGb0gaCDOig7kS6EiqP4McVVnr08Kh4EXG92O4ywa38fqfiLY P9aOR7kdvJ/2e5oqF3O3Uq8lncZI2Jwj82S3zIqCzfF3Su9mma+Nwthpag5wrUi0WqGJ phGaL/XMvR+MRCdw7g3cnaPSVgOKEe6uKG2CeWlREyyMeRj3juEmJZ7jwH9uznC6pEST iyxeLfF5x7UPXRWHRgG0qEkdMw/ojZUbJbC5aS4V4LKW4vFD5J6UuGD4gafyk27XUr1s YBqUA9AGM3zZK2yY24+Ssg7DVjRVSQI4OnHhRgESujCgws6pkWNEpzI0pVPmN8KIlbEU eCxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Du6GmB3RD1Rd/79WYTYQIcxF8wyJbxmYHpXq6o4U/FY=; b=MSw/EXwUm8APoBEON3UK+LSEk5URV8u3zLol07FGBPtiKHGACftD6ruiGnBVOaBGVn EnlXbVegSjvMomsXW3lDslH+aCgUScKnYKL2bxusl4pcwnsYUPsQeOKlV8Tmjl/0LBcv wH3wN2WRxzGGxSV2qYtTGtWKZX3MMwDP/6M24aqjoFCOduuYE5cR4kDiY1t2uEtL2oG8 eIOVdPaxVsYsUaNWRNLNVqhWsI3Op4pKjqRTUn0V9ONP74NYakTV3+bKhAsiDshyOZ/+ ekiXXTxW4Xj+1JLWWcr0aZG51lGM8T4LQATmZyxIO3GVSPpJdVNvr6hKQu9CdcW3xk3i uFcA== X-Gm-Message-State: APjAAAXlmhJTF/emEGbN6Shq5zQazE/v9JaCwmZYB7d8njDbv28mMktn JnwNOVxcLXRpx30tu+DcWt/zeuinKx8= X-Google-Smtp-Source: APXvYqyPX6zPEEKpLX0iQcHRPb0uTKj+bZ/oLLNvWR7a7snVGm20us/nZOqZEbDAjjqYIYFgOXYz5Q== X-Received: by 2002:a9d:12d1:: with SMTP id g75mr25351204otg.189.1567472581382; Mon, 02 Sep 2019 18:03:01 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id a21sm4299633oie.9.2019.09.02.18.03.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Sep 2019 18:03:00 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Sep 2019 18:02:13 -0700 Message-Id: <20190903010230.96236-9-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903010230.96236-1-ffmpeg@tmm1.net> References: <20190903010230.96236-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/25] avcodec/v4l2_m2m_dec: fix indentation and add M2MDEC_CLASS macro 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 Cc: lorusak@gmail.com, Aman Gupta , jorge.ramirez.ortiz@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Lukas Rusak 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 | 45 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 596e435463..fb2bfde714 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -220,29 +220,30 @@ static const AVOption options[] = { { NULL}, }; +#define M2MDEC_CLASS(NAME) \ + static const AVClass v4l2_m2m_ ## NAME ## _dec_class = { \ + .class_name = #NAME "_v4l2m2m_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 = v4l2_decode_close,\ - .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 = v4l2_decode_close, \ + .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");