[FFmpeg-devel] [PATCH 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[FFmpeg-devel] [PATCH 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[Andreas Rheinhardt]

Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index e1afcaa586..762311ae51 100755
--- a/configure
+++ b/configure
@@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs"
 wmav1_encoder_select="sinewin wma_freqs"
 wmav2_decoder_select="sinewin wma_freqs"
 wmav2_encoder_select="sinewin wma_freqs"
-wmavoice_decoder_select="lsp rdft dct sinewin"
+wmavoice_decoder_select="lsp sinewin"
 wmv1_decoder_select="msmpeg4dec"
 wmv1_encoder_select="msmpeg4enc"
 wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"
-- 
2.34.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 02/14] configure: Remove obsolete ffplay->rdft dependency

[Andreas Rheinhardt]

Forgotten in 4acd08be6c4f39736179a3d90fd56b508e42ff6d.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 762311ae51..11f232165f 100755
--- a/configure
+++ b/configure
@@ -3915,7 +3915,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
                transpose_filter trim_filter vflip_filter"
 ffmpeg_suggest="ole32 psapi shell32"
 ffplay_deps="avcodec avformat avfilter swscale swresample sdl2"
-ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
+ffplay_select="crop_filter transpose_filter hflip_filter vflip_filter rotate_filter"
 ffplay_suggest="shell32"
 ffprobe_deps="avcodec avformat"
 ffprobe_suggest="shell32"
-- 
2.34.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 03/14] configure: Remove unnecessary vf_spp->fft dependency

[Andreas Rheinhardt]

The AVDCT API used by this filter does in no way depend
upon the FFT subsystem.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 11f232165f..28f1753ecb 100755
--- a/configure
+++ b/configure
@@ -3809,7 +3809,7 @@ smartblur_filter_deps="gpl swscale"
 sobel_opencl_filter_deps="opencl"
 sofalizer_filter_deps="libmysofa"
 spp_filter_deps="gpl avcodec"
-spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
+spp_filter_select="idctdsp fdctdsp me_cmp pixblockdsp"
 sr_filter_deps="avformat swscale"
 sr_filter_select="dnn"
 stereo3d_filter_deps="gpl"
-- 
2.34.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 04/14] avcodec/mpegaudiodsp: Init dct32 directly

[Andreas Rheinhardt]

This avoids using dct.c and will allow removing it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure                     | 1 -
 libavcodec/Makefile           | 3 ++-
 libavcodec/mpegaudiodsp.c     | 6 +-----
 libavcodec/x86/Makefile       | 2 +-
 libavcodec/x86/mpegaudiodsp.c | 6 ++++++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 28f1753ecb..f64086186c 100755
--- a/configure
+++ b/configure
@@ -2790,7 +2790,6 @@ mdct_select="fft"
 me_cmp_select="idctdsp"
 mpeg_er_select="error_resilience"
 mpegaudio_select="mpegaudiodsp mpegaudioheader"
-mpegaudiodsp_select="dct"
 mpegvideo_select="blockdsp hpeldsp idctdsp videodsp"
 mpegvideodec_select="h264chroma mpegvideo mpeg_er"
 mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index cae2e773a1..0a3a8fcdf9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -134,7 +134,8 @@ OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodec_common.o \
 OBJS-$(CONFIG_MPEGAUDIODSP)            += mpegaudiodsp.o                \
                                           mpegaudiodsp_data.o           \
                                           mpegaudiodsp_fixed.o          \
-                                          mpegaudiodsp_float.o
+                                          mpegaudiodsp_float.o          \
+                                          dct32_fixed.o dct32_float.o
 OBJS-$(CONFIG_MPEGAUDIOHEADER)         += mpegaudiodecheader.o mpegaudiotabs.o
 OBJS-$(CONFIG_MPEG4AUDIO)              += mpeg4audio.o mpeg4audio_sample_rates.o
 OBJS-$(CONFIG_MPEGVIDEO)               += mpegvideo.o rl.o \
diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c
index 5a5a679d91..0971c28734 100644
--- a/libavcodec/mpegaudiodsp.c
+++ b/libavcodec/mpegaudiodsp.c
@@ -23,7 +23,6 @@
 #include "libavutil/thread.h"
 #include "mpegaudio.h"
 #include "mpegaudiodsp.h"
-#include "dct.h"
 #include "dct32.h"
 
 static AVOnce mpadsp_table_init = AV_ONCE_INIT;
