March 2016 - MPlayer-cvslog - lists.mplayerhq.hu

r37801 - trunk/etc/codecs.conf
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Feb 25 22:34:45 2016 New Revision: 37801 Log: codecs.conf: Prefer FFmpeg raw decoder for paletted. It is more likely to give the correct results, it seems even when combined with our native e.g. AVI demuxer, and it has more feature like supporting paletted 1-bit formats. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 25 22:34:43 2016 (r37800) +++ trunk/etc/codecs.conf Thu Feb 25 22:34:45 2016 (r37801) @@ -4258,6 +4258,20 @@ videocodec rawbgr15 format 0x4247520F out BGR15 +videocodec ffrawpal + info "RAW PAL8" + comment "For decoding paletted 1, 2, 4 and 8 bit formats" + status working + driver ffmpeg + dll rawvideo + format 0x0 + format 0x20776172 0x42475208 + format 0x42475208 + format 0x42475204 + format 0x42475202 + format 0x42475201 + out BGR8,BGR1,RGB1 + videocodec rawbgr8 info "RAW BGR8" status working @@ -4276,18 +4290,6 @@ videocodec rawbgr1 format 0x42475201 out BGR1 -videocodec ffrawpal - info "RAW PAL8" - comment "For decoding paletted 2 and 4 bit formats" - status working - driver ffmpeg - dll rawvideo - format 0x0 - format 0x20776172 0x42475204 - format 0x42475204 - format 0x42475202 - out BGR8 - videocodec rawyuy2 info "RAW YUY2" status working

2 1

r37850 - trunk/DOCS/tech/release-svn.txt
by rtogni 26 Mar '16

26 Mar '16

Author: rtogni Date: Sat Mar 26 21:28:58 2016 New Revision: 37850 Log: svn commands useful for a release This is a summary of the svn commands used to make a release (branch, tag, sync changes, ...). I wrote it because I never remember the correct syntax. Added: trunk/DOCS/tech/release-svn.txt Added: trunk/DOCS/tech/release-svn.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/DOCS/tech/release-svn.txt Sat Mar 26 21:28:58 2016 (r37850) @@ -0,0 +1,33 @@ +This is a short summary of the svn commands used to manage a release in svn. + + +Merge changes from trunk to release branch + * in release branch checkout dir + - Merge a single commit r12345 + svn merge ^/trunk -c 12345 + - Merge multiple commits from r12345 to r12350 + svn merge ^/trunk -r12344:r12350 + ^ Not a typo + - Merge a single file from r12345 + svn merge ^trunk/myfile.ext myfile.ext -c 12345 + - Revert a single commit r12345 + svn merge ^/trunk -c -12345 + - For problem "svn: E195020: Cannot merge into mixed-revision working copy" + svn update + - In nothing happens on merge commands (on clean tree only!) + svn revert . + + +Copy a file from trunk to release branch + - Copy myfile.ext to release branch 1.2 + svn copy ^/trunk/myfile.ext ^/branches/1.2/myfile.ext + + +Create a release branch + - Create release branch 1.2 from trunk + svn copy ^/trunk ^/branches/1.2 + + +Tag a release + - Tag 1.2.1 from 1.2 branch + svn copy ^/branches/1.2 ^/tags/MPlayer-1.2.1

1 0

r37849 - trunk/Changelog
by rtogni 26 Mar '16

26 Mar '16

Author: rtogni Date: Sat Mar 26 21:13:42 2016 New Revision: 37849 Log: Update Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Mar 24 16:10:20 2016 (r37848) +++ trunk/Changelog Sat Mar 26 21:13:42 2016 (r37849) @@ -5,11 +5,18 @@ MPlayer * pvr:// support for the Hauppauge HD PVR model 1212 * Speed up detection of mpg format while streaming (limit probe to 4 MB) * demuxer: fall back to audio pts if all others are unavailable (#1928) + * raw video: add support for < 8bpp RGB, support for paletted raw video, + fix fliped raw video in non-avi containers + * increase -lavdopts threads limit to 32 + * warn for badly interleaved files, and make -ni more aggressive + * support GBR pixel formats for HEVC Fixes: * fix more issues reported by Coverity + * expand error checking, and fix many memleaks * fix -subcp enca: with external ASS subtitles (#2281) * fix reading of bitmap fonts + * fix -subdelay applied inverted Other: * MPlayer can link against OpenSSL instead of GnuTLS for https support

1 0

r37847 - trunk/configure
by reimar 22 Mar '16

