September 2017 - MPlayer-cvslog - lists.mplayerhq.hu

r37965 - trunk/gui/util/misc.c
by ib 29 Sep '17

29 Sep '17

Author: ib Date: Fri Sep 29 18:50:58 2017 New Revision: 37965 Log: Fix cue file analyzer. Add the missing NULL termination of the returned list of playlist items which may be missing after subsequent calls. Modified: trunk/gui/util/misc.c Modified: trunk/gui/util/misc.c ============================================================================== --- trunk/gui/util/misc.c Fri Sep 29 08:55:14 2017 (r37964) +++ trunk/gui/util/misc.c Fri Sep 29 18:50:58 2017 (r37965) @@ -120,7 +120,7 @@ float msf2sec(const char *msf) */ plItem **cue_playlist(const char *fname) { - static plItem *item[100]; + static plItem *item[101]; FILE *file; char line[256], *l, *fmt, *path = NULL, *data = NULL; int i = -1, isFILE = False, isTRACK = False; @@ -132,6 +132,8 @@ plItem **cue_playlist(const char *fname) else return NULL; + memset(item, 0, sizeof(item)); + while (fgetstr(line, sizeof(line), file) && (i < 99)) { l = (char *)ltrim(line);

1 0

r37964 - trunk/configure
by reimar 29 Sep '17

29 Sep '17

Author: reimar Date: Fri Sep 29 08:55:14 2017 New Revision: 37964 Log: configure: Disable RKMPP codecs to fix compilation. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Sep 26 12:33:22 2017 (r37963) +++ trunk/configure Fri Sep 29 08:55:14 2017 (r37964) @@ -1601,7 +1601,7 @@ libavmuxers=$(echo $libavmuxers_all) libavprotocols=$(echo $libavprotocols_all) 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]*_V4L2M2M') +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 H264_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') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')

1 0

r37963 - trunk/mplayer.c
by ib 26 Sep '17

26 Sep '17

Author: ib Date: Tue Sep 26 12:33:22 2017 New Revision: 37963 Log: Avoid nonsensical elapsed time. Audio files may contain a cover image and the demuxer may enable it. If there are no presentation time stamps for the image, retrieve this information from the audio stream. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Mon Sep 25 00:10:06 2017 (r37962) +++ trunk/mplayer.c Tue Sep 26 12:33:22 2017 (r37963) @@ -4050,9 +4050,10 @@ goto_enable_cache: } else { guiInfo.Position = demuxer_get_percent_pos(mpctx->demuxer); } + guiInfo.ElapsedTime = -1; if (mpctx->sh_video) guiInfo.ElapsedTime = mpctx->sh_video->pts; - else if (mpctx->sh_audio) + if (guiInfo.ElapsedTime < 0 && mpctx->sh_audio) guiInfo.ElapsedTime = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out); guiInfo.RunningTime = demuxer_get_time_length(mpctx->demuxer); gui(GUI_SET_VOLUME_BALANCE, &mpctx->mixer);

1 0

r37962 - trunk/libvo/osx_objc_common.m
by reimar 24 Sep '17

24 Sep '17

Author: reimar Date: Mon Sep 25 00:10:06 2017 New Revision: 37962 Log: OSX: Avoid crashes in older OSX versions. Try to handle the case where the enter/exitFullScreenMode functions do not exist. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Sun Sep 24 20:44:45 2017 (r37961) +++ trunk/libvo/osx_objc_common.m Mon Sep 25 00:10:06 2017 (r37962) @@ -400,7 +400,9 @@ void vo_osx_swap_buffers(void) //go fullscreen if(vo_fs) { + if ([window respondsToSelector:@selector(enterFullScreenMode)]) { [window enterFullScreenMode:[self fullscreen_screen]]; + } if(!vo_rootwin) { SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); @@ -420,7 +422,9 @@ void vo_osx_swap_buffers(void) } else { + if ([window respondsToSelector:@selector(exitFullScreenMode)]) { [window exitFullScreenMode:[self fullscreen_screen]]; + } SetSystemUIMode( kUIModeNormal, 0); CGDisplayShowCursor(kCGDirectMainDisplay);

1 0

r37961 - trunk/configure
by reimar 24 Sep '17

24 Sep '17

