May 2018 - MPlayer-cvslog - lists.mplayerhq.hu

r38109 - trunk/configure
by reimar 06 May '18

06 May '18

Author: reimar Date: Sun May 6 23:08:10 2018 New Revision: 38109 Log: Use thin .a files if possible. Instead of copying all .o files, the .a file just has the symbol index and references to the .o files in thin mode. As we never install the .a files anywhere, that makes more sense for us, reducing disk usage and I/O requirements when building. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun May 6 20:12:31 2018 (r38108) +++ trunk/configure Sun May 6 23:08:10 2018 (r38109) @@ -652,6 +652,9 @@ _ranlib=ranlib _windres=windres _cc=cc _ar=ar +_arflags=rc +# create thin archive to save disk space and I/O +$_ar 2>&1 | grep -q "\[T\] " && _arflags=rcT test "$CC" && _cc="$CC" _as=auto _nm=auto @@ -8375,7 +8378,7 @@ MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir AR = $_ar -ARFLAGS = rc +ARFLAGS = $_arflags AR_O = \$@ AS = $_cc CC = $_cc

1 0

r38108 - trunk/stream/dvb_tune.c
by reimar 06 May '18

06 May '18

Author: reimar Date: Sun May 6 20:12:31 2018 New Revision: 38108 Log: Minor spelling fix. Fix from Debian, by Mateusz Lukasik <mati75 at linuxmint pl> Modified: trunk/stream/dvb_tune.c Modified: trunk/stream/dvb_tune.c ============================================================================== --- trunk/stream/dvb_tune.c Sun May 6 02:15:14 2018 (r38107) +++ trunk/stream/dvb_tune.c Sun May 6 20:12:31 2018 (r38108) @@ -386,7 +386,7 @@ static int tune_it(int fd_frontend, int mp_msg(MSGT_DEMUX, MSGL_V, "tuning DVB-S to Freq: %u, Pol: %c Srate: %d, 22kHz: %s, LNB: %d\n",freq,pol,srate,hi_lo ? "on" : "off", diseqc); if(do_diseqc(dfd, diseqc, (pol == 'V' ? 1 : 0), hi_lo) == 0) - mp_msg(MSGT_DEMUX, MSGL_V, "DISEQC SETTING SUCCEDED\n"); + mp_msg(MSGT_DEMUX, MSGL_V, "DISEQC SETTING SUCCEEDED\n"); else { mp_msg(MSGT_DEMUX, MSGL_ERR, "DISEQC SETTING FAILED\n");

1 0

r38107 - trunk/configure
by al 05 May '18

05 May '18

Author: al Date: Sun May 6 02:15:14 2018 New Revision: 38107 Log: configure: Disable FFmpeg VapourSynth demuxer Enabling the demuxer usually breaks the build as we have no check for VapourSynth. Patch by Erik Auerswald >auerswal unix-ag.uni-kl de< Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat May 5 22:00:22 2018 (r38106) +++ trunk/configure Sun May 6 02:15:14 2018 (r38107) @@ -1614,7 +1614,7 @@ libavfilters=$(echo $libavfilters_all) libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG4_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL H264_MEDIACODEC HEVC_MEDIACODEC MPEG2_MEDIACODEC H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID VP8_MEDIACODEC VP9_MEDIACODEC MPEG4_MEDIACODEC VP8_QSV [A-Z0-9_]*_AT [A-Z0-9]*_RKMPP [A-Z0-9]*_V4L2M2M') libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP [A-Z0-9]*_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI VP9_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT [A-Z0-9]*_V4L2M2M [A-Z0-9]*_AMF') libavbsfs=$(filter_out_component bsf 'TRACE_HEADERS [A-Z0-9_]*_METADATA H264_REDUNDANT_PPS FILTER_UNITS') -libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR') +libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR VAPOURSYNTH') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP') libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT TLS_SCHANNEL') libavfilters=$(filter_out_component filter 'VF_FREI0R[A-Z0-9_]* LIB[A-Z0-9_]* MP VF_OCV')

1 0

r38106 - trunk/cpudetect.c
by reimar 05 May '18

05 May '18