22 Mar '16

Author: reimar Date: Tue Mar 22 22:52:10 2016 New Revision: 37847 Log: configure: Fix build, disable audiotoolbox. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Mar 22 22:52:08 2016 (r37846) +++ trunk/configure Tue Mar 22 22:52:10 2016 (r37847) @@ -1596,8 +1596,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') -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') +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 [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 [A-Z0-9_]*_AT') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH 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')

2 1

r37846 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-en.h libmpdemux/demuxer.c
by reimar 22 Mar '16

22 Mar '16

Author: reimar Date: Tue Mar 22 22:52:08 2016 New Revision: 37846 Log: demuxer.c: Apply -ni option more aggressively. Disable the limits on maximum buffering when -ni is specified. This avoids issues with badly interleaved files. Modified: trunk/libmpdemux/demuxer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-en.h Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sat Mar 19 07:23:17 2016 (r37845) +++ trunk/libmpdemux/demuxer.c Tue Mar 22 22:52:08 2016 (r37846) @@ -734,13 +734,13 @@ int ds_fill_buffer(demux_stream_t *ds) // avoid printing the "too many ..." message over and over if (ds->eof) break; - if (apacks >= MAX_PACKS || abytes >= MAX_PACK_BYTES) { + if (!force_ni && (apacks >= MAX_PACKS || abytes >= MAX_PACK_BYTES)) { mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, apacks, abytes); mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); break; } - if (vpacks >= MAX_PACKS || vbytes >= MAX_PACK_BYTES) { + if (!force_ni && (vpacks >= MAX_PACKS || vbytes >= MAX_PACK_BYTES)) { mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, vpacks, vbytes); mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); @@ -948,15 +948,15 @@ double ds_get_next_pts(demux_stream_t *d // if we have not read from the "current" packet, consider it // as the next, otherwise we never get the pts for the first packet. while (!ds->first && (!ds->current || ds->buffer_pos)) { - if (demux->audio->packs >= MAX_PACKS - || demux->audio->bytes >= MAX_PACK_BYTES) { + if (!force_ni && (demux->audio->packs >= MAX_PACKS + || demux->audio->bytes >= MAX_PACK_BYTES)) { mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, demux->audio->packs, demux->audio->bytes); mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); return MP_NOPTS_VALUE; } - if (demux->video->packs >= MAX_PACKS - || demux->video->bytes >= MAX_PACK_BYTES) { + if (!force_ni && (demux->video->packs >= MAX_PACKS + || demux->video->bytes >= MAX_PACK_BYTES)) { mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, demux->video->packs, demux->video->bytes); mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI);

1 0

r37844 - trunk/etc/codecs.conf
by cehoyos 13 Mar '16

13 Mar '16

Author: cehoyos Date: Sun Mar 13 09:49:13 2016 New Revision: 37844 Log: etc/codecs.conf: Support hevc GBR colour spaces. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Mar 7 20:53:33 2016 (r37843) +++ trunk/etc/codecs.conf Sun Mar 13 09:49:13 2016 (r37844) @@ -1396,6 +1396,7 @@ videocodec ffhevc out YV12,420P9,420P10,420P12 out 422P,422P9,422P10,444P12 out 444P,444P9,444P10,444P12 + out GBR24P,GBR10P,GBR12P videocodec ffhevcvdpau info "FFmpeg HEVC / H.265 (VDPAU)"

1 0

r37843 - trunk/configure
by rtogni 07 Mar '16

07 Mar '16

Author: rtogni Date: Mon Mar 7 20:53:33 2016 New Revision: 37843 Log: Disable mediacodec H264 decoder, fix compilation ffmpeg git Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Mar 7 11:09:46 2016 (r37842) +++ trunk/configure Mon Mar 7 20:53:33 2016 (r37843) @@ -1596,7 +1596,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') +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') 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') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')

1 0

r37842 - trunk/configure
by ib 07 Mar '16

07 Mar '16

