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

r38164 - in trunk: Changelog gui/wm/ws.c
by ib 31 Jan '20

31 Jan '20

Author: ib Date: Fri Jan 31 14:27:09 2020 New Revision: 38164 Log: Clear screen when switching to fullscreen mode using -vo x11. The areas surrounding the XImage must be deleted if the window is larger than the XImage. Modified: trunk/Changelog trunk/gui/wm/ws.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Fri Jan 31 14:15:13 2020 (r38163) +++ trunk/Changelog Fri Jan 31 14:27:09 2020 (r38164) @@ -6,6 +6,8 @@ MPlayer GUI: * Fix wrongly sized video window after leaving fullscreen mode + * Clear screen when switching to fullscreen mode using the x11 + video output driver 1.4: "SubCounter" April 18, 2019 Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Fri Jan 31 14:15:13 2020 (r38163) +++ trunk/gui/wm/ws.c Fri Jan 31 14:27:09 2020 (r38164) @@ -343,6 +343,25 @@ static int wsWindowListSearch(Window win return -1; } +static void wsClearWindowParts(Display *display, wsWindow *win) +{ + int W_leftover, H_leftover; + + if (win->Width <= win->xImage->width && win->Height <= win->xImage->height) + return; + + W_leftover = (win->Width - win->xImage->width) / 2; + H_leftover = (win->Height - win->xImage->height) / 2; + + XFillRectangle(display, win->WindowID, win->wGC, 0, 0, win->Width, H_leftover); + XFillRectangle(display, win->WindowID, win->wGC, 0, win->Height - H_leftover - 1, win->Width, H_leftover + 1); + + if (win->Width > win->xImage->width) { + XFillRectangle(display, win->WindowID, win->wGC, 0, H_leftover, W_leftover, win->xImage->height); + XFillRectangle(display, win->WindowID, win->wGC, win->Width - W_leftover - 1, H_leftover, W_leftover + 1, win->xImage->height); + } +} + void wsEvent(XEvent *event) { unsigned long i = 0; @@ -443,8 +462,10 @@ expose: wsWindowList[l]->State = wsWindowExpose; - if ((wsWindowList[l]->DrawHandler) && (!event->xexpose.count)) + if ((wsWindowList[l]->DrawHandler) && (!event->xexpose.count)) { + wsClearWindowParts(wsDisplay, wsWindowList[l]); wsWindowList[l]->DrawHandler(); + } break;

1 0

r38163 - in trunk: Changelog gui/interface.c gui/ui/actions.c
by ib 31 Jan '20

31 Jan '20

Author: ib Date: Fri Jan 31 14:15:13 2020 New Revision: 38163 Log: Fix wrong video window size. The video window must only return to its initial size when fullscreen playback ends. So pass a distinct argument for this case, because pressing the fullscreen button to return to windowed mode also passes 0, in which case the video window must return to the size of the video. Modified: trunk/Changelog trunk/gui/interface.c trunk/gui/ui/actions.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Tue Jan 21 00:52:42 2020 (r38162) +++ trunk/Changelog Fri Jan 31 14:15:13 2020 (r38163) @@ -4,6 +4,9 @@ MPlayer * ffmpeg12vpdau is no longer supported by FFmpeg, provide separate ffmpeg1vpdau and ffmpeg2vdpau instead + GUI: + * Fix wrongly sized video window after leaving fullscreen mode + 1.4: "SubCounter" April 18, 2019 Decoders, demuxers, streams: Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Jan 21 00:52:42 2020 (r38162) +++ trunk/gui/interface.c Fri Jan 31 14:15:13 2020 (r38163) @@ -1140,7 +1140,7 @@ int gui(int what, void *data) wsWindowVisibility(&guiApp.videoWindow, wsShowWindow); if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) - uiEvent(evFullScreen, False); + uiEvent(evFullScreen, -1); } else { wsWindowVisibility(&guiApp.videoWindow, wsHideWindow); guiInfo.VideoWindow = False; Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Tue Jan 21 00:52:42 2020 (r38162) +++ trunk/gui/ui/actions.c Fri Jan 31 14:15:13 2020 (r38163) @@ -439,7 +439,7 @@ play: uiFullScreen(); if (!guiApp.videoWindow.isFullScreen) - wsWindowResize(&guiApp.videoWindow, iparam ? guiInfo.VideoWidth : guiApp.video.width, iparam ? guiInfo.VideoHeight : guiApp.video.height); + wsWindowResize(&guiApp.videoWindow, iparam >= 0 ? guiInfo.VideoWidth : guiApp.video.width, iparam >= 0 ? guiInfo.VideoHeight : guiApp.video.height); } if (guiApp.videoWindow.isFullScreen)

1 0

r38162 - trunk/stream/stream_ffmpeg.c
by al 20 Jan '20

20 Jan '20

