From patchwork Tue Feb 15 21:52:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp685722nkf; Tue, 15 Feb 2022 13:53:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJxN1LGhW5uXS51OBcdI18rNUpQRrw8VwfJuL2sTccD8FyJxJEVe+fo0SbBTgWBPJeGuLv0l X-Received: by 2002:a17:906:3e4b:b0:6cf:7f02:9332 with SMTP id t11-20020a1709063e4b00b006cf7f029332mr30090eji.404.1644962039689; Tue, 15 Feb 2022 13:53:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644962039; cv=none; d=google.com; s=arc-20160816; b=hH//QqHUCxhyQtZx6RrFmilzo77TR2cJS/pooKrHuPHFnBi2Xjcd8IfU0D3CAqKhSi MtrrqxbJxlVq+d7ptbztWIJzSMtrXdOg6iww+MyvxrRk2SZg/sUGCZvX/CvGKyF2igBS fVzAehMMi/wS+HeVdsrfDXCOKVolCsFVjSe631DUF3SFOm9y8MSzc/lOwP/4eJNL9ffK A9KphBPSMycwqR+nHBMnBwcjrX9m4sR+dJ4MG6O8k6JvEAz/6e7pO+XOpB21rh3ComMQ YBB3yXyazS8lChh5AyFL1ntqSzs95N+ob+BfeESME4PhTc5PG9lrxRf1RbQkCQPWpnZq Q+gQ== 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:delivered-to; bh=yrxix8TwMCcKckMxOLQVOQp3DJnQh02+1ncfeofyK8o=; b=k7OILRlPqx7hYM8dHLUqmOgTrhgqxfcnLCJ1pPASw1S0cza/urgEaHovuTCnng5kQD j1URSr6XtmjdFg2GdImed5zvTKITVn2R0QpHi94nzjZrhJWD3lgg4ienpEjbzrBR5gem hSZQob+4UsCqU5nd05Q5P+3B0z2kAp7UCOx552+e6BzRQiNxrRXg82gfVoCdF6ac990y 1KmWLxWO8DJVZPgb/DsxjVbR80luWPOZ1P0TLl9N3FHp+dBEZOIdkKS5z91b138kQU2M iH9T+jgzHyuEyEJ8r+oa9s6uQVACHKpUX11BgRv4irvHqG5BYwzcpFjj4b3M+ESnkSuF fHsw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fz1si26504858ejc.338.2022.02.15.13.53.59; Tue, 15 Feb 2022 13:53:59 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BB1368B2C1; Tue, 15 Feb 2022 23:53:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2D7968AF89 for ; Tue, 15 Feb 2022 23:53:29 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nK5lJ-000g7B-0C for ffmpeg-devel@ffmpeg.org; Tue, 15 Feb 2022 22:53:29 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id K5kLn0XS6SgGFK5kLnEslg; Tue, 15 Feb 2022 22:52:29 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=PY2fQcHlzAFk5VDSiNsA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Feb 2022 22:52:26 +0100 Message-Id: <20220215215228.12252-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKcH/wUZGMpTgxWPUJ5xNfh51EYM/RXMiMl1emvAfgLOL7R6/rxXCxEmlMKzYrxa4n4a3iH8hODNjUshZsPhkI5Ftls2bSpjVCowI45EJdAu5yzTYLOn BAhzJMc9LnjYbms6AwC27wps7yyIfQIjwx35frQnzGmd02pJTpAQ3iU2 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: nBUsSgvukdiD This is more consistent with similar usage Signed-off-by: Michael Niedermayer --- .../{blend_modes.c => blend_modes_template.c} | 0 libavfilter/vf_blend.c | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) rename libavfilter/{blend_modes.c => blend_modes_template.c} (100%) diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes_template.c similarity index 100% rename from libavfilter/blend_modes.c rename to libavfilter/blend_modes_template.c diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 2d433e439f..e912ba4cb8 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -34,31 +34,31 @@ #define BOTTOM 1 #define DEPTH 8 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 9 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 10 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 12 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 14 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 16 -#include "blend_modes.c" +#include "blend_modes_template.c" #undef DEPTH #define DEPTH 32 -#include "blend_modes.c" +#include "blend_modes_template.c" typedef struct BlendContext { const AVClass *class; From patchwork Tue Feb 15 21:52:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp685516nkf; Tue, 15 Feb 2022 13:53:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWenCq1pl9LscJdk+Eai5Xh9TSQakdzTCaxug66D80aVaNgEBCY0PxYeUL9nXMfuEad9XN X-Received: by 2002:a17:906:9c02:b0:6cf:93f:f781 with SMTP id ff2-20020a1709069c0200b006cf093ff781mr38589ejc.312.1644962021652; Tue, 15 Feb 2022 13:53:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644962021; cv=none; d=google.com; s=arc-20160816; b=IMjfSc7qKM9famA/diBW5/aanYwEuVtNc7KqnVEL+h/8Ae/sf0i/R34fHgUSmb7zys MrepsuAHekxOd9HSlcfhpppUpJ5O/TSjKjug2wnxrZjwz1Er4X92rmahEoR2L1NxHza4 9ab59Al96DdEEMrZoqVEmbTJUCuAIJfE/rgyWbkLU4RpLoh191+dsGyYb3X8y3SqfDwG YjXrmyAzSg2EgGBVSiI4s9/BywaM1cvbDF43rz/RG7IBBxiYgc1pGgagK6/fkx1OIyR2 upz6n9L5xpp+cQfnZQUFeShM2j2XwBYGlpUzlZ+8jInmKzSUBwkcG4GtNB1b3WDH26CB Xw2A== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=7OSQxGsUhvMOGTzTNDgoLFVusV3+LMs0qxr1PLluGJM=; b=G/enSkyGItRgBj5IY5lR+2NHmsoMitF/cNjKWde23QlslPiFFTkSTFAp7v9isrCvKG rbw8Y4akUotVJ71gOHGwDlFln3QVA0eeZHdQkZO4hfWx3mI+swqZ7mwoh6j4hIRNGuDo CVKB4gZAUT85TkQ83C3JsMOgkZjCZCevG4LN4XwbY/wcTiXx+8vv/7RTCEzJC3nlt+fZ RuoPwnKkVttgmi7g78RwVEIigzj/yF+cwp34E8KBGrRhSnJthUtFSPCAJKpUdTLgmOWu UraOLDiJmUkOTsGYW+QGK7ZgEtE1DvmH9+c5KWeXNOnyVcM2eV73+j1lmgvssuWltGJy Fxuw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v8si22763074ejv.536.2022.02.15.13.53.40; Tue, 15 Feb 2022 13:53:41 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F31A68B245; Tue, 15 Feb 2022 23:53:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFE2268A7DE for ; Tue, 15 Feb 2022 23:53:29 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nK5lJ-002hv8-09 for ffmpeg-devel@ffmpeg.org; Tue, 15 Feb 2022 22:53:29 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id K5kLn0XTVSgGFK5kLnEsm0; Tue, 15 Feb 2022 22:52:29 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=uZJQMks5DjpTCzZsAR8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Feb 2022 22:52:27 +0100 Message-Id: <20220215215228.12252-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220215215228.12252-1-michael@niedermayer.cc> References: <20220215215228.12252-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKcH/wUZGMpTgxWPUJ5xNfh51EYM/RXMiMl1emvAfgLOL7R6/rxXCxEmlMKzYrxa4n4a3iH8hODNjUshZsPhkI5Ftls2bSpjVCowI45EJdAu5yzTYLOn BAhzJMc9LnjYbms6AwC27wps7yyIfQIjwx35frQnzGmd02pJTpAQ3iU2 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/speexdec: Use correct doxygen comments X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Bt0hr+kUbOzv Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index dcbdf5e010..7c61c9b0e0 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -164,7 +164,7 @@ typedef struct SpeexSubmode { } SpeexSubmode; typedef struct SpeexMode { - int modeID; /** ID of the mode */ + int modeID; /**< ID of the mode */ int (*decode)(AVCodecContext *avctx, void *dec, GetBitContext *gb, float *out); int frame_size; /**< Size of frames used for decoding */ int subframe_size; /**< Size of sub-frames used for decoding */ @@ -176,8 +176,8 @@ typedef struct SpeexMode { typedef struct DecoderState { const SpeexMode *mode; - int modeID; /** ID of the decoder mode */ - int first; /** Is first frame */ + int modeID; /**< ID of the decoder mode */ + int first; /**< Is first frame */ int full_frame_size; /**< Length of full-band frames */ int is_wideband; /**< If wideband is present */ int count_lost; /**< Was the last frame lost? */ @@ -186,12 +186,12 @@ typedef struct DecoderState { int nb_subframes; /**< Number of high-band sub-frames */ int lpc_size; /**< Order of high-band LPC analysis */ float last_ol_gain; /**< Open-loop gain for previous frame */ - float *innov_save; /** If non-NULL, innovation is copied here */ + float *innov_save; /**< If non-NULL, innovation is copied here */ /* This is used in packet loss concealment */ int last_pitch; /**< Pitch of last correctly decoded frame */ float last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ - uint32_t seed; /** Seed used for random number generation */ + uint32_t seed; /**< Seed used for random number generation */ int encode_submode; const SpeexSubmode *const *submodes; /**< Sub-mode data */ From patchwork Tue Feb 15 21:52:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp685619nkf; Tue, 15 Feb 2022 13:53:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiq8aeMpdpGj8AEHcKhDhK3e5LO5LsXZtVK6bhVfKzL/9/CdCOgqx2RytovXXNML/jqRcQ X-Received: by 2002:a17:906:35da:b0:6b8:9f07:f15d with SMTP id p26-20020a17090635da00b006b89f07f15dmr15801ejb.552.1644962031728; Tue, 15 Feb 2022 13:53:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644962031; cv=none; d=google.com; s=arc-20160816; b=J/MPEgJjM1EuX62jrALyk+PEWR4gXPs7FgtIdaYsbJe4HsCtzBNfM86/FIc69Rw8g6 e4gZ6RoJepRNDLoB3NNxWGlvxi9S+IefLEoDQ4wDbNhRglzxVc0y3rdGgk1GxosibSfk 62mhYwpFyHB4iNEEORcPxAo0nQuiceJzXKoDH37r1OgeS+vPgrX6MwCIudcy7xVHnh4I /MuxMPSo/demxWOM0vpq33Y4Ux5o+vKV6O87B12eX/AZ1AJGEsNBJyyDtvseCtJv74+k NlB54QXg041VwaK7daYxx97zUnTl3dhlfZjK0AtbWuRI0aweSeJhsJJKQAAMzkMYOnlO Q50Q== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=eaGh3GgYo5mqs7i5l65Ij/Xd8gw1RKgiVxO/Iro/Sy4=; b=MbBNe+95vt+r2NeeMixhOYs31eNfhY2/5v0ZIcot4JWv96tU4LiKTSYirQqf796dLQ 0k4ylfzDXV2CzxRJOCvyTdL6TGIeu3C8TTMv/nt3NxhBocsZS01cRIj5apSSuJurM2qz GZ6wVgPFpgQvTpEu8OUleTobgDz+PlybLSCp7n0BTvHKstbhVJ1P7xsCZ8KC32WxRyg+ vCiETetlFezLQQKFxbHbdyPcGWGY54hDj1OtWvauyBGhbAFsBq2IDaOcZJkQc30PwlCS DtnjBDNXfSYj9UJMty9M1FXYjPxzqkxUQf/XvjmuBJVBeTHqpUKWgYw3BxTAWEHN6fQ3 H0ww== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc8si15180490ejc.168.2022.02.15.13.53.50; Tue, 15 Feb 2022 13:53:51 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28EE568B2A6; Tue, 15 Feb 2022 23:53:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E178F68AD9E for ; Tue, 15 Feb 2022 23:53:29 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nK5lJ-00BWNd-0D for ffmpeg-devel@ffmpeg.org; Tue, 15 Feb 2022 22:53:29 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id K5kLn0XTxSgGFK5kLnEsm4; Tue, 15 Feb 2022 22:52:29 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=TiiP5R0NLyyXMbUicMoA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Feb 2022 22:52:28 +0100 Message-Id: <20220215215228.12252-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220215215228.12252-1-michael@niedermayer.cc> References: <20220215215228.12252-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKcH/wUZGMpTgxWPUJ5xNfh51EYM/RXMiMl1emvAfgLOL7R6/rxXCxEmlMKzYrxa4n4a3iH8hODNjUshZsPhkI5Ftls2bSpjVCowI45EJdAu5yzTYLOn BAhzJMc9LnjYbms6AwC27wps7yyIfQIjwx35frQnzGmd02pJTpAQ3iU2 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/speexdec: Align some comments X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: YPmY3Yc2D1aq Signed-off-by: Michael Niedermayer --- libavcodec/speexdec.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 7c61c9b0e0..ee95417deb 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -166,37 +166,37 @@ typedef struct SpeexSubmode { typedef struct SpeexMode { int modeID; /**< ID of the mode */ int (*decode)(AVCodecContext *avctx, void *dec, GetBitContext *gb, float *out); - int frame_size; /**< Size of frames used for decoding */ - int subframe_size; /**< Size of sub-frames used for decoding */ - int lpc_size; /**< Order of LPC filter */ - float folding_gain; /**< Folding gain */ + int frame_size; /**< Size of frames used for decoding */ + int subframe_size; /**< Size of sub-frames used for decoding */ + int lpc_size; /**< Order of LPC filter */ + float folding_gain; /**< Folding gain */ const SpeexSubmode *submodes[NB_SUBMODES]; /**< Sub-mode data for the mode */ - int default_submode; /**< Default sub-mode to use when decoding */ + int default_submode; /**< Default sub-mode to use when decoding */ } SpeexMode; typedef struct DecoderState { const SpeexMode *mode; int modeID; /**< ID of the decoder mode */ int first; /**< Is first frame */ - int full_frame_size; /**< Length of full-band frames */ - int is_wideband; /**< If wideband is present */ - int count_lost; /**< Was the last frame lost? */ - int frame_size; /**< Length of high-band frames */ - int subframe_size; /**< Length of high-band sub-frames */ - int nb_subframes; /**< Number of high-band sub-frames */ - int lpc_size; /**< Order of high-band LPC analysis */ - float last_ol_gain; /**< Open-loop gain for previous frame */ + int full_frame_size; /**< Length of full-band frames */ + int is_wideband; /**< If wideband is present */ + int count_lost; /**< Was the last frame lost? */ + int frame_size; /**< Length of high-band frames */ + int subframe_size; /**< Length of high-band sub-frames */ + int nb_subframes; /**< Number of high-band sub-frames */ + int lpc_size; /**< Order of high-band LPC analysis */ + float last_ol_gain; /**< Open-loop gain for previous frame */ float *innov_save; /**< If non-NULL, innovation is copied here */ /* This is used in packet loss concealment */ - int last_pitch; /**< Pitch of last correctly decoded frame */ - float last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ + int last_pitch; /**< Pitch of last correctly decoded frame */ + float last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ uint32_t seed; /**< Seed used for random number generation */ int encode_submode; const SpeexSubmode *const *submodes; /**< Sub-mode data */ - int submodeID; /**< Activated sub-mode */ - int lpc_enh_enabled; /**< 1 when LPC enhancer is on, 0 otherwise */ + int submodeID; /**< Activated sub-mode */ + int lpc_enh_enabled; /**< 1 when LPC enhancer is on, 0 otherwise */ /* Vocoder data */ float voc_m1; @@ -205,10 +205,10 @@ typedef struct DecoderState { int voc_offset; int dtx_enabled; - int highpass_enabled; /**< Is the input filter enabled */ + int highpass_enabled; /**< Is the input filter enabled */ - float *exc; /**< Start of excitation frame */ - float mem_hp[2]; /**< High-pass filter memory */ + float *exc; /**< Start of excitation frame */ + float mem_hp[2]; /**< High-pass filter memory */ float exc_buf[NB_DEC_BUFFER]; /**< Excitation buffer */ float old_qlsp[NB_ORDER]; /**< Quantized LSPs for previous frame */ float interp_qlpc[NB_ORDER]; /**< Interpolated quantized LPCs */