Author: ib Date: Mon Mar 7 11:09:46 2016 New Revision: 37842 Log: Test the appropriate header belonging to the system. These kind of header checks are already being performed for _struct_addrinfo, _getaddrinfo, _struct_sockaddr_storage and _struct_sockaddr_sa_len, so there is no reason to do it differently and in a kind of brute force way for three other checks. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Mar 7 10:46:36 2016 (r37841) +++ trunk/configure Mon Mar 7 11:09:46 2016 (r37842) @@ -3615,20 +3615,32 @@ fi echocheck "struct ipv6_mreq" _struct_ipv6_mreq=no def_struct_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 0" -for header in "netinet/in.h" "ws2tcpip.h" ; do - statement_check $header 'struct ipv6_mreq mreq6' && _struct_ipv6_mreq=yes && - def_struct_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 1" && break -done +cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <ws2tcpip.h> +#else +#include <netinet/in.h> +#endif +int main(void) { struct ipv6_mreq mreq6; return 0; } +EOF +cc_check $cc_check_winsock2_h && _struct_ipv6_mreq=yes && + def_struct_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 1" echores "$_struct_ipv6_mreq" echocheck "struct sockaddr_in6" _struct_sockaddr_in6=no def_struct_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 0" -for header in "netinet/in.h" "ws2tcpip.h" ; do - statement_check $header 'struct sockaddr_in6 addr' && _struct_sockaddr_in6=yes && - def_struct_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 1" && break -done +cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <ws2tcpip.h> +#else +#include <netinet/in.h> +#endif +int main(void) { struct sockaddr_in6 addr; return 0; } +EOF +cc_check $cc_check_winsock2_h && _struct_sockaddr_in6=yes && + def_struct_sockaddr_in6="#define HAVE_STRUCT_SOCKADDR_IN6 1" echores "$_struct_sockaddr_in6" @@ -3685,9 +3697,16 @@ echores "$inet_aton" echocheck "socklen_t" _socklen_t=no -for header in "sys/socket.h" "ws2tcpip.h" "sys/types.h" ; do - statement_check $header 'socklen_t v = 0' && _socklen_t=yes && break -done +cat > $TMPC << EOF +#if HAVE_WINSOCK2_H +#include <ws2tcpip.h> +#else +#include <sys/socket.h> +#include <sys/types.h> +#endif +int main(void) { socklen_t v = 0; return 0; } +EOF +cc_check $cc_check_winsock2_h && _socklen_t=yes if test "$_socklen_t" = yes ; then def_socklen_t='#define HAVE_SOCKLEN_T 1' else

1 0

r37841 - in trunk/gui: interface.c ui/actions.c
by ib 07 Mar '16

07 Mar '16

Author: ib Date: Mon Mar 7 10:46:36 2016 New Revision: 37841 Log: Cosmetic: Adjust indent. Modified: trunk/gui/interface.c trunk/gui/ui/actions.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon Mar 7 10:30:15 2016 (r37840) +++ trunk/gui/interface.c Mon Mar 7 10:46:36 2016 (r37841) @@ -1260,8 +1260,8 @@ void mplayer(int what, float value, void { mp_cmd_t *mp_cmd; - mp_cmd = calloc(1, sizeof(*mp_cmd)); - mp_cmd->id = MP_CMD_PANSCAN; + mp_cmd = calloc(1, sizeof(*mp_cmd)); + mp_cmd->id = MP_CMD_PANSCAN; ARRAY_STRCPY(mp_cmd->name, "panscan"); mp_cmd->args[0].v.f = value; mp_cmd->args[1].v.i = 1; Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Mon Mar 7 10:30:15 2016 (r37840) +++ trunk/gui/ui/actions.c Mon Mar 7 10:46:36 2016 (r37841) @@ -577,7 +577,7 @@ void uiPause(void) mp_cmd_t *cmd = calloc(1, sizeof(*cmd)); if (cmd) { - cmd->id = MP_CMD_PAUSE; + cmd->id = MP_CMD_PAUSE; ARRAY_STRCPY(cmd->name, "pause"); mp_input_queue_cmd(cmd); }

1 0

r37840 - trunk/gui/win32/interface.c
by ib 07 Mar '16

07 Mar '16

Author: ib Date: Mon Mar 7 10:30:15 2016 New Revision: 37840 Log: Supplement to r37834. codec-cfg: Optimize built-in codecs format. Lookup strings via index in an array instead of using direct pointers. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Sun Mar 6 19:10:55 2016 (r37839) +++ trunk/gui/win32/interface.c Mon Mar 7 10:30:15 2016 (r37840) @@ -654,7 +654,7 @@ int gui(int what, void *data) guiInfo.sh_video = data; if (guiInfo.sh_video) { - codecname = guiInfo.sh_video->codec->name; + codecname = codec_idx2str(guiInfo.sh_video->codec->name_idx); /* we have video, show the video window */ if(!IsWindowVisible(mygui->videowindow) || IsIconic(mygui->videowindow))

1 0