- MPlayer-cvslog - lists.mplayerhq.hu

r38405 - trunk/configure
by reimar 06 Oct '22

06 Oct '22

Author: reimar Date: Thu Oct 6 10:13:46 2022 New Revision: 38405 Log: configure: fix compilation against latest FFmpeg. Add LASX cpu extension defines. It is however always disabled currently. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Sep 2 11:39:52 2022 (r38404) +++ trunk/configure Thu Oct 6 10:13:46 2022 (r38405) @@ -3412,7 +3412,7 @@ if arm ; then fi intrinsics="none" -cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 AVX512ICL FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON INTRINSICS_NEON IWMMXT MMI VIS MVI LASX' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"

1 0

r38404 - trunk/configure
by reimar 02 Sep '22

02 Sep '22

Author: reimar Date: Fri Sep 2 11:39:52 2022 New Revision: 38404 Log: configure: revert previous change. It was nonsense (probably was using the wrong checkout) and contained completely unrelated changes. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Sep 1 21:18:04 2022 (r38403) +++ trunk/configure Fri Sep 2 11:39:52 2022 (r38404) @@ -576,7 +576,6 @@ Miscellaneous options: --with-install=PATH path to a custom install program Advanced options: - --enable-openmp-simd enable code optimization via OpenMP SIMD [disabled] --enable-mmx enable MMX [autodetect] --enable-mmxext enable MMX2 (Pentium III, Athlon) [autodetect] --enable-3dnow enable 3DNow! [autodetect] @@ -636,7 +635,6 @@ exit 0 # GOTCHA: the variables below defines the default behavior for autodetection # and have - unless stated otherwise - at least 2 states : yes no # If autodetection is available then the third state is: auto -openmp_simd=no _mmx=auto _3dnow=auto _3dnowext=auto @@ -1432,8 +1430,6 @@ for ac_option do --enable-win32dll) _win32dll=yes ;; --disable-win32dll) _win32dll=no ;; - --enable-openmp-simd) openmp_simd=yes ;; - --disable-openmp-simd) openmp_simd=no ;; --enable-sse) _sse=yes ;; --disable-sse) _sse=no ;; --enable-sse2) _sse2=yes ;; @@ -1596,8 +1592,8 @@ list_subparts_filters() { } echocheck "ffmpeg/libavcodec/allcodecs.c" -libavdecoders_all=$(list_subparts_extern AVCodec decoder codec/allcodecs.c) -libavencoders_all=$(list_subparts_extern AVCodec encoder codec/allcodecs.c) +libavdecoders_all=$(list_subparts_extern FFCodec decoder codec/allcodecs.c) +libavencoders_all=$(list_subparts_extern FFCodec encoder codec/allcodecs.c) libavparsers_all=$(list_subparts_extern AVCodecParser parser codec/parsers.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" @@ -1615,7 +1611,7 @@ test $? -eq 0 && _list_subparts=found || echores "$_list_subparts" echocheck "ffmpeg/libavcodec/bitsteram_filters.c" -libavbsfs_all=$(list_subparts_extern AVBitStreamFilter bsf codec/bitstream_filters.c) +libavbsfs_all=$(list_subparts_extern FFBitStreamFilter bsf codec/bitstream_filters.c) test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found" echores "$_list_subparts_extern" @@ -5748,9 +5744,7 @@ inc_tmp="" ld_tmp="" def_sdl_sdl_h="#undef CONFIG_SDL_SDL_H" if test -z "$_sdlconfig" ; then - if false && ( sdl2-config --version ) >>"$TMPLOG" 2>&1 ; then - _sdlconfig="sdl2-config" - elif ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then + if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then _sdlconfig="sdl-config" else _sdlconfig=false @@ -5860,11 +5854,7 @@ int main(int argc, char *argv[]) { HDC dc; wglCreateContext(dc); #elif defined(GL_SDL) -#if SDL_VERSION_ATLEAST(2, 0, 0) - SDL_GL_SwapWindow(NULL); -#else SDL_GL_SwapBuffers(); -#endif #elif defined(GL_EGL_X11) || defined(GL_EGL_ANDROID) EGLDisplay eglDisplay = EGL_NO_DISPLAY; eglInitialize(eglDisplay, NULL, NULL); @@ -8283,46 +8273,6 @@ else fi fi -# Adding -fopenmp might interfere with some tests like pthread. -# Could also be worked around by adding -fopenmp to the linking -# step, but we'd like to avoid that. -echocheck "OpenMP SIMD" -if test "$openmp_simd" = auto || test "$openmp_simd" = yes; then - cat > $TMPC << EOF -#ifndef _OPENMP -#error _OPENMP is not defined -#endif -void test(unsigned char *c) -{ - _Pragma("omp simd") - for (int i = 0; i < 256; i++) - { - c[i] *= 16; - } -} -int main() -{ - return 0; -} -EOF - if cc_check -fopenmp ; then - CFLAGS="$CFLAGS -fopenmp" - openmp_simd="yes" - elif cc_check -Xpreprocessor -fopenmp ; then - CFLAGS="$CFLAGS -Xpreprocessor -fopenmp" - openmp_simd="yes" - else - test "$openmp_simd" = auto || die "Could not enable OpenMP SIMD support" - openmp_simd="no" - fi -fi -if test "$openmp_simd" = yes ; then - def_openmp_simd='#define HAVE_OPENMP_SIMD 1' -else - def_openmp_simd='#define HAVE_OPENMP_SIMD 0' -fi -echores "$openmp_simd" - ############################################################################# echocheck "automatic gdb attach" @@ -9559,7 +9509,6 @@ $def_x264_lavc $def_xvid_lavc /* system features */ -$def_openmp_simd $def_fast_64bit $def_fast_unaligned $def_gnu_as @@ -9645,7 +9594,6 @@ $def_openssl #define CONFIG_MEMORY_POISONING 0 #define CONFIG_POWERPC_PERF 0 #define CONFIG_MACOS_KPERF 0 -#define CONFIG_OSSFUZZ 0 /* For now prefer speed over avoiding potential invalid reads */ #define CONFIG_SAFE_BITSTREAM_READER 0 #define CONFIG_SHARED 0 @@ -9887,9 +9835,9 @@ print_enabled_filters(){ cp $TMPH ffmpeg/$file } -print_enabled_components libavcodec/codec_list.c AVCodec codec_list $libavdecoders $libavencoders +print_enabled_components libavcodec/codec_list.c FFCodec codec_list $libavdecoders $libavencoders print_enabled_components libavcodec/parser_list.c AVCodecParser parser_list $libavparsers -print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs +print_enabled_components libavcodec/bsf_list.c FFBitStreamFilter bitstream_filters $libavbsfs print_enabled_components libavdevice/indev_list.c AVInputFormat indev_list "" print_enabled_components libavdevice/outdev_list.c AVOutputFormat outdev_list "" print_enabled_components libavformat/demuxer_list.c AVInputFormat demuxer_list $libavdemuxers