Author: al Date: Tue Jan 21 00:52:42 2020 New Revision: 38162 Log: stream_ffmpeg: Add gopher to the supported protocols Thanks to Vincenzo Nicosia for bringing up the topic and testing gopher via stream_ffmpeg. Modified: trunk/stream/stream_ffmpeg.c Modified: trunk/stream/stream_ffmpeg.c ============================================================================== --- trunk/stream/stream_ffmpeg.c Wed Jan 15 23:41:39 2020 (r38161) +++ trunk/stream/stream_ffmpeg.c Tue Jan 21 00:52:42 2020 (r38162) @@ -158,7 +158,7 @@ const stream_info_t stream_info_ffmpeg = "", "", open_f, - { "ffmpeg", "rtmp", "rtsp", "https", NULL }, + { "ffmpeg", "rtmp", "rtsp", "https", "gopher", NULL }, NULL, 1 // Urls are an option string };

1 0

r38161 - trunk/configure
by al 15 Jan '20

15 Jan '20

Author: al Date: Wed Jan 15 23:41:39 2020 New Revision: 38161 Log: configure: Detect libaom and enable the lavc libaom-av1 decoder The codecs.conf entry was already added in SVN r38156 . This change allows to autodetect/enable the libaom-av1 decoder for internal FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jan 15 23:36:35 2020 (r38160) +++ trunk/configure Wed Jan 15 23:41:39 2020 (r38161) @@ -413,6 +413,7 @@ Codecs: --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libvpx-lavc disable libvpx in libavcodec [autodetect] --disable-libdav1d-lavc disable libdav1d in libavcodec [autodetect] + --disable-libaom-lavc disable libaom in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] --disable-ffmpeg_a disable static FFmpeg [autodetect] --disable-ffmpeg_so disable shared FFmpeg [autodetect] @@ -808,6 +809,7 @@ _x264=auto _x264_lavc=auto _libvpx_lavc=auto _libdav1d_lavc=auto +_libaom_lavc=auto _libnut=auto _lirc=auto _lircc=auto @@ -1262,6 +1264,8 @@ for ac_option do --disable-libvpx-lavc) _libvpx_lavc=no ;; --enable-libdav1d-lavc) _libdav1d_lavc=yes ;; --disable-libdav1d-lavc) _libdav1d_lavc=no ;; + --enable-libaom-lavc) _libaom_lavc=yes ;; + --disable-libaom-lavc) _libaom_lavc=no ;; --enable-libnut) _libnut=yes ;; --disable-libnut) _libnut=no ;; --enable-libopencore_amrnb) _libopencore_amrnb=yes ;; @@ -7527,6 +7531,35 @@ fi echores "$_libdav1d_lavc" +echocheck "libaom" +if test "$_libaom_lavc" = auto; then + _libaom_lavc=no + if test "$ffmpeg_a" != yes; then + res_comment="dynamic linking to libaom is irrelevant when using dynamic FFmpeg" + else + cat > $TMPC << EOF +#include <aom/aom_decoder.h> +int main(void) { + const char *version_lib = aom_codec_version_str(); + return version_lib[0]; +} +EOF + for ld_tmp in "-laom" "-laom $ld_pthread" ; do + cc_check $ld_tmp && _libaom_lavc=yes && extra_ldflags="$extra_ldflags $ld_tmp" && break + done + fi +fi +if test "$_libaom_lavc" = yes ; then + def_libaom_lavc='#define CONFIG_LIBAOM 1' + libavdecoders="$libavdecoders LIBAOM_AV1_DECODER" + codecmodules="libaom $codecmodules" +else + def_libaom_lavc='#define CONFIG_LIBAOM 0' + nocodecmodules="libaom $nocodecmodules" +fi +echores "$_libaom_lavc" + + echocheck "libnut" if test "$_libnut" = auto ; then _libnut=no @@ -9272,6 +9305,7 @@ $def_emmintrin_h /* external libraries */ $def_bzlib $def_crystalhd +$def_libaom_lavc $def_libdav1d_lavc $def_libgsm $def_libopencore_amrnb

1 0

r38160 - trunk/configure
by al 15 Jan '20

15 Jan '20