@@ -81,15 +80,12 @@ static av_cold void mpadsp_init_tabs(void)
 
 av_cold void ff_mpadsp_init(MPADSPContext *s)
 {
-    DCTContext dct;
-
-    ff_dct_init(&dct, 5, DCT_II);
     ff_thread_once(&mpadsp_table_init, &mpadsp_init_tabs);
 
     s->apply_window_float = ff_mpadsp_apply_window_float;
     s->apply_window_fixed = ff_mpadsp_apply_window_fixed;
 
-    s->dct32_float = dct.dct32;
+    s->dct32_float = ff_dct32_float;
     s->dct32_fixed = ff_dct32_fixed;
 
     s->imdct36_blocks_float = ff_imdct36_blocks_float;
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index b4cc5e0d08..2ceb88968f 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -126,7 +126,7 @@ X86ASM-OBJS-$(CONFIG_LLVIDDSP)         += x86/lossless_videodsp.o
 X86ASM-OBJS-$(CONFIG_LLVIDENCDSP)      += x86/lossless_videoencdsp.o
 X86ASM-OBJS-$(CONFIG_LPC)              += x86/lpc.o
 X86ASM-OBJS-$(CONFIG_ME_CMP)           += x86/me_cmp.o
-X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP)     += x86/imdct36.o
+X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP)     += x86/dct32.o x86/imdct36.o
 X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC)     += x86/mpegvideoencdsp.o
 X86ASM-OBJS-$(CONFIG_OPUS_DECODER)     += x86/opusdsp.o
 X86ASM-OBJS-$(CONFIG_OPUS_ENCODER)     += x86/celt_pvq_search.o
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index 6586fe0726..43662cd279 100644
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -45,6 +45,9 @@ void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
 void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
                                float *tmpbuf);
 
+void ff_dct32_float_sse2(float *out, const float *in);
+void ff_dct32_float_avx (float *out, const float *in);
+
 DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
 
 #if HAVE_6REGS && HAVE_SSE_INLINE
@@ -267,6 +270,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
 #if HAVE_SSE
     if (EXTERNAL_SSE2(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_sse2;
+        s->dct32_float          = ff_dct32_float_sse2;
     }
     if (EXTERNAL_SSE3(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_sse3;
@@ -279,6 +283,8 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
     if (EXTERNAL_AVX(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_avx;
     }
+    if (EXTERNAL_AVX_FAST(cpu_flags))
+        s->dct32_float          = ff_dct32_float_avx;
 #endif
 #endif /* HAVE_X86ASM */
 }
-- 
2.34.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 06/14] configure: Remove dct, fft, mdct, rdft subsystems

[Andreas Rheinhardt]

This may break some command lines, because the --disable-*
options are no longer recognized.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
This could be squashed together with the preceding commit.

 configure | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/configure b/configure
index 885c58b631..5499da3594 100755
--- a/configure
+++ b/configure
@@ -136,13 +136,9 @@ Component options:
   --disable-w32threads     disable Win32 threads [autodetect]
   --disable-os2threads     disable OS/2 threads [autodetect]
   --disable-network        disable network support [no]
-  --disable-dct            disable DCT code
   --disable-dwt            disable DWT code
   --disable-error-resilience disable error resilience code
   --disable-lsp            disable LSP code
-  --disable-mdct           disable MDCT code
-  --disable-rdft           disable RDFT code
-  --disable-fft            disable FFT code
   --disable-faan           disable floating point AAN (I)DCT code
   --disable-pixelutils     disable pixel utils in libavutil
 
@@ -2004,17 +2000,13 @@ PROGRAM_LIST="
 "
 
 SUBSYSTEM_LIST="
-    dct
     dwt
     error_resilience
     faan
     fast_unaligned
-    fft
     lsp
-    mdct
     pixelutils
     network
-    rdft
 "
 
 # COMPONENT_LIST needs to come last to ensure correct dependency checking
-- 
2.34.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 07/14] avcodec/vorbis: Use void* logctx instead of AVCodecContext*

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/vorbis.c | 8 +++++---
 libavcodec/vorbis.h | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index d0b660b44a..3d85997576 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -27,8 +27,10 @@
  */
 
 #include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/macros.h"
 
-#include "avcodec.h"
 #include "vorbis.h"
 #include "vorbis_data.h"
 
@@ -104,7 +106,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
     return 0;
 }
 
