June 2020 - MPlayer-cvslog - lists.mplayerhq.hu

r38192 - in trunk: configure libmpdemux/video.c loader/win32.c sub/sub.c
by reimar 14 Jun '20

14 Jun '20

Author: reimar Date: Sun Jun 14 20:55:21 2020 New Revision: 38192 Log: Remove usage of memalign. Switch to av_malloc instead. Only vo_vesa remains using memalign as it requests 64-byte alignment, which is more than av_malloc provides. The fallback for memalign has been plain malloc, which meant crashes on e.g. Win32 where malloc is not sufficiently aligned. Modified: trunk/configure trunk/libmpdemux/video.c trunk/loader/win32.c trunk/sub/sub.c Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jun 6 18:13:32 2020 (r38191) +++ trunk/configure Sun Jun 14 20:55:21 2020 (r38192) @@ -3988,8 +3988,6 @@ if test "$_memalign" = yes ; then def_memalign='#define HAVE_MEMALIGN 1' else def_memalign='#define HAVE_MEMALIGN 0' - def_map_memalign='#define memalign(a, b) malloc(b)' - darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' fi echores "$_memalign" @@ -9008,7 +9006,6 @@ $def_glob $def_gmtime_r $def_langinfo $def_localtime_r -$def_map_memalign $def_memalign $def_nanosleep $def_posix_select @@ -9036,7 +9033,6 @@ $def_kstat $def_macosx_bundle $def_macosx_finder $def_maemo -$def_memalign_hack $def_path_max_check $def_priority $def_quicktime Modified: trunk/libmpdemux/video.c ============================================================================== --- trunk/libmpdemux/video.c Sat Jun 6 18:13:32 2020 (r38191) +++ trunk/libmpdemux/video.c Sun Jun 14 20:55:21 2020 (r38192) @@ -134,7 +134,7 @@ switch(video_codec){ } mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); if(!videobuffer) { - videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); @@ -229,7 +229,7 @@ switch(video_codec){ } mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); if(!videobuffer) { - videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); @@ -275,7 +275,7 @@ switch(video_codec){ case VIDEO_HEVC: { videobuf_len=0; videobuf_code_len=0; if(!videobuffer) { - videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); @@ -306,7 +306,7 @@ mpeg_header_parser: mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); // ========= Read & process sequence header & extension ============ if(!videobuffer) { - videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); @@ -374,7 +374,7 @@ mpeg_header_parser: } mp_msg(MSGT_DECVIDEO,MSGL_INFO,"found\n"); if(!videobuffer) { - videobuffer = memalign(8, VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + videobuffer = av_malloc(VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Sat Jun 6 18:13:32 2020 (r38191) +++ trunk/loader/win32.c Sun Jun 14 20:55:21 2020 (r38192) @@ -351,7 +351,7 @@ void* mreq_private(int size, int to_zero void* mreq_private(int size, int to_zero, int type) { int nsize = size + sizeof(alloc_header); - alloc_header* header = memalign(16, nsize); + alloc_header* header = av_malloc(nsize); if (!header) return 0; if (to_zero) @@ -436,7 +436,7 @@ static int my_release(void* memory) return 0; #endif //memset(header + 1, 0xcc, header->size); - free(header); + av_free(header); return 0; } #endif Modified: trunk/sub/sub.c ============================================================================== --- trunk/sub/sub.c Sat Jun 6 18:13:32 2020 (r38191) +++ trunk/sub/sub.c Sun Jun 14 20:55:21 2020 (r38192) @@ -156,10 +156,10 @@ static void alloc_buf(mp_osd_obj_t* obj) len = obj->stride*(obj->bbox.y2-obj->bbox.y1); if (obj->allocated<len) { obj->allocated = len; - free(obj->bitmap_buffer); - free(obj->alpha_buffer); - obj->bitmap_buffer = memalign(16, len); - obj->alpha_buffer = memalign(16, len); + av_freep(&obj->bitmap_buffer); + av_freep(&obj->alpha_buffer); + obj->bitmap_buffer = av_malloc(len); + obj->alpha_buffer = av_malloc(len); } memset(obj->bitmap_buffer, sub_bg_color, len); memset(obj->alpha_buffer, sub_bg_alpha, len); @@ -1101,8 +1101,8 @@ void free_osd_list(void){ mp_osd_obj_t* obj=vo_osd_list; while(obj){ mp_osd_obj_t* next=obj->next; - free(obj->alpha_buffer); - free(obj->bitmap_buffer); + av_freep(&obj->alpha_buffer); + av_freep(&obj->bitmap_buffer); free(obj); obj=next; }

1 0

r38191 - trunk/sub/osd.c
by reimar 06 Jun '20

06 Jun '20