Author: reimar Date: Sun Sep 24 20:44:45 2017 New Revision: 37961 Log: configure: disable v4l2m2m de-/encoders. Fixes compilations on systems without v4l2. If the codecs work in MPlayer, they should be re-enabled by the existing v4l2 test. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Sep 23 15:59:18 2017 (r37960) +++ trunk/configure Sun Sep 24 20:44:45 2017 (r37961) @@ -1601,8 +1601,8 @@ libavmuxers=$(echo $libavmuxers_all) libavprotocols=$(echo $libavprotocols_all) 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') -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 H264_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI VP9_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT') +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]*_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 H264_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') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR') 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')

1 0

r37960 - in trunk/gui: ui/render.c win32/widgetrender.c
by ib 23 Sep '17

23 Sep '17

Author: ib Date: Sat Sep 23 15:59:18 2017 New Revision: 37960 Log: Improve doxygen documentation. Modified: trunk/gui/ui/render.c trunk/gui/win32/widgetrender.c Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Sep 16 22:06:15 2017 (r37959) +++ trunk/gui/ui/render.c Sat Sep 23 15:59:18 2017 (r37960) @@ -47,7 +47,7 @@ #define DLABEL_DELAY 2500 /** - * @brief Convert #guiInfo member Filename. + * @brief Convert #guiInfo member @ref guiInterface_t.Filename "Filename". * * @param how 0 (cut file path and extension), * 1 (additionally, convert lower case) or Modified: trunk/gui/win32/widgetrender.c ============================================================================== --- trunk/gui/win32/widgetrender.c Sat Sep 16 22:06:15 2017 (r37959) +++ trunk/gui/win32/widgetrender.c Sat Sep 23 15:59:18 2017 (r37960) @@ -124,7 +124,7 @@ static void stringreplace(char *dest, co } /** - * @brief Convert #guiInfo member Filename. + * @brief Convert #guiInfo member @ref guiInterface_t.Filename "Filename". * * @param how 0 (cut file path and extension), * 1 (additionally, convert lower case) or

1 0

r37959 - trunk/libvo/osx_objc_common.m
by reimar 16 Sep '17

16 Sep '17