-int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
+int ff_vorbis_ready_floor1_list(void *logctx,
                                 vorbis_floor1_entry *list, int values)
 {
     int i;
@@ -130,7 +132,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
         int j;
         for (j = i + 1; j < values; j++) {
             if (list[i].x == list[j].x) {
-                av_log(avctx, AV_LOG_ERROR,
+                av_log(logctx, AV_LOG_ERROR,
                        "Duplicate value found in floor 1 X coordinates\n");
                 return AVERROR_INVALIDDATA;
             }
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index aa1ec5719d..7190465f0d 100644
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -23,8 +23,6 @@
 
 #include <stdint.h>
 
-#include "avcodec.h"
-
 typedef struct vorbis_floor1_entry {
     uint16_t x;
     uint16_t sort;
@@ -32,7 +30,7 @@ typedef struct vorbis_floor1_entry {
     uint16_t high;
 } vorbis_floor1_entry;
 
-int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
+int ff_vorbis_ready_floor1_list(void *logctx,
                                 vorbis_floor1_entry *list, int values);
 unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n)
 int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);
-- 
2.34.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 07/14] avcodec/vorbis: Use void* logctx instead of AVCodecContext*

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/vorbis.c | 8 +++++---
>  libavcodec/vorbis.h | 4 +---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
> index d0b660b44a..3d85997576 100644
> --- a/libavcodec/vorbis.c
> +++ b/libavcodec/vorbis.c
> @@ -27,8 +27,10 @@
>   */
>  
>  #include "libavutil/common.h"
> +#include "libavutil/error.h"
> +#include "libavutil/log.h"
> +#include "libavutil/macros.h"
>  
> -#include "avcodec.h"
>  #include "vorbis.h"
>  #include "vorbis_data.h"
>  
> @@ -104,7 +106,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
>      return 0;
>  }
>  
> -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
> +int ff_vorbis_ready_floor1_list(void *logctx,
>                                  vorbis_floor1_entry *list, int values)
>  {
>      int i;
> @@ -130,7 +132,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
>          int j;
>          for (j = i + 1; j < values; j++) {
>              if (list[i].x == list[j].x) {
> -                av_log(avctx, AV_LOG_ERROR,
> +                av_log(logctx, AV_LOG_ERROR,
>                         "Duplicate value found in floor 1 X coordinates\n");
>                  return AVERROR_INVALIDDATA;
>              }
> diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
> index aa1ec5719d..7190465f0d 100644
> --- a/libavcodec/vorbis.h
> +++ b/libavcodec/vorbis.h
> @@ -23,8 +23,6 @@
>  
>  #include <stdint.h>
>  
> -#include "avcodec.h"
> -
>  typedef struct vorbis_floor1_entry {
>      uint16_t x;
>      uint16_t sort;
> @@ -32,7 +30,7 @@ typedef struct vorbis_floor1_entry {
>      uint16_t high;
>  } vorbis_floor1_entry;
>  
> -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx,
> +int ff_vorbis_ready_floor1_list(void *logctx,
>                                  vorbis_floor1_entry *list, int values);
>  unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n)
>  int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);

Will apply patches 7-14 tomorrow unless there are objections.

- 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".

[FFmpeg-devel] [PATCH 08/14] avcodec/utvideo: Split UTvideoContext into decoder and encoder contexts

[Andreas Rheinhardt]

In particular the encoder used only a small part of the context:
The new encoder context is only 128B here. It used to be 32992.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/utvideo.h    | 35 +----------------------------------
 libavcodec/utvideodec.c | 28 ++++++++++++++++++++++++++++
 libavcodec/utvideoenc.c | 18 +++++++++++++++++-
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h
index e5160aa394..b081b50a2f 100644
--- a/libavcodec/utvideo.h
+++ b/libavcodec/utvideo.h
@@ -27,12 +27,7 @@
  * Common Ut Video header
  */
 
-#include "libavutil/common.h"
-#include "avcodec.h"
-#include "bswapdsp.h"
-#include "utvideodsp.h"
-#include "lossless_videodsp.h"
-#include "lossless_videoencdsp.h"
+#include "libavutil/macros.h"
 
 enum {
     PRED_NONE = 0,
@@ -61,32 +56,4 @@ enum {
     UTVIDEO_444  = MKTAG('Y', 'V', '2', '4'),
 };
 
-typedef struct UtvideoContext {
-    const AVClass *class;
-    AVCodecContext *avctx;
-    UTVideoDSPContext utdsp;
-    BswapDSPContext bdsp;
-    LLVidDSPContext llviddsp;
-    LLVidEncDSPContext llvidencdsp;
-
-    uint32_t frame_info_size, flags, frame_info, offset;
-    int      planes;
-    int      slices;
-    int      compression;
-    int      interlaced;
-    int      frame_pred;
-    int      pro;
-    int      pack;
-
-    ptrdiff_t slice_stride;
-    uint8_t *slice_bits, *slice_buffer[4];
-    int      slice_bits_size;
-    void    *buffer;
-
-    const uint8_t *packed_stream[4][256];
-    size_t packed_stream_size[4][256];
-    const uint8_t *control_stream[4][256];
-    size_t control_stream_size[4][256];
-} UtvideoContext;
-
 #endif /* AVCODEC_UTVIDEO_H */
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index 7ee07209d4..fa80cc577c 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -37,8 +37,36 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "get_bits.h"
+#include "lossless_videodsp.h"
 #include "thread.h"
 #include "utvideo.h"
+#include "utvideodsp.h"
+
+typedef struct UtvideoContext {
+    const AVClass *class;
+    AVCodecContext *avctx;
+    UTVideoDSPContext utdsp;
+    BswapDSPContext bdsp;
+    LLVidDSPContext llviddsp;
+
+    uint32_t frame_info_size, flags, frame_info, offset;
+    int      planes;
+    int      slices;
+    int      compression;
+    int      interlaced;
+    int      frame_pred;
+    int      pro;
+    int      pack;
+
+    uint8_t *slice_bits;
+    int      slice_bits_size;
+    void    *buffer;
+
+    const uint8_t *packed_stream[4][256];
+    size_t packed_stream_size[4][256];
+    const uint8_t *control_stream[4][256];
+    size_t control_stream_size[4][256];
+} UtvideoContext;
 
 typedef struct HuffEntry {
     uint8_t len;
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c
index 6e87bbc2b6..c2a7728574 100644
--- a/libavcodec/utvideoenc.c
+++ b/libavcodec/utvideoenc.c
@@ -33,11 +33,28 @@
 #include "encode.h"
 #include "bswapdsp.h"
 #include "bytestream.h"
+#include "lossless_videoencdsp.h"
 #include "put_bits.h"
 #include "mathops.h"
 #include "utvideo.h"
 #include "huffman.h"
 
+typedef struct UtvideoContext {
+    const AVClass *class;
+    BswapDSPContext bdsp;
+    LLVidEncDSPContext llvidencdsp;
+
+    uint32_t frame_info_size, flags;
+    int      planes;
+    int      slices;
+    int      compression;
+    int      frame_pred;
+
+    ptrdiff_t slice_stride;
+    uint8_t *slice_bits, *slice_buffer[4];
+    int      slice_bits_size;
+} UtvideoContext;
+
 typedef struct HuffEntry {
     uint16_t sym;
     uint8_t  len;
@@ -76,7 +93,6 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
     int i, subsampled_height;
     uint32_t original_format;
 
-    c->avctx           = avctx;
     c->frame_info_size = 4;
     c->slice_stride    = FFALIGN(avctx->width, 32);
 
-- 
2.34.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 09/14] avcodec/sipr: Remove write-only AVCodecContext*

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/sipr.c | 1 -
 libavcodec/sipr.h | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index 692b59b3e8..3ddc579f09 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -532,7 +532,6 @@ static int sipr_decode_frame(AVCodecContext *avctx, AVFrame *frame,
     int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE;
     int i, ret;
 
-    ctx->avctx = avctx;
     if (avpkt->size < (mode_par->bits_per_frame >> 3)) {
         av_log(avctx, AV_LOG_ERROR,
                "Error processing packet: packet size (%d) too small\n",
diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
index e1ef35d658..e7073987ed 100644
--- a/libavcodec/sipr.h
+++ b/libavcodec/sipr.h
@@ -24,7 +24,6 @@
 #ifndef AVCODEC_SIPR_H
 #define AVCODEC_SIPR_H
 
-#include "avcodec.h"
 #include "acelp_pitch_delay.h"
 #include "libavutil/mem_internal.h"
 
@@ -63,8 +62,6 @@ typedef struct SiprParameters {
 } SiprParameters;
 
 typedef struct SiprContext {
-    AVCodecContext *avctx;
-
     SiprMode mode;
 
     float past_pitch_gain;
-- 
2.34.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 10/14] avcodec/roqvideo: Use void*, not AVCodecContext* for logctx

[Andreas Rheinhardt]

Also stop setting the field once per encode-frame.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/roqvideo.c    | 4 ++--
 libavcodec/roqvideo.h    | 4 ++--
 libavcodec/roqvideodec.c | 8 ++++----
 libavcodec/roqvideoenc.c | 8 +++-----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c
index f9a3c8e083..ca8c8de967 100644
--- a/libavcodec/roqvideo.c
+++ b/libavcodec/roqvideo.c
@@ -111,13 +111,13 @@ static inline void apply_motion_generic(RoqContext *ri, int x, int y, int deltax
     /* check MV against frame boundaries */
     if ((mx < 0) || (mx > ri->width - sz) ||
         (my < 0) || (my > ri->height - sz)) {
-        av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n",
+        av_log(ri->logctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n",
             mx, my, ri->width, ri->height);
         return;
     }
 
     if (!ri->last_frame->data[0]) {
-        av_log(ri->avctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n");
+        av_log(ri->logctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n");
         return;
     }
 
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 8318b6e5a0..2c2e42884d 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -22,7 +22,7 @@
 #ifndef AVCODEC_ROQVIDEO_H
 #define AVCODEC_ROQVIDEO_H
 
-#include "avcodec.h"
+#include "libavutil/frame.h"
 
 typedef struct roq_cell {
     unsigned char y[4];
@@ -39,7 +39,7 @@ typedef struct motion_vect {
 
 typedef struct RoqContext {
     const AVClass *class;
-    AVCodecContext *avctx;
+    void *logctx;
     AVFrame *last_frame;
     AVFrame *current_frame;
     int width, height;
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 6f2e48d2f3..bfc69a65c9 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -72,7 +72,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb)
     xpos = ypos = 0;
 
     if (chunk_size > bytestream2_get_bytes_left(gb)) {
-        av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n");
+        av_log(ri->logctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n");
         chunk_size = bytestream2_get_bytes_left(gb);
     }
 
@@ -80,7 +80,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb)
         for (yp = ypos; yp < ypos + 16; yp += 8)
             for (xp = xpos; xp < xpos + 16; xp += 8) {
                 if (bytestream2_tell(gb) >= chunk_start + chunk_size) {
-                    av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n");
+                    av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n");
                     return;
                 }
                 if (vqflg_pos < 0) {
@@ -114,7 +114,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb)
                         if(k & 0x02) y += 4;
 
                         if (bytestream2_tell(gb) >= chunk_start + chunk_size) {
-                            av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n");
+                            av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n");
                             return;
                         }
                         if (vqflg_pos < 0) {
@@ -169,7 +169,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
 {
     RoqContext *s = avctx->priv_data;
 
-    s->avctx = avctx;
+    s->logctx = avctx;
 
     if (avctx->width % 16 || avctx->height % 16) {
         avpriv_request_sample(avctx, "Dimensions not being a multiple of 16");
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index c25aa39b73..0933abf4f9 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -911,10 +911,10 @@ static int roq_encode_video(RoqEncContext *enc)
     /* Quake 3 can't handle chunks bigger than 65535 bytes */
     if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) {
         if (enc->lambda > 100000) {
-            av_log(roq->avctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n");
+            av_log(roq->logctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n");
             return AVERROR(EINVAL);
         }
-        av_log(roq->avctx, AV_LOG_ERROR,
+        av_log(roq->logctx, AV_LOG_ERROR,
                "Warning, generated a frame too big for Quake (%d > 65535), "
                "now switching to a bigger qscale value.\n",
                tempData->mainChunkSize/8);
@@ -972,7 +972,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx)
 
     av_lfg_init(&enc->randctx, 1);
 
-    roq->avctx = avctx;
+    roq->logctx = avctx;
 
     enc->framesSinceKeyframe = 0;
     if ((avctx->width & 0xf) || (avctx->height & 0xf)) {
@@ -1057,8 +1057,6 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     RoqContext    *const roq = &enc->common;
     int size, ret;
 
-    roq->avctx = avctx;
-
     enc->frame_to_enc = frame;
 
     if (frame->quality)
-- 
2.34.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 11/14] avcodec/opus_silk: Use void* instead of AVCodecContext* as logctx

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/opus_silk.c | 10 +++++-----
 libavcodec/opus_silk.h |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c
index cf8b16acff..27671516a0 100644
--- a/libavcodec/opus_silk.c
+++ b/libavcodec/opus_silk.c
@@ -48,7 +48,7 @@ typedef struct SilkFrame {
 } SilkFrame;
 
 struct SilkContext {
-    AVCodecContext *avctx;
+    void *logctx;
     int output_channels;
 
     int midonly;
@@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc,
 
     if (bandwidth > OPUS_BANDWIDTH_WIDEBAND ||
         coded_channels > 2 || duration_ms > 60) {
-        av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed "
+        av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed "
                "to the SILK decoder.\n");
         return AVERROR(EINVAL);
     }
@@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s)
     memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights));
 }
 
-int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels)
+int ff_silk_init(void *logctx, SilkContext **ps, int output_channels)
 {
     SilkContext *s;
 
     if (output_channels != 1 && output_channels != 2) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n",
+        av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n",
                output_channels);
         return AVERROR(EINVAL);
     }
@@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels)
     if (!s)
         return AVERROR(ENOMEM);
 
-    s->avctx           = avctx;
+    s->logctx          = logctx;
     s->output_channels = output_channels;
 
     ff_silk_flush(s);
diff --git a/libavcodec/opus_silk.h b/libavcodec/opus_silk.h
index 6552c166a4..4b595da2b9 100644
--- a/libavcodec/opus_silk.h
+++ b/libavcodec/opus_silk.h
@@ -23,7 +23,6 @@
 #ifndef AVCODEC_OPUS_SILK_H
 #define AVCODEC_OPUS_SILK_H
 
-#include "avcodec.h"
 #include "opus.h"
 #include "opus_rc.h"
 
@@ -32,7 +31,7 @@
 
 typedef struct SilkContext SilkContext;
 
-int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels);
+int ff_silk_init(void *logctx, SilkContext **ps, int output_channels);
 void ff_silk_free(SilkContext **ps);
 void ff_silk_flush(SilkContext *s);
 
-- 
2.34.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 12/14] avcodec/lagarith: Use void* instead of AVCodecContext* as logctx

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/lagarith.c    | 14 +++++++-------
 libavcodec/lagarithrac.h |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index 3288c0517c..9574f78871 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -166,17 +166,17 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
     /* Read probabilities from bitstream */
     for (i = 1; i < 257; i++) {
         if (lag_decode_prob(gb, &rac->prob[i]) < 0) {
-            av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability encountered.\n");
+            av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability encountered.\n");
             return AVERROR_INVALIDDATA;
         }
         if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) {
-            av_log(rac->avctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n");
+            av_log(rac->logctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n");
             return AVERROR_INVALIDDATA;
         }
         cumul_prob += rac->prob[i];
         if (!rac->prob[i]) {
             if (lag_decode_prob(gb, &prob)) {
-                av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability run encountered.\n");
+                av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability run encountered.\n");
                 return AVERROR_INVALIDDATA;
             }
             if (prob > 256 - i)
@@ -189,7 +189,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
     }
 
     if (!cumul_prob) {
-        av_log(rac->avctx, AV_LOG_ERROR, "All probabilities are 0!\n");
+        av_log(rac->logctx, AV_LOG_ERROR, "All probabilities are 0!\n");
         return AVERROR_INVALIDDATA;
     }
 
@@ -207,7 +207,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
             scaled_cumul_prob += rac->prob[i];
         }
         if (scaled_cumul_prob <= 0) {
-            av_log(rac->avctx, AV_LOG_ERROR, "Scaled probabilities invalid\n");
+            av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities invalid\n");
             return AVERROR_INVALIDDATA;
         }
         for (; i < 257; i++) {
@@ -221,7 +221,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
         cumulative_target = 1U << scale_factor;
 
         if (scaled_cumul_prob > cumulative_target) {
-            av_log(rac->avctx, AV_LOG_ERROR,
+            av_log(rac->logctx, AV_LOG_ERROR,
                    "Scaled probabilities are larger than target!\n");
             return AVERROR_INVALIDDATA;
         }
@@ -463,7 +463,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst,
     const uint8_t *src_end = src + src_size;
     int ret;
 
-    rac.avctx = l->avctx;
+    rac.logctx = l->avctx;
     l->zeros = 0;
 
     if(src_size < 2)
diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h
index a31b054dbb..2c8cb7385a 100644
--- a/libavcodec/lagarithrac.h
+++ b/libavcodec/lagarithrac.h
@@ -32,11 +32,10 @@
 
 #include <stdint.h>
 #include "libavutil/intreadwrite.h"
-#include "avcodec.h"
 #include "get_bits.h"
 
 typedef struct lag_rac {
-    AVCodecContext *avctx;
+    void    *logctx;
     unsigned low;
     unsigned range;
     unsigned scale;             /**< Number of bits of precision in range. */
-- 
2.34.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 13/14] avcodec/flac_parse: Use void* instead of AVCodecContext* as logctx

[Andreas Rheinhardt]

It more directly shows that ff_flac_decode_frame_header() does not
modify the AVCodecContext given to it at all; and it would not be
allowed to do so, given that it is used by the parser when it is
still unknown whether said frame header is even valid.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/flac.c       | 18 +++++++++---------
 libavcodec/flac_parse.h |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 174b4801be..fac4cff9e7 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -48,14 +48,14 @@ static int64_t get_utf8(GetBitContext *gb)
     return val;
 }
 
-int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
+int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb,
                                 FLACFrameInfo *fi, int log_level_offset)
 {
     int bs_code, sr_code, bps_code;
 
     /* frame sync code */
     if ((get_bits(gb, 15) & 0x7FFF) != 0x7FFC) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n");
+        av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n");
         return AVERROR_INVALIDDATA;
     }
 
@@ -75,7 +75,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
         fi->channels = 2;
         fi->ch_mode -= FLAC_MAX_CHANNELS - 1;
     } else {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "invalid channel mode: %d\n", fi->ch_mode);
         return AVERROR_INVALIDDATA;
     }
@@ -83,7 +83,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
     /* bits per sample */
     bps_code = get_bits(gb, 3);
     if (bps_code == 3) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "invalid sample size code (%d)\n",
                bps_code);
         return AVERROR_INVALIDDATA;
@@ -92,7 +92,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
 
     /* reserved bit */
     if (get_bits1(gb)) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "broken stream, invalid padding\n");
         return AVERROR_INVALIDDATA;
     }
@@ -100,14 +100,14 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
     /* sample or frame count */
     fi->frame_or_sample_num = get_utf8(gb);
     if (fi->frame_or_sample_num < 0) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "sample/frame number invalid; utf8 fscked\n");
         return AVERROR_INVALIDDATA;
     }
 
     /* blocksize */
     if (bs_code == 0) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "reserved blocksize code: 0\n");
         return AVERROR_INVALIDDATA;
     } else if (bs_code == 6) {
@@ -128,7 +128,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
     } else if (sr_code == 14) {
         fi->samplerate = get_bits(gb, 16) * 10;
     } else {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "illegal sample rate code %d\n",
                sr_code);
         return AVERROR_INVALIDDATA;
@@ -138,7 +138,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
     skip_bits(gb, 8);
     if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer,
                get_bits_count(gb)/8)) {
-        av_log(avctx, AV_LOG_ERROR + log_level_offset,
+        av_log(logctx, AV_LOG_ERROR + log_level_offset,
                "header crc mismatch\n");
         return AVERROR_INVALIDDATA;
     }
diff --git a/libavcodec/flac_parse.h b/libavcodec/flac_parse.h
index 67a7320bea..b0cbad825e 100644
--- a/libavcodec/flac_parse.h
+++ b/libavcodec/flac_parse.h
@@ -75,13 +75,13 @@ int ff_flac_is_extradata_valid(AVCodecContext *avctx,
 
 /**
  * Validate and decode a frame header.
- * @param      avctx AVCodecContext to use as av_log() context
+ * @param      logctx context for logging
  * @param      gb    GetBitContext from which to read frame header
  * @param[out] fi    frame information
  * @param      log_level_offset  log level offset. can be used to silence error messages.
  * @return non-zero on error, 0 if ok
  */
-int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
+int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb,
                                 FLACFrameInfo *fi, int log_level_offset);
 
 void ff_flac_set_channel_layout(AVCodecContext *avctx, int channels);
-- 
2.34.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 14/14] avcodec/bgmc: Use void* instead of AVCodecContext* as logctx

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/bgmc.c | 4 ++--
 libavcodec/bgmc.h | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c