Author: al Date: Wed Jan 15 23:36:35 2020 New Revision: 38160 Log: configure: Detect libdav1d and enable the lavc libdav1d decoder The codecs.conf entry was already added in SVN r38155 . This change allows to autodetect/enable the libdav1d decoder for internal FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jan 14 01:31:19 2020 (r38159) +++ trunk/configure Wed Jan 15 23:36:35 2020 (r38160) @@ -412,6 +412,7 @@ Codecs: --disable-x264 disable x264 [autodetect] --disable-x264-lavc disable x264 in libavcodec [autodetect] --disable-libvpx-lavc disable libvpx in libavcodec [autodetect] + --disable-libdav1d-lavc disable libdav1d in libavcodec [autodetect] --disable-libnut disable libnut [autodetect] --disable-ffmpeg_a disable static FFmpeg [autodetect] --disable-ffmpeg_so disable shared FFmpeg [autodetect] @@ -806,6 +807,7 @@ _xvid_lavc=auto _x264=auto _x264_lavc=auto _libvpx_lavc=auto +_libdav1d_lavc=auto _libnut=auto _lirc=auto _lircc=auto @@ -1258,6 +1260,8 @@ for ac_option do --disable-x264-lavc) _x264_lavc=no ;; --enable-libvpx-lavc) _libvpx_lavc=yes ;; --disable-libvpx-lavc) _libvpx_lavc=no ;; + --enable-libdav1d-lavc) _libdav1d_lavc=yes ;; + --disable-libdav1d-lavc) _libdav1d_lavc=no ;; --enable-libnut) _libnut=yes ;; --disable-libnut) _libnut=no ;; --enable-libopencore_amrnb) _libopencore_amrnb=yes ;; @@ -7493,6 +7497,36 @@ else fi echores "$_libvpx_lavc" + +echocheck "libdav1d" +if test "$_libdav1d_lavc" = auto; then + _libdav1d_lavc=no + if test "$ffmpeg_a" != yes; then + res_comment="dynamic linking to libdav1d is irrelevant when using dynamic FFmpeg" + else + cat > $TMPC << EOF +#include <dav1d/dav1d.h> +int main(void) { + const char *version_lib = dav1d_version(); + return version_lib[0]; +} +EOF + for ld_tmp in "-ldav1d" "-ldav1d $ld_pthread" ; do + cc_check $ld_tmp && _libdav1d_lavc=yes && extra_ldflags="$extra_ldflags $ld_tmp" && break + done + fi +fi +if test "$_libdav1d_lavc" = yes ; then + def_libdav1d_lavc='#define CONFIG_LIBDAV1D 1' + libavdecoders="$libavdecoders LIBDAV1D_DECODER" + codecmodules="libdav1d $codecmodules" +else + def_libdav1d_lavc='#define CONFIG_LIBDAV1D 0' + nocodecmodules="libdav1d $nocodecmodules" +fi +echores "$_libdav1d_lavc" + + echocheck "libnut" if test "$_libnut" = auto ; then _libnut=no @@ -9238,6 +9272,7 @@ $def_emmintrin_h /* external libraries */ $def_bzlib $def_crystalhd +$def_libdav1d_lavc $def_libgsm $def_libopencore_amrnb $def_libopencore_amrwb

1 0

r38158 - in trunk: DOCS/man/cs/mplayer.1 DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/pl/mplayer.1 DO...
by ib 01 Jan '20

01 Jan '20

Author: ib Date: Wed Jan 1 22:25:52 2020 New Revision: 38158 Log: Update year. Modified: trunk/osdep/mplayer.rc trunk/version.sh Changes in other areas also in this revision: Modified: trunk/DOCS/man/cs/mplayer.1 trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/man/es/mplayer.1 trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/man/hu/mplayer.1 trunk/DOCS/man/it/mplayer.1 trunk/DOCS/man/pl/mplayer.1 trunk/DOCS/man/ru/mplayer.1 trunk/DOCS/man/zh_CN/mplayer.1 trunk/DOCS/xml/cs/documentation.xml trunk/DOCS/xml/de/documentation.xml trunk/DOCS/xml/en/documentation.xml trunk/DOCS/xml/es/documentation.xml trunk/DOCS/xml/fr/documentation.xml trunk/DOCS/xml/hu/documentation.xml trunk/DOCS/xml/it/documentation.xml trunk/DOCS/xml/pl/documentation.xml trunk/DOCS/xml/ru/documentation.xml trunk/DOCS/xml/zh_CN/documentation.xml Modified: trunk/osdep/mplayer.rc ============================================================================== --- trunk/osdep/mplayer.rc Tue Dec 24 12:46:23 2019 (r38157) +++ trunk/osdep/mplayer.rc Wed Jan 1 22:25:52 2020 (r38158) @@ -36,7 +36,7 @@ FILETYPE VFT_APP VALUE "FileDescription", "MPlayer - Movie Player\000" VALUE "FileVersion",VERSION VALUE "InternalName", "Counter Counter\000" - VALUE "LegalCopyright", " (C) 2000-2019 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2020 MPlayer Team\000" //VALUE "LegalTrademarks"," \000"; VALUE "OriginalFilename", "mplayer.exe\000" VALUE "ProductName", "MPlayer - The Movie Player\000" Modified: trunk/version.sh ============================================================================== --- trunk/version.sh Tue Dec 24 12:46:23 2019 (r38157) +++ trunk/version.sh Wed Jan 1 22:25:52 2020 (r38158) @@ -19,7 +19,7 @@ fi NEW_REVISION="#define VERSION \"${version}${extra}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) -TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2019 MPlayer Team\n"' +TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2020 MPlayer Team\n"' # Update version.h only on revision changes to avoid spurious rebuilds if test "$NEW_REVISION" != "$OLD_REVISION"; then

1 0