Author: reimar Date: Sat Sep 16 22:06:15 2017 New Revision: 37959 Log: OSX: Fix issues with vos on newer OSX versions. Fix fullscreen mode to not leave empty bars, and select a double-buffered pixel format by default, which can avoid issues with getting a black screen in vo gl unless glfinish option is used. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Sat Sep 16 22:04:20 2017 (r37958) +++ trunk/libvo/osx_objc_common.m Sat Sep 16 22:06:15 2017 (r37959) @@ -48,16 +48,28 @@ static BOOL isLeopardOrLater; static NSAutoreleasePool *autoreleasepool; static MPCommonOpenGLView *oglv; +static NSOpenGLPixelFormat *pixfmt; void (*vo_osx_redraw_func)(void); +static const NSOpenGLPixelFormatAttribute double_attribs[] = { + NSOpenGLPFADoubleBuffer, 0 +}; + +static const NSOpenGLPixelFormatAttribute nodouble_attribs[] = { + 0 +}; + int vo_osx_init(void) { autoreleasepool = [[NSAutoreleasePool alloc] init]; - oglv = [[MPCommonOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPCommonOpenGLView defaultPixelFormat]]; + const NSOpenGLPixelFormatAttribute *attribs = vo_doublebuffering ? double_attribs : nodouble_attribs; + pixfmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs]; + oglv = [[MPCommonOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:pixfmt]; [oglv autorelease]; [oglv display]; [oglv preinit]; + [pixfmt autorelease]; return 1; } @@ -105,12 +117,11 @@ void vo_osx_swap_buffers(void) } @implementation MPCommonOpenGLView -- (void) update_screen_info +- (NSScreen *) fullscreen_screen { int screen_id = xinerama_screen; NSArray *screen_array = [NSScreen screens]; NSScreen *screen_handle; - NSRect screen_frame; if(screen_id >= (int)[screen_array count]) { @@ -121,8 +132,13 @@ void vo_osx_swap_buffers(void) screen_handle = [[self window] screen]; else screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; + return screen_handle; +} - screen_frame = [screen_handle frame]; +- (void) update_screen_info +{ + NSScreen *screen_handle = [self fullscreen_screen]; + NSRect screen_frame = [screen_handle frame]; vo_screenwidth = screen_frame.size.width; vo_screenheight = screen_frame.size.height; xinerama_x = screen_frame.origin.x; @@ -168,7 +184,7 @@ void vo_osx_swap_buffers(void) winSizeMult = 1; //create OpenGL Context - glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; + glContext = [[NSOpenGLContext alloc] initWithFormat:pixfmt shareContext:nil]; [self setOpenGLContext:glContext]; [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; @@ -384,6 +400,7 @@ void vo_osx_swap_buffers(void) //go fullscreen if(vo_fs) { + [window enterFullScreenMode:[self fullscreen_screen]]; if(!vo_rootwin) { SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); @@ -403,6 +420,7 @@ void vo_osx_swap_buffers(void) } else { + [window exitFullScreenMode:[self fullscreen_screen]]; SetSystemUIMode( kUIModeNormal, 0); CGDisplayShowCursor(kCGDirectMainDisplay);

1 0

r37958 - trunk/configure
by reimar 16 Sep '17

16 Sep '17

Author: reimar Date: Sat Sep 16 22:04:20 2017 New Revision: 37958 Log: configure: fix compilation without yasm/nasm. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 10 20:27:45 2017 (r37957) +++ trunk/configure Sat Sep 16 22:04:20 2017 (r37958) @@ -3302,6 +3302,8 @@ test "$neon" = yes && cpuexts="NEO test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts" test "$_vis" = yes && cpuexts="VIS $cpuexts" test "$_mvi" = yes && cpuexts="MVI $cpuexts" +cpuexts_external="" +test "$have_yasm" = yes && cpuexts_external="$cpuexts" # Checking kernel version... if x86_32 && linux ; then @@ -8985,7 +8987,7 @@ $def_vfp_args $(ff_config_enable "$arch_all" "$arch" "#" "ARCH") $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH") $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE") -$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_EXTERNAL") +$(ff_config_enable "$cpuexts_all" "$cpuexts_external" "#" "HAVE" "_EXTERNAL") $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_INLINE") @@ -9477,7 +9479,7 @@ echo "%define CONFIG_GPL 1" >> "$TMPS" echo "%define HAVE_ALIGNED_STACK 1" >> "$TMPS" echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS" echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS" -echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_EXTERNAL")" >> "$TMPS" +echo "$(ff_config_enable "$cpuexts_all" "$cpuexts_external" "%" "HAVE" "_EXTERNAL")" >> "$TMPS" echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_INLINE")" >> "$TMPS" echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS" echo "$(ff_config_enable "$libavdecoders_all" "$libavdecoders" "%" "CONFIG")" >> "$TMPS"

1 0

r37957 - trunk/configure
by al 10 Sep '17

10 Sep '17

Author: al Date: Sun Sep 10 20:27:45 2017 New Revision: 37957 Log: configure: Support to statically link against FreeType library Patch-by: KO Myung-Hun >komh78 gmail< Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Sep 9 23:44:27 2017 (r37956) +++ trunk/configure Sun Sep 10 20:27:45 2017 (r37957) @@ -6330,6 +6330,7 @@ if test "$_iconv" = no ; then fi if test "$_freetype" = auto ; then + test -n "$ld_static" && _freetypeconfig="$_freetypeconfig --static" if ( $_freetypeconfig --version ) >/dev/null 2>&1 ; then cat > $TMPC << EOF #include <stdio.h>

1 0

r37956 - trunk/configure
by al 09 Sep '17

09 Sep '17

Author: al Date: Sat Sep 9 23:44:27 2017 New Revision: 37956 Log: configure: Disable FFmpeg DASH demuxer Fixes build for now, which currently fails if libxml and its development files are not installed. Maybe proper auto detection code for libxml should be added. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Sep 9 17:56:52 2017 (r37955) +++ trunk/configure Sat Sep 9 23:44:27 2017 (r37956) @@ -1603,7 +1603,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') 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 H264_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI VP9_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT') -libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') +libavdemuxers=$(filter_out_component demuxer 'AVISYNTH DASH LIB[A-Z0-9_]* REDIR') 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 'FREI0R[A-Z0-9_]* LIB[A-Z0-9_]* MP OCV')

1 0