Author: reimar Date: Sat Jun 6 18:13:32 2020 New Revision: 38191 Log: osd.c: Disable SSE2 optimization on 32-bit Windows. It seems to cause random crashes, and fixing it will take some time as I am not able to reproduce. Modified: trunk/sub/osd.c Modified: trunk/sub/osd.c ============================================================================== --- trunk/sub/osd.c Sat Jun 6 18:13:31 2020 (r38190) +++ trunk/sub/osd.c Sat Jun 6 18:13:32 2020 (r38191) @@ -31,11 +31,6 @@ #include "libmpcodecs/img_format.h" #include "cpudetect.h" -#if !HAVE_EMMINTRIN_H -#undef HAVE_SSE2 -#define HAVE_SSE2 0 -#endif - #if ARCH_X86 && (!HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT) static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF000000000000ULL; @@ -62,10 +57,12 @@ static const unsigned long long mask24hl #define COMPILE_3DNOW #endif -#if HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT +#if HAVE_EMMINTRIN_H && (HAVE_SSE2 || CONFIG_RUNTIME_CPUDETECT) +// crashes on win32 due to alignment issues of unclear cause +#if !defined(_WIN32) || !ARCH_X86_32 #define COMPILE_SSE2 #endif - +#endif #endif /* ARCH_X86 */ #undef HAVE_MMX @@ -175,9 +172,12 @@ void vo_draw_alpha_yv12(int w,int h, uns #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 // ordered by speed / fastest first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) vo_draw_alpha_yv12_SSE2(w, h, src, srca, srcstride, dstbase, dststride); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride); else if(gCpuCaps.has3DNow) vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride); @@ -209,9 +209,12 @@ void vo_draw_alpha_yuy2(int w,int h, uns #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 // ordered by speed / fastest first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) vo_draw_alpha_yuy2_SSE2(w, h, src, srca, srcstride, dstbase, dststride); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride); else if(gCpuCaps.has3DNow) vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride); @@ -243,9 +246,12 @@ void vo_draw_alpha_uyvy(int w,int h, uns #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 // ordered by speed / fastest first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) vo_draw_alpha_uyvy_SSE2(w, h, src, srca, srcstride, dstbase, dststride); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride); else if(gCpuCaps.has3DNow) vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride); @@ -277,9 +283,12 @@ void vo_draw_alpha_rgb24(int w,int h, un #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 // ordered by speed / fastest first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) vo_draw_alpha_rgb24_SSE2(w, h, src, srca, srcstride, dstbase, dststride); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride); else if(gCpuCaps.has3DNow) vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride); @@ -311,9 +320,12 @@ void vo_draw_alpha_rgb32(int w,int h, un #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 // ordered by speed / fastest first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) vo_draw_alpha_rgb32_SSE2(w, h, src, srca, srcstride, dstbase, dststride); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride); else if(gCpuCaps.has3DNow) vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride); @@ -361,10 +373,13 @@ void vo_draw_alpha_init(void){ { #if CONFIG_RUNTIME_CPUDETECT #if ARCH_X86 - // ordered per speed fasterst first - if(HAVE_EMMINTRIN_H && gCpuCaps.hasSSE2) + // ordered per speed fastest first +#ifdef COMPILE_SSE2 + if(gCpuCaps.hasSSE2) mp_msg(MSGT_OSD,MSGL_INFO,"Using SSE2 Optimized OnScreenDisplay\n"); - else if(gCpuCaps.hasMMX2) + else +#endif + if(gCpuCaps.hasMMX2) mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); else if(gCpuCaps.has3DNow) mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n");

1 0

r38190 - trunk/libmenu/menu.c
by reimar 06 Jun '20

06 Jun '20

Author: reimar Date: Sat Jun 6 18:13:31 2020 New Revision: 38190 Log: menu.c: add missing libavutil/mem.h include for DECLARE_ALIGNED Modified: trunk/libmenu/menu.c Modified: trunk/libmenu/menu.c ============================================================================== --- trunk/libmenu/menu.c Sat Jun 6 18:13:29 2020 (r38189) +++ trunk/libmenu/menu.c Sat Jun 6 18:13:31 2020 (r38190) @@ -37,6 +37,7 @@ #include "libmpcodecs/img_format.h" #include "libmpcodecs/mp_image.h" +#include "libavutil/mem.h" #include "m_option.h" #include "m_struct.h" #include "menu.h"

1 0

r38189 - trunk/configure
by reimar 06 Jun '20

06 Jun '20

Author: reimar Date: Sat Jun 6 18:13:29 2020 New Revision: 38189 Log: configure: fix FFmpeg compilation when zlib is not available. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu May 28 21:25:15 2020 (r38188) +++ trunk/configure Sat Jun 6 18:13:29 2020 (r38189) @@ -6611,7 +6611,7 @@ if test "$_zlib" = yes ; then mplayer_encoders="$mplayer_encoders PNG_ENCODER" else def_zlib='#define CONFIG_ZLIB 0' - libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M LSCR MSCC MWSC RASC RSCC SCREENPRESSO SRGC TDSC TSCC ZEROCODEC WCMV') + libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M LSCR MSCC MVHA MWSC RASC RSCC SCREENPRESSO SRGC TDSC TSCC ZEROCODEC WCMV') libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB') fi echores "$_zlib"

1 0