1 0

r38403 - trunk/libmpcodecs/dec_video.c
by reimar 01 Sep '22

01 Sep '22

Author: reimar Date: Thu Sep 1 21:18:04 2022 New Revision: 38403 Log: dec_video.c: Fix use after free introduced by recent leak fix. Decoders must be freed before filters, or we might end up using the freed images owned by filters. Modified: trunk/libmpcodecs/dec_video.c Modified: trunk/libmpcodecs/dec_video.c ============================================================================== --- trunk/libmpcodecs/dec_video.c Thu Sep 1 21:12:17 2022 (r38402) +++ trunk/libmpcodecs/dec_video.c Thu Sep 1 21:18:04 2022 (r38403) @@ -173,12 +173,7 @@ int get_current_video_decoder_lag(sh_vid void uninit_video(sh_video_t *sh_video) { - if (sh_video->vfilter) { - vf_uninit_filter_chain(sh_video->vfilter); - sh_video->vfilter = NULL; - } - if (!sh_video->initialized) - return; + if (sh_video->initialized) { mp_msg(MSGT_DECVIDEO, MSGL_V, "Uninit video: %s\n", codec_idx2str(sh_video->codec->drv_idx)); mpvdec->uninit(sh_video); mpvdec = NULL; @@ -188,6 +183,13 @@ void uninit_video(sh_video_t *sh_video) #endif eosd_uninit(); sh_video->initialized = 0; + } + // do this after decoders, as it frees the + // mp_image that might still be in use by decoders + if (sh_video->vfilter) { + vf_uninit_filter_chain(sh_video->vfilter); + sh_video->vfilter = NULL; + } } void vfm_help(void)

1 0

r38402 - trunk/libmpcodecs/mp_image.c
by reimar 01 Sep '22

01 Sep '22

Author: reimar Date: Thu Sep 1 21:12:17 2022 New Revision: 38402 Log: mp_image.c: fix allocation size for formats with odd width. At the very least chroma_width might be rounded up. Just allocate for the next larger even width. Modified: trunk/libmpcodecs/mp_image.c Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Thu Sep 1 15:21:18 2022 (r38401) +++ trunk/libmpcodecs/mp_image.c Thu Sep 1 21:12:17 2022 (r38402) @@ -51,8 +51,12 @@ void mp_image_alloc_planes(mp_image_t *m } mpi->planes[0]=av_malloc(mpi->bpp*mpi->width*(mpi->height+2)/8+ mpi->chroma_width*mpi->chroma_height); - } else - mpi->planes[0]=av_malloc(mpi->bpp*mpi->width*(mpi->height+2)/8); + } else { + // for odd width round up to be on the safe side, + // required in particular for planar formats + int alloc_w = mpi->width + (mpi->width & 1); + mpi->planes[0]=av_malloc(mpi->bpp*alloc_w*(mpi->height+2)/8); + } if (mpi->flags&MP_IMGFLAG_PLANAR) { int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1; // YV12/I420/YVU9/IF09. feel free to add other planar formats here...

1 0

r38401 - trunk/configure
by reimar 01 Sep '22

01 Sep '22

Author: reimar Date: Thu Sep 1 15:21:18 2022 New Revision: 38401 Log: configure: update for latest FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Aug 30 23:40:03 2022 (r38400) +++ trunk/configure Thu Sep 1 15:21:18 2022 (r38401) @@ -576,6 +576,7 @@ Miscellaneous options: --with-install=PATH path to a custom install program Advanced options: + --enable-openmp-simd enable code optimization via OpenMP SIMD [disabled] --enable-mmx enable MMX [autodetect] --enable-mmxext enable MMX2 (Pentium III, Athlon) [autodetect] --enable-3dnow enable 3DNow! [autodetect] @@ -635,6 +636,7 @@ exit 0 # GOTCHA: the variables below defines the default behavior for autodetection # and have - unless stated otherwise - at least 2 states : yes no # If autodetection is available then the third state is: auto +openmp_simd=no _mmx=auto _3dnow=auto _3dnowext=auto @@ -1430,6 +1432,8 @@ for ac_option do --enable-win32dll) _win32dll=yes ;; --disable-win32dll) _win32dll=no ;; + --enable-openmp-simd) openmp_simd=yes ;; + --disable-openmp-simd) openmp_simd=no ;; --enable-sse) _sse=yes ;; --disable-sse) _sse=no ;; --enable-sse2) _sse2=yes ;; @@ -1592,8 +1596,8 @@ list_subparts_filters() { } echocheck "ffmpeg/libavcodec/allcodecs.c" -libavdecoders_all=$(list_subparts_extern FFCodec decoder codec/allcodecs.c) -libavencoders_all=$(list_subparts_extern FFCodec encoder codec/allcodecs.c) +libavdecoders_all=$(list_subparts_extern AVCodec decoder codec/allcodecs.c) +libavencoders_all=$(list_subparts_extern AVCodec encoder codec/allcodecs.c) libavparsers_all=$(list_subparts_extern AVCodecParser parser codec/parsers.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" @@ -1611,7 +1615,7 @@ test $? -eq 0 && _list_subparts=found || echores "$_list_subparts" echocheck "ffmpeg/libavcodec/bitsteram_filters.c" -libavbsfs_all=$(list_subparts_extern FFBitStreamFilter bsf codec/bitstream_filters.c) +libavbsfs_all=$(list_subparts_extern AVBitStreamFilter bsf codec/bitstream_filters.c) test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found" echores "$_list_subparts_extern" @@ -5744,7 +5748,9 @@ inc_tmp="" ld_tmp="" def_sdl_sdl_h="#undef CONFIG_SDL_SDL_H" if test -z "$_sdlconfig" ; then - if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then + if false && ( sdl2-config --version ) >>"$TMPLOG" 2>&1 ; then + _sdlconfig="sdl2-config" + elif ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then _sdlconfig="sdl-config" else _sdlconfig=false @@ -5854,7 +5860,11 @@ int main(int argc, char *argv[]) { HDC dc; wglCreateContext(dc); #elif defined(GL_SDL) +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_GL_SwapWindow(NULL); +#else SDL_GL_SwapBuffers(); +#endif #elif defined(GL_EGL_X11) || defined(GL_EGL_ANDROID) EGLDisplay eglDisplay = EGL_NO_DISPLAY; eglInitialize(eglDisplay, NULL, NULL); @@ -8273,6 +8283,46 @@ else fi fi +# Adding -fopenmp might interfere with some tests like pthread. +# Could also be worked around by adding -fopenmp to the linking +# step, but we'd like to avoid that. +echocheck "OpenMP SIMD" +if test "$openmp_simd" = auto || test "$openmp_simd" = yes; then + cat > $TMPC << EOF +#ifndef _OPENMP +#error _OPENMP is not defined +#endif +void test(unsigned char *c) +{ + _Pragma("omp simd") + for (int i = 0; i < 256; i++) + { + c[i] *= 16; + } +} +int main() +{ + return 0; +} +EOF + if cc_check -fopenmp ; then + CFLAGS="$CFLAGS -fopenmp" + openmp_simd="yes" + elif cc_check -Xpreprocessor -fopenmp ; then + CFLAGS="$CFLAGS -Xpreprocessor -fopenmp" + openmp_simd="yes" + else + test "$openmp_simd" = auto || die "Could not enable OpenMP SIMD support" + openmp_simd="no" + fi +fi +if test "$openmp_simd" = yes ; then + def_openmp_simd='#define HAVE_OPENMP_SIMD 1' +else + def_openmp_simd='#define HAVE_OPENMP_SIMD 0' +fi +echores "$openmp_simd" + ############################################################################# echocheck "automatic gdb attach" @@ -9509,6 +9559,7 @@ $def_x264_lavc $def_xvid_lavc /* system features */ +$def_openmp_simd $def_fast_64bit $def_fast_unaligned $def_gnu_as @@ -9594,6 +9645,7 @@ $def_openssl #define CONFIG_MEMORY_POISONING 0 #define CONFIG_POWERPC_PERF 0 #define CONFIG_MACOS_KPERF 0 +#define CONFIG_OSSFUZZ 0 /* For now prefer speed over avoiding potential invalid reads */ #define CONFIG_SAFE_BITSTREAM_READER 0 #define CONFIG_SHARED 0 @@ -9835,9 +9887,9 @@ print_enabled_filters(){ cp $TMPH ffmpeg/$file } -print_enabled_components libavcodec/codec_list.c FFCodec codec_list $libavdecoders $libavencoders +print_enabled_components libavcodec/codec_list.c AVCodec codec_list $libavdecoders $libavencoders print_enabled_components libavcodec/parser_list.c AVCodecParser parser_list $libavparsers -print_enabled_components libavcodec/bsf_list.c FFBitStreamFilter bitstream_filters $libavbsfs +print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs print_enabled_components libavdevice/indev_list.c AVInputFormat indev_list "" print_enabled_components libavdevice/outdev_list.c AVOutputFormat outdev_list "" print_enabled_components libavformat/demuxer_list.c AVInputFormat demuxer_list $libavdemuxers

1 0

r38400 - in trunk/libmpcodecs: ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c ve_vfw.c ve_x264.c ve_xvid4.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 23:40:03 2022 New Revision: 38400 Log: libmpcodecs/ve_*.c: fix put_image prototypes. An extra endpts argument was added, and while none of the encoders uses that currently, the functions should have the proper types. Modified: trunk/libmpcodecs/ve_lavc.c trunk/libmpcodecs/ve_libdv.c trunk/libmpcodecs/ve_nuv.c trunk/libmpcodecs/ve_qtvideo.c trunk/libmpcodecs/ve_raw.c trunk/libmpcodecs/ve_vfw.c trunk/libmpcodecs/ve_x264.c trunk/libmpcodecs/ve_xvid4.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_lavc.c Tue Aug 30 23:40:03 2022 (r38400) @@ -710,7 +710,7 @@ static double psnr(double d){ return -10.0*log(d)/log(10); } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ AVFrame *pic= vf->priv->pic; pic->data[0]=mpi->planes[0]; Modified: trunk/libmpcodecs/ve_libdv.c ============================================================================== --- trunk/libmpcodecs/ve_libdv.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_libdv.c Tue Aug 30 23:40:03 2022 (r38400) @@ -88,7 +88,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ dv_encode_full_frame(vf->priv->enc, mpi->planes, (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb, Modified: trunk/libmpcodecs/ve_nuv.c ============================================================================== --- trunk/libmpcodecs/ve_nuv.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_nuv.c Tue Aug 30 23:40:03 2022 (r38400) @@ -120,7 +120,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ uint8_t *header = vf->priv->buffer; uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; Modified: trunk/libmpcodecs/ve_qtvideo.c ============================================================================== --- trunk/libmpcodecs/ve_qtvideo.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_qtvideo.c Tue Aug 30 23:40:03 2022 (r38400) @@ -188,7 +188,7 @@ static int query_format(struct vf_instan static int codec_initialized = 0; -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ OSErr cres; long framesizemax; Modified: trunk/libmpcodecs/ve_raw.c ============================================================================== --- trunk/libmpcodecs/ve_raw.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_raw.c Tue Aug 30 23:40:03 2022 (r38400) @@ -150,7 +150,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { mux_v->buffer = mpi->planes[0]; muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts); return 1; Modified: trunk/libmpcodecs/ve_vfw.c ============================================================================== --- trunk/libmpcodecs/ve_vfw.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_vfw.c Tue Aug 30 23:40:03 2022 (r38400) @@ -303,7 +303,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ long flags=0; int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack Modified: trunk/libmpcodecs/ve_x264.c ============================================================================== --- trunk/libmpcodecs/ve_x264.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_x264.c Tue Aug 30 23:40:03 2022 (r38400) @@ -62,7 +62,6 @@ typedef struct h264_module_t { static x264_param_t param; static int parse_error = 0; -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in); void x264enc_set_param(const m_option_t* opt, char* arg) @@ -234,7 +233,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { h264_module_t *mod=(h264_module_t*)vf->priv; int i; Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_xvid4.c Tue Aug 30 23:40:03 2022 (r38400) @@ -523,7 +523,7 @@ query_format(struct vf_instance *vf, uns *==========================================================================*/ static int -put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { int size; xvid_enc_stats_t stats;

1 0

r38399 - in trunk: libmpdemux/muxer.c libmpdemux/muxer.h mencoder.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 23:26:51 2022 New Revision: 38399 Log: mencoder.c/muxer.c: add functions to close and free muxer. Makes behaviour clearer than mencoder using low-level functions directly and frees some more memory before exit to make leaks easier to spot. Modified: trunk/libmpdemux/muxer.c trunk/libmpdemux/muxer.h trunk/mencoder.c Modified: trunk/libmpdemux/muxer.c ============================================================================== --- trunk/libmpdemux/muxer.c Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/libmpdemux/muxer.c Tue Aug 30 23:26:51 2022 (r38399) @@ -69,6 +69,34 @@ fail: return NULL; } +off_t muxer_close(muxer_t *muxer) +{ + off_t size; + /* flush muxer just in case, this is a no-op unless + * we created a stream but never wrote frames to it... */ + muxer_flush(muxer); + if (muxer->cont_write_index) muxer_write_index(muxer); + size=stream_tell(muxer->stream); + stream_seek(muxer->stream,0); + if (muxer->cont_write_header) muxer_write_header(muxer); // update header + return size; +} + +void muxer_free(muxer_t *muxer) +{ + int num; + for (num = 0; muxer->streams[num]; ++num) { + free(muxer->streams[num]->priv); + muxer->streams[num]->priv = NULL; + free(muxer->streams[num]); + muxer->streams[num] = NULL; + } + free(muxer->idx); + muxer->idx = NULL; + muxer->idx_size = 0; + free(muxer); +} + /* Flush the internal muxer buffer. * This is normally called from muxer_write_chunk() once all streams * have seen frames. */ Modified: trunk/libmpdemux/muxer.h ============================================================================== --- trunk/libmpdemux/muxer.h Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/libmpdemux/muxer.h Tue Aug 30 23:26:51 2022 (r38399) @@ -133,6 +133,8 @@ extern const m_option_t mpegopts_conf[]; extern const m_option_t nuvopts_conf[]; muxer_t *muxer_new_muxer(int type,stream_t *stream); +off_t muxer_close(muxer_t *muxer); +void muxer_free(muxer_t *muxer); void muxer_flush(muxer_t *m); #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a) #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a) Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/mencoder.c Tue Aug 30 23:26:51 2022 (r38399) @@ -1699,13 +1699,7 @@ if(aencoder) if(aencoder->fixup) aencoder->fixup(aencoder); -/* flush muxer just in case, this is a no-op unless - * we created a stream but never wrote frames to it... */ -muxer_flush(muxer); -if (muxer->cont_write_index) muxer_write_index(muxer); -muxer_f_size=stream_tell(muxer->stream); -stream_seek(muxer->stream,0); -if (muxer->cont_write_header) muxer_write_header(muxer); // update header +muxer_f_size=muxer_close(muxer); #if 0 if(ferror(muxer_f) || fclose(muxer_f) != 0) { mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); @@ -1730,6 +1724,9 @@ if(sh_audio) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); +muxer_free(muxer); +muxer=NULL; +mux_v=mux_a=NULL; m_config_free(mconfig); m_entry_list_free(filelist); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; }

1 0

r38398 - trunk/mencoder.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:48:45 2022 New Revision: 38398 Log: mencoder.c: free options list and output stream. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Tue Aug 30 22:40:47 2022 (r38397) +++ trunk/mencoder.c Tue Aug 30 22:48:45 2022 (r38398) @@ -1730,11 +1730,13 @@ if(sh_audio) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); +m_config_free(mconfig); m_entry_list_free(filelist); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } if(sh_video){ uninit_video(sh_video);sh_video=NULL; } if(demuxer) free_demuxer(demuxer); if(stream) free_stream(stream); // kill cache thread +if(ostream) free_stream(ostream); // Do not free mux_v->buffer, it may have been overwritten // with something we should not free. if(mux_v) free(mux_v_buffer);

1 0

r38397 - trunk/mpcommon.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:40:47 2022 New Revision: 38397 Log: mpcommon.c: free vo_spudec on common_uninit. mplayer frees it separately so it makes no difference (but does not hurt either), but it fixes a memleak for mencoder. Modified: trunk/mpcommon.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Tue Aug 30 22:27:29 2022 (r38396) +++ trunk/mpcommon.c Tue Aug 30 22:40:47 2022 (r38397) @@ -643,6 +643,8 @@ int common_init(void) void common_uninit(void) { + spudec_free(vo_spudec); + vo_spudec = NULL; #ifdef CONFIG_FREETYPE current_module = "uninit_font"; if (sub_font && sub_font != vo_font)

1 0

r38396 - in trunk/libmpcodecs: vf.c vf_ass.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:27:29 2022 New Revision: 38396 Log: vf.c: Fix minor memleak in filters. When filters use vf_opts, vf.c allocates vf->priv. Most filters then free it in uninit. However when there is no uninit function, vf.c must free it. Also fix vf_ass.c to free vf->priv in its uninit. Modified: trunk/libmpcodecs/vf.c trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Tue Aug 30 22:24:16 2022 (r38395) +++ trunk/libmpcodecs/vf.c Tue Aug 30 22:27:29 2022 (r38396) @@ -770,6 +770,7 @@ vf_instance_t* append_filters(vf_instanc void vf_uninit_filter(vf_instance_t* vf){ if(vf->uninit) vf->uninit(vf); + else free(vf->priv); free_mp_image(vf->imgctx.static_images[0]); free_mp_image(vf->imgctx.static_images[1]); free_mp_image(vf->imgctx.temp_images[0]); Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Tue Aug 30 22:24:16 2022 (r38395) +++ trunk/libmpcodecs/vf_ass.c Tue Aug 30 22:27:29 2022 (r38396) @@ -879,6 +879,7 @@ static void uninit(struct vf_instance *v for (i = 0; i < MP_MAX_PLANES; i++) av_free(vf->priv->alphas[i]); av_free(vf->priv->dirty_rows); + free(vf->priv); } static const unsigned int fmt_list[] = {

1 0