From patchwork Tue Sep 3 01:02:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14870 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 CF009449E21 for ; Tue, 3 Sep 2019 04:08:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B815D687FD8; Tue, 3 Sep 2019 04:08:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FB93687FD7 for ; Tue, 3 Sep 2019 04:08:18 +0300 (EEST) Received: by mail-ot1-f65.google.com with SMTP id 100so15117559otn.2 for ; Mon, 02 Sep 2019 18:08:18 -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=F0ts27fa/8ePJP4b/fp4YiwwbM1UGJ46YgUl0SLFFjM=; b=etf6ecJ7Yn9MEJbuBy8/DcZYhz8ZcP6q73us82WIRlYuWdZWqTUJbXT6Iq00kRnB3o OVwA69aPb/EeZ9yla59tMJGhBxPupnAAoVqeOAi7EEnVta/If9Wr/s6/kGL1f5QGNVpr uBoX72dPd9wK0jHh37UV7fhzQeNVjl419b9XdjUefjzHTQELSH0I2Ctz59eA6FQinJxD o5K1+l20MyI6/KChx+A2hk+b1GFv5NR7DlT2NndHBcCfrrKRBF57NIoRydcFcOH4JK2a vJNnOaWi59HRtZVUqPxkx4Dv/Qp0wZCwzuPwCYAdle3Opcv6WN5olQ5fC/bI/vwEUw5V LI/g== 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=F0ts27fa/8ePJP4b/fp4YiwwbM1UGJ46YgUl0SLFFjM=; b=TWZf3fCK1fma1uKBuQqtqvo+MR9YMtiwWAyspj0/t821RMzu47Y94X2u0NG3sZ9A+k 8t5NpPNv76r4GweEPavAXu9CDieEc+3fSEdv5Ez7KDpjqH/IDQ4/MAKqIY9EFf9sWUty NLKfXNoBsuARfGMN/JLFk/JQt3Mpj7TodncmkQKrvvqrA8GOnUpvQvbvBcxFgPgcF+9/ faGTXn9kxVSljJUi7wL97mxijXp5tFCYTyb6P8KhtMinP6XOib44VhuOaSFC5rtekihp LdxdPoAxB6yxrx7ad8zEU5/WWAj4JmgbnTI/1fVCf+eL3lNJWG2jzGblZuZHOnSzL+cB d6RQ== X-Gm-Message-State: APjAAAX2lngyHzgxbZuKklcYrKk0+oHFKxE2U9DpG8MRs1Kt1aF/H0k1 v95h+J4BLuQ8PX9pw3O/U+FkoKKQf9o= X-Google-Smtp-Source: APXvYqyZRKU5v6H50l34tLZHiIBnA0YZjhBjSOKJIbjEq5iib/nyGCup9RreNvIc7rroeMkY6QbweA== X-Received: by 2002:a9d:7d04:: with SMTP id v4mr24689411otn.329.1567472582923; Mon, 02 Sep 2019 18:03:02 -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.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Sep 2019 18:03:02 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Sep 2019 18:02:14 -0700 Message-Id: <20190903010230.96236-10-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 09/25] avcodec/v4l2_m2m_enc: fix indentation and add M2MENC_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, Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/v4l2_m2m_enc.c | 44 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8014e442a8..4849bc26c5 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -332,28 +332,30 @@ static const AVOption options[] = { { NULL }, }; +#define M2MENC_CLASS(NAME) \ + static const AVClass v4l2_m2m_ ## NAME ## _enc_class = { \ + .class_name = #NAME "_v4l2m2m_encoder", \ + .item_name = av_default_item_name, \ + .option = options, \ + .version = LIBAVUTIL_VERSION_INT, \ + }; + #define M2MENC(NAME, LONGNAME, CODEC) \ -static const AVClass v4l2_m2m_ ## NAME ## _enc_class = {\ - .class_name = #NAME "_v4l2_m2m_encoder",\ - .item_name = av_default_item_name,\ - .option = options,\ - .version = LIBAVUTIL_VERSION_INT,\ -};\ -\ -AVCodec ff_ ## NAME ## _v4l2m2m_encoder = { \ - .name = #NAME "_v4l2m2m" ,\ - .long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " encoder wrapper"),\ - .type = AVMEDIA_TYPE_VIDEO,\ - .id = CODEC ,\ - .priv_data_size = sizeof(V4L2m2mPriv),\ - .priv_class = &v4l2_m2m_ ## NAME ##_enc_class,\ - .init = v4l2_encode_init,\ - .send_frame = v4l2_send_frame,\ - .receive_packet = v4l2_receive_packet,\ - .close = v4l2_encode_close,\ - .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ - .wrapper_name = "v4l2m2m", \ -}; + M2MENC_CLASS(NAME) \ + AVCodec ff_ ## NAME ## _v4l2m2m_encoder = { \ + .name = #NAME "_v4l2m2m" , \ + .long_name = NULL_IF_CONFIG_SMALL("V4L2 mem2mem " LONGNAME " encoder wrapper"), \ + .type = AVMEDIA_TYPE_VIDEO, \ + .id = CODEC , \ + .priv_data_size = sizeof(V4L2m2mPriv), \ + .priv_class = &v4l2_m2m_ ## NAME ##_enc_class, \ + .init = v4l2_encode_init, \ + .send_frame = v4l2_send_frame, \ + .receive_packet = v4l2_receive_packet, \ + .close = v4l2_encode_close, \ + .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ + .wrapper_name = "v4l2m2m", \ + }; M2MENC(mpeg4,"MPEG4", AV_CODEC_ID_MPEG4); M2MENC(h263, "H.263", AV_CODEC_ID_H263);