Author: reimar Date: Sat May 5 22:00:22 2018 New Revision: 38106 Log: Use longjmp to test OS SSE support. Note that on modern Linux version we could really just assume it to be present. Fixes trac issue #2343. Modified: trunk/cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Tue May 1 15:44:49 2018 (r38105) +++ trunk/cpudetect.c Sat May 5 22:00:22 2018 (r38106) @@ -37,8 +37,6 @@ CpuCaps gCpuCaps; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) #include <sys/types.h> #include <sys/sysctl.h> -#elif defined(__linux__) -#include <signal.h> #elif defined(__MINGW32__) || defined(__CYGWIN__) #include <windows.h> #elif defined(__OS2__) @@ -57,23 +55,15 @@ CpuCaps gCpuCaps; /* I believe this code works. However, it has only been used on a PII and PIII */ #if defined(__linux__) && !ARCH_X86_64 -static void sigill_handler_sse( int signal, struct sigcontext sc ) -{ - mp_msg(MSGT_CPUDETECT,MSGL_V, "SIGILL, " ); +#include <signal.h> +#include <setjmp.h> - /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1" - * instructions are 3 bytes long. We must increment the instruction - * pointer manually to avoid repeated execution of the offending - * instruction. - * - * If the SIGILL is caused by a divide-by-zero when unmasked - * exceptions aren't supported, the SIMD FPU status and control - * word will be restored at the end of the test, so we don't need - * to worry about doing it here. Besides, we may not be able to... - */ - sc.eip += 3; +static sigjmp_buf sigill_longjmp; - gCpuCaps.hasSSE=0; +static void sigill_handler_sse( int signal ) +{ + mp_msg(MSGT_CPUDETECT,MSGL_V, "SIGILL, " ); + siglongjmp(sigill_longjmp, 1); } #endif /* __linux__ */ @@ -178,12 +168,11 @@ static void check_os_katmai_support( voi } #elif defined(__linux__) struct sigaction saved_sigill; + struct sigaction new_sigill = { .sa_handler = sigill_handler_sse }; /* Save the original signal handlers. */ - sigaction( SIGILL, NULL, &saved_sigill ); - - signal( SIGILL, (void (*)(int))sigill_handler_sse ); + sigaction( SIGILL, &new_sigill, &saved_sigill ); /* Emulate test for OSFXSR in CR4. The OS will set this bit if it * supports the extended FPU save and restore required for SSE. If @@ -194,8 +183,10 @@ static void check_os_katmai_support( voi if ( gCpuCaps.hasSSE ) { mp_msg(MSGT_CPUDETECT,MSGL_V, "Testing OS support for SSE... " ); -// __asm__ volatile ("xorps %%xmm0, %%xmm0"); - __asm__ volatile ("xorps %xmm0, %xmm0"); + if (sigsetjmp(sigill_longjmp, 1)) + gCpuCaps.hasSSE = 0; + else + __asm__ volatile ("xorps %xmm0, %xmm0"); mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" ); }

1 0

r38105 - in trunk/gui: interface.c interface.h ui/actions.c
by ib 01 May '18

01 May '18

Author: ib Date: Tue May 1 15:44:49 2018 New Revision: 38105 Log: Reset stream IDs on DVD title change. An audio, video or subtitle track selected by the user must be reset when the title of a DVD changes. Modified: trunk/gui/interface.c trunk/gui/interface.h trunk/gui/ui/actions.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 26 07:01:01 2018 (r38104) +++ trunk/gui/interface.c Tue May 1 15:44:49 2018 (r38105) @@ -201,6 +201,17 @@ static void remove_vf(char *vf) } } +/** + * @brief Reset the audio, video and subtitles stream IDs. + */ +void reset_stream_ids(void) +{ + audio_id = -1; + video_id = -1; + dvdsub_id = -1; + vobsub_id = -1; +} + /* MPlayer -> GUI */ /** @@ -504,11 +515,7 @@ int gui(int what, void *data) wsEvents(); if (guiInfo.MediumChanged == GUI_MEDIUM_NEW) { - audio_id = -1; - video_id = -1; - dvdsub_id = -1; - vobsub_id = -1; - + reset_stream_ids(); stream_cache_size = -1; autosync = 0; force_fps = 0; Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Thu Apr 26 07:01:01 2018 (r38104) +++ trunk/gui/interface.h Tue May 1 15:44:49 2018 (r38105) @@ -151,6 +151,8 @@ typedef struct { extern guiInterface_t guiInfo; +void reset_stream_ids(void); + /// @name MPlayer -> GUI //@{ int gui(int what, void *data); Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Thu Apr 26 07:01:01 2018 (r38104) +++ trunk/gui/ui/actions.c Tue May 1 15:44:49 2018 (r38105) @@ -169,12 +169,14 @@ void uiEvent(int ev, float param) guiInfo.Track = iparam; guiInfo.Chapter = 1; guiInfo.Angle = 1; + reset_stream_ids(); uiEvent(ivPlayDVD, 0); break; case evPlayDVD: guiInfo.Chapter = 1; guiInfo.Angle = 1; + reset_stream_ids(); if (guiInfo.StreamType != STREAMTYPE_DVD) guiInfo.Track = 0; @@ -872,6 +874,7 @@ void uiPrev(void) if (--guiInfo.Chapter == 0) { guiInfo.Chapter = 1; + reset_stream_ids(); if (--guiInfo.Track == 0) { guiInfo.Track = 1; @@ -948,6 +951,7 @@ void uiNext(void) if (guiInfo.Chapter++ >= guiInfo.Chapters) { guiInfo.Chapter = 1; + reset_stream_ids(); if (++guiInfo.Track > guiInfo.Tracks) { guiInfo.Track = guiInfo.Tracks;

1 0