index 361f7c52e6..0e41a39e00 100644
--- a/libavcodec/bgmc.c
+++ b/libavcodec/bgmc.c
@@ -457,7 +457,7 @@ static uint8_t *bgmc_lut_getp(uint8_t *lut, int *lut_status, int delta)
 
 
 /** Initialize the lookup table arrays */
-av_cold int ff_bgmc_init(AVCodecContext *avctx,
+av_cold int ff_bgmc_init(void *logctx,
                          uint8_t **cf_lut, int **cf_lut_status)
 {
     *cf_lut        = av_malloc(sizeof(**cf_lut)        * LUT_BUFF * 16 * LUT_SIZE);
@@ -465,7 +465,7 @@ av_cold int ff_bgmc_init(AVCodecContext *avctx,
 
     if (!*cf_lut || !*cf_lut_status) {
         ff_bgmc_end(cf_lut, cf_lut_status);
-        av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
+        av_log(logctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
         return AVERROR(ENOMEM);
     } else {
         // initialize lut_status buffer to a value never used to compare against
diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h
index 466df31a2e..81771d4aef 100644
--- a/libavcodec/bgmc.h
+++ b/libavcodec/bgmc.h
@@ -30,11 +30,10 @@
 #define AVCODEC_BGMC_H
 
 
-#include "avcodec.h"
 #include "get_bits.h"
 
 
-int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status);
+int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status);
 
 
 void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status);
-- 
2.34.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 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index e1afcaa586..762311ae51 100755
> --- a/configure
> +++ b/configure
> @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs"
>  wmav1_encoder_select="sinewin wma_freqs"
>  wmav2_decoder_select="sinewin wma_freqs"
>  wmav2_encoder_select="sinewin wma_freqs"
> -wmavoice_decoder_select="lsp rdft dct sinewin"
> +wmavoice_decoder_select="lsp sinewin"
>  wmv1_decoder_select="msmpeg4dec"
>  wmv1_encoder_select="msmpeg4enc"
>  wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"

Unfortunately, patch #5 from this set (the main one) has been rejected
by the mailing list as spam. It is here:
https://github.com/mkver/FFmpeg/commit/e0ad224d4ccd293617c75a8ba6f5e2cda78b7c56
and a branch for these patches is here:
https://github.com/mkver/FFmpeg/commits/fft

- 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 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[Lynne]

Sep 28, 2023, 23:40 by andreas.rheinhardt@outlook.com:

> Andreas Rheinhardt:
>
>> Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>>  configure | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index e1afcaa586..762311ae51 100755
>> --- a/configure
>> +++ b/configure
>> @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs"
>>  wmav1_encoder_select="sinewin wma_freqs"
>>  wmav2_decoder_select="sinewin wma_freqs"
>>  wmav2_encoder_select="sinewin wma_freqs"
>> -wmavoice_decoder_select="lsp rdft dct sinewin"
>> +wmavoice_decoder_select="lsp sinewin"
>>  wmv1_decoder_select="msmpeg4dec"
>>  wmv1_encoder_select="msmpeg4enc"
>>  wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"
>>
>
> Unfortunately, patch #5 from this set (the main one) has been rejected
> by the mailing list as spam. It is here:
> https://github.com/mkver/FFmpeg/commit/e0ad224d4ccd293617c75a8ba6f5e2cda78b7c56
> and a branch for these patches is here:
> https://github.com/mkver/FFmpeg/commits/fft
>

Would you mind awfully letting me be the author on this one? I already had a
patch, but then I got swept up switching mpegaudiodsp to lavu/tx, doing
a better 32-point DCT, and Cooley-Tukey, and VDD, and I forgot to send it.
Would just be nice to see after working on lavu/tx for 4 years now.

The rest of the configure changes, and the SILK change all LGTM.
Can't comment on the rest, but I think they don't need to all be pushed
at the same time.
_______________________________________________
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 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[Andreas Rheinhardt]

Lynne:
> Sep 28, 2023, 23:40 by andreas.rheinhardt@outlook.com:
> 
>> Andreas Rheinhardt:
>>
>>> Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616.
>>>
>>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>>> ---
>>>  configure | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index e1afcaa586..762311ae51 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs"
>>>  wmav1_encoder_select="sinewin wma_freqs"
>>>  wmav2_decoder_select="sinewin wma_freqs"
>>>  wmav2_encoder_select="sinewin wma_freqs"
>>> -wmavoice_decoder_select="lsp rdft dct sinewin"
>>> +wmavoice_decoder_select="lsp sinewin"
>>>  wmv1_decoder_select="msmpeg4dec"
>>>  wmv1_encoder_select="msmpeg4enc"
>>>  wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"
>>>
>>
>> Unfortunately, patch #5 from this set (the main one) has been rejected
>> by the mailing list as spam. It is here:
>> https://github.com/mkver/FFmpeg/commit/e0ad224d4ccd293617c75a8ba6f5e2cda78b7c56
>> and a branch for these patches is here:
>> https://github.com/mkver/FFmpeg/commits/fft
>>
> 
> Would you mind awfully letting me be the author on this one? I already had a
> patch, but then I got swept up switching mpegaudiodsp to lavu/tx, doing
> a better 32-point DCT, and Cooley-Tukey, and VDD, and I forgot to send it.
> Would just be nice to see after working on lavu/tx for 4 years now.
> 

If you have a patch, why don't you send it now? There is really no need
for this code to be recompiled and relinked all the time.

> The rest of the configure changes, and the SILK change all LGTM.
> Can't comment on the rest, but I think they don't need to all be pushed
> at the same time.

_______________________________________________
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 01/14] configure: Remove obsolete wmavoice->rdft, dct dependencies

[Lynne]

Sep 29, 2023, 00:10 by andreas.rheinhardt@outlook.com:

> Lynne:
>
>> Sep 28, 2023, 23:40 by andreas.rheinhardt@outlook.com:
>>
>>> Andreas Rheinhardt:
>>>
>>>> Forgotten in a810126501e1ef0992d765720ff0d2629c5d1616.
>>>>
>>>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>>>> ---
>>>>  configure | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/configure b/configure
>>>> index e1afcaa586..762311ae51 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -3033,7 +3033,7 @@ wmav1_decoder_select="sinewin wma_freqs"
>>>>  wmav1_encoder_select="sinewin wma_freqs"
>>>>  wmav2_decoder_select="sinewin wma_freqs"
>>>>  wmav2_encoder_select="sinewin wma_freqs"
>>>> -wmavoice_decoder_select="lsp rdft dct sinewin"
>>>> +wmavoice_decoder_select="lsp sinewin"
>>>>  wmv1_decoder_select="msmpeg4dec"
>>>>  wmv1_encoder_select="msmpeg4enc"
>>>>  wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp"
>>>>
>>>
>>> Unfortunately, patch #5 from this set (the main one) has been rejected
>>> by the mailing list as spam. It is here:
>>> https://github.com/mkver/FFmpeg/commit/e0ad224d4ccd293617c75a8ba6f5e2cda78b7c56
>>> and a branch for these patches is here:
>>> https://github.com/mkver/FFmpeg/commits/fft
>>>
>>
>> Would you mind awfully letting me be the author on this one? I already had a
>> patch, but then I got swept up switching mpegaudiodsp to lavu/tx, doing
>> a better 32-point DCT, and Cooley-Tukey, and VDD, and I forgot to send it.
>> Would just be nice to see after working on lavu/tx for 4 years now.
>>
>
> If you have a patch, why don't you send it now? There is really no need
> for this code to be recompiled and relinked all the time?
>

Your patch is pretty much what my patches did, except
you wrap dct32, while I get rid of it, and I also did it one
component at a time rather than getting rid of all of it
at once. I have no objection with the way this is done either way.

I'd just like some credit for deleting something I spent
years researching and replacing. After all, it's easy to remove
entire files at once and being first, but less so figuring out how
to write fast and reasonably small DCT-I/DST-I transforms.
_______________________________________________
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".