[FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c

[FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c

[Michael Niedermayer]

This is more consistent with similar usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 .../{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;
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] avcodec/speexdec: Use correct doxygen comments

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 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 */
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] avcodec/speexdec: Align some comments

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 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 */
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c

[Andreas Rheinhardt]

Michael Niedermayer:
> This is more consistent with similar usage
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  .../{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;

Right now make's vf_blend.d contains an entry
src/libavfilter/blend_modes.c; if one applies this patch, said file does
no longer exist and make errors out with "No rule to make target
'src/libavfilter/blend_modes.c', needed by 'libavfilter/vf_blend.o'.",
because the blend_modes.c prerequisite can't be made. In
3044d0efee9136c19dfdcf6dcdf957e910a73fd5 I made the build process treat
templates just like headers so that they can be deleted without this
error. Would there be any negative side-effects of doing the same for
all files?
(Btw: The AC-3 decoder also uses a misnamed template; I didn't fix it
because of the aforementioned issue.)

- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/3] avfilter: Rename blend_modes.c -> blend_modes_template.c

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 6360 bytes --]

On Wed, Feb 16, 2022 at 05:38:04AM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > This is more consistent with similar usage
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  .../{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;
> 
> Right now make's vf_blend.d contains an entry
> src/libavfilter/blend_modes.c; if one applies this patch, said file does
> no longer exist and make errors out with "No rule to make target
> 'src/libavfilter/blend_modes.c', needed by 'libavfilter/vf_blend.o'.",
> because the blend_modes.c prerequisite can't be made. In
> 3044d0efee9136c19dfdcf6dcdf957e910a73fd5 I made the build process treat
> templates just like headers so that they can be deleted without this
> error. Would there be any negative side-effects of doing the same for
> all files?
> (Btw: The AC-3 decoder also uses a misnamed template; I didn't fix it
> because of the aforementioned issue.)

Iam no makefile guru
but if you give a rule to fake-make any .c file then .o files build from
.asm could pick the .c route
i dont know when that happens but it does happen sometimes:

      Considering target file 'libavcodec/x86/fpel.o'.
       Looking for an implicit rule for 'libavcodec/x86/fpel.o'.
       Trying pattern rule with stem 'fpel'.
       Trying implicit prerequisite 'libavcodec/x86/fpel.c'.
       Found prerequisite 'libavcodec/x86/fpel.c' as VPATH 'src/libavcodec/x86/fpel.c'
       Found an implicit rule for 'libavcodec/x86/fpel.o'.
        Considering target file 'src/libavcodec/x86/fpel.c'.
         File 'src/libavcodec/x86/fpel.c' does not exist.
         Looking for an implicit rule for 'src/libavcodec/x86/fpel.c'.
         Trying pattern rule with stem 'fpel'.
         Found an implicit rule for 'src/libavcodec/x86/fpel.c'.
         Finished prerequisites of target file 'src/libavcodec/x86/fpel.c'.
        Must remake target 'src/libavcodec/x86/fpel.c'.
        Successfully remade target file 'src/libavcodec/x86/fpel.c'.
        Pruning file 'libavcodec/'.
        Pruning file 'libavcodec/x86/'.
        Considering target file 'src/libavcodec/x86/fpel.asm'.
         Looking for an implicit rule for 'src/libavcodec/x86/fpel.asm'.
         Trying pattern rule with stem 'fpel.asm'.
         Trying implicit prerequisite 'src/libavcodec/x86/fpel.asm,v'.
         Trying pattern rule with stem 'fpel.asm'.
         Trying implicit prerequisite 'src/libavcodec/x86/RCS/fpel.asm,v'.
         Trying pattern rule with stem 'fpel.asm'.
         Trying implicit prerequisite 'src/libavcodec/x86/RCS/fpel.asm'.
         Trying pattern rule with stem 'fpel.asm'.
         Trying implicit prerequisite 'src/libavcodec/x86/s.fpel.asm'.
         Trying pattern rule with stem 'fpel.asm'.
         Trying implicit prerequisite 'src/libavcodec/x86/SCCS/s.fpel.asm'.
         No implicit rule found for 'src/libavcodec/x86/fpel.asm'.
         Finished prerequisites of target file 'src/libavcodec/x86/fpel.asm'.
        No need to remake target 'src/libavcodec/x86/fpel.asm'.
        Pruning file 'config.asm'.
        Pruning file 'src//libavutil/x86/x86util.asm'.
        Pruning file 'src//libavutil/x86/x86inc.asm'.
       Finished prerequisites of target file 'libavcodec/x86/fpel.o'.
       Prerequisite 'src/libavcodec/x86/fpel.c' of target 'libavcodec/x86/fpel.o' does not exist.
       Prerequisite 'libavcodec/' is order-only for target 'libavcodec/x86/fpel.o'.
       Prerequisite 'libavcodec/x86/' is order-only for target 'libavcodec/x86/fpel.o'.
       Prerequisite 'src/libavcodec/x86/fpel.asm' is older than target 'libavcodec/x86/fpel.o'.
       Prerequisite 'config.asm' is newer than target 'libavcodec/x86/fpel.o'.
       Prerequisite 'src//libavutil/x86/x86util.asm' is older than target 'libavcodec/x86/fpel.o'.
       Prerequisite 'src//libavutil/x86/x86inc.asm' is older than target 'libavcodec/x86/fpel.o'.
      Must remake target 'libavcodec/x86/fpel.o'.
Putting child 0x55fbfa094840 (libavcodec/x86/fpel.o) PID 29151 on the chain.
Live child 0x55fbfa094840 (libavcodec/x86/fpel.o) PID 29151 
CC	libavcodec/x86/fpel.o
x86_64-w64-mingw32-gcc: error: src/libavcodec/x86/fpel.c: No such file or directory
x86_64-w64-mingw32-gcc: fatal error: no input files
compilation terminated.
Reaping losing child 0x55fbfa094840 PID 29151 
make: *** [libavcodec/x86/fpel.o] Error 1
src/ffbuild/common.mak:78: recipe for target 'libavcodec/x86/fpel.o' failed
Removing child 0x55fbfa094840 PID 29151 from chain.




[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/3] avcodec/speexdec: Use correct doxygen comments

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 624 bytes --]

On Tue, Feb 15, 2022 at 10:52:27PM +0100, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/speexdec.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

will apply

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Any man who breaks a law that conscience tells him is unjust and willingly 
accepts the penalty by staying in jail in order to arouse the conscience of 
the community on the injustice of the law is at that moment expressing the 
very highest respect for law. - Martin Luther King Jr

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 3/3] avcodec/speexdec: Align some comments

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 449 bytes --]

On Tue, Feb 15, 2022 at 10:52:28PM +0100, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/speexdec.c | 40 ++++++++++++++++++++--------------------
>  1 file changed, 20 insertions(+), 20 deletions(-)

will apply

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".