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

r38008 - trunk/configure
by al 30 Nov '17

30 Nov '17

Author: al Date: Fri Dec 1 00:07:54 2017 New Revision: 38008 Log: configure: Disable FFmpeg AMF encoders Fix build with internal FFmpeg >= FFmpeg commit 9ea6607d29 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 26 03:25:33 2017 (r38007) +++ trunk/configure Fri Dec 1 00:07:54 2017 (r38008) @@ -1615,7 +1615,7 @@ libavprotocols=$(echo $libavprotocols_al 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') +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') 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

r38007 - trunk/configure
by iive 26 Nov '17

26 Nov '17

Author: iive Date: Sun Nov 26 03:25:33 2017 New Revision: 38007 Log: Prepare configure for upcoming changes in FFmpeg. Hardware Acceleration structures are moving from allcodecs.c to hwaccels.h file. This code checks the hwaccels.h file first, if that fails then it checks allcodecs.c file. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 17 00:48:59 2017 (r38006) +++ trunk/configure Sun Nov 26 03:25:33 2017 (r38007) @@ -1555,7 +1555,12 @@ echocheck "ffmpeg/libavcodec/allcodecs.c libavdecoders_all=$(list_subparts DEC decoder codec/allcodecs.c) libavencoders_all=$(list_subparts ENC encoder codec/allcodecs.c) libavparsers_all=$(list_subparts PARSER parser codec/allcodecs.c) -libavhwaccels_all=$(list_subparts HWACCEL hwaccel codec/allcodecs.c) +test $? -eq 0 && _list_subparts=found || _list_subparts="not found" +echores "$_list_subparts" + +echocheck "ffmpeg/libavcodec/hwaccels.h" +libavhwaccels_all=$(list_subparts_extern AVHWAccel hwaccel codec/hwaccels.h) +test $? -eq 0 || libavhwaccels_all=$(list_subparts HWACCEL hwaccel codec/allcodecs.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts"

1 0

r38006 - trunk/libmpdemux/demux_lavf.c
by al 16 Nov '17

16 Nov '17

Author: al Date: Fri Nov 17 00:48:59 2017 New Revision: 38006 Log: demux lavf: mp_read: Propagate EOF Return AVERROR_EOF from mp_read callback, if stream->eof is non-zero. Fixes ticket #2335 Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Tue Nov 14 23:56:09 2017 (r38005) +++ trunk/libmpdemux/demux_lavf.c Fri Nov 17 00:48:59 2017 (r38006) @@ -90,6 +90,8 @@ static int mp_read(void *opaque, uint8_t int ret; ret=stream_read(stream, buf, size); + if (!ret && stream->eof) + ret = AVERROR_EOF; mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n", ret, stream, buf, size, stream_tell(stream), stream->eof);

1 0

r38005 - trunk/configure
by al 14 Nov '17

14 Nov '17

Author: al Date: Tue Nov 14 23:56:09 2017 New Revision: 38005 Log: configure: Broaden pattern to disable videotoolbox encoders Fix build with internal FFmpeg >= FFmpeg commit e7a5249ab1 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 5 11:51:38 2017 (r38004) +++ trunk/configure Tue Nov 14 23:56:09 2017 (r38005) @@ -1610,7 +1610,7 @@ libavprotocols=$(echo $libavprotocols_al 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 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') +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') libavbsfs=$(filter_out_component bsf 'TRACE_HEADERS [A-Z0-9_]*_METADATA H264_REDUNDANT_PPS') 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

r38004 - trunk/configure
by al 05 Nov '17

05 Nov '17

Author: al Date: Sun Nov 5 11:51:38 2017 New Revision: 38004 Log: configure: Detect and use libopenjpeg2 only Since FFmpeg commit 279dc40716 only supports OpenJPEG >= 2.1 As MPlayer only looked for OpenJPEG 1, that would lead to a build failure if OpenJPEG 1 was found. The new check uses pkg-config and does not #define OPJ_STATIC anymore. I am not 100% sure about the latter, because I don't really understand why we did this. It seems rather weird though. If anyone understands when and why we need OPJ_STATIC it can of course be brought back. Though I believe it is a rather wrong concept to begin with. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 3 02:15:52 2017 (r38003) +++ trunk/configure Sun Nov 5 11:51:38 2017 (r38004) @@ -5331,12 +5331,30 @@ fi echocheck "OpenJPEG (JPEG 2000) support" if test "$libopenjpeg" = auto ; then libopenjpeg=no - define_statement_check OPJ_STATIC openjpeg.h 'opj_dparameters_t dec_params; opj_set_default_decoder_parameters(&dec_params);opj_decode_with_info(0,0,0)' -lopenjpeg && libopenjpeg=yes + if test "$ffmpeg_a" = no ; then + res_comment="dynamic linking to libopenjpeg is irrelevant when using dynamic FFmpeg" + else + cat > $TMPC << EOF +#include <openjpeg.h> + +int main(void) { + opj_dparameters_t dec_params; opj_set_default_decoder_parameters(&dec_params); + return opj_decode(0,0,0); +} +EOF + if $_pkg_config --exists "libopenjp2 >= 2.1.0" ; then + inc_libopenjpeg=$($_pkg_config --silence-errors --cflags libopenjp2) + ld_libopenjpeg=$($_pkg_config --silence-errors --libs libopenjp2) + cc_check $inc_libopenjpeg $ld_libopenjpeg && + libopenjpeg=yes && + extra_cflags="$extra_cflags $inc_libopenjpeg" && + extra_ldflags="$extra_ldflags $ld_libopenjpeg" + fi + fi fi echores "$libopenjpeg" if test "$libopenjpeg" = yes ; then def_libopenjpeg='#define CONFIG_LIBOPENJPEG 1' - extra_ldflags="$extra_ldflags -lopenjpeg" libavdecoders="$libavdecoders LIBOPENJPEG_DECODER" libavencoders="$libavencoders LIBOPENJPEG_ENCODER" codecmodules="OpenJPEG $codecmodules"

3 4

r38003 - trunk/configure
by al 03 Nov '17

03 Nov '17

Author: al Date: Fri Nov 3 02:15:52 2017 New Revision: 38003 Log: configure: Remove useless line in helper function contains_item When writing the function, I initially wanted to special case the empty list case and just early return. Turns out there is no need to do this. Additionally I checked that "for x in ; do echo body ; done" is defined in POSIX and will not execute the loop's body. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Nov 3 00:20:45 2017 (r38002) +++ trunk/configure Fri Nov 3 02:15:52 2017 (r38003) @@ -1583,7 +1583,6 @@ echores "$_list_subparts" # a white space separated list (1st arg) # has an item with the given value (2nd arg) contains_item() { - test "$1" || false for item in $1; do test "$item" = "$2" && return done

1 0

r38002 - trunk/configure
by al 02 Nov '17

02 Nov '17

Author: al Date: Fri Nov 3 00:20:45 2017 New Revision: 38002 Log: build: Adjust to new internal structure of FFmpeg TLS components Backward compatibility is retained to make the transition less painful. The relevant change is in FFmpeg commit 4600b0619a . NOTE: Before one could have both GnuTLS and OpenSSL enabled at the same time and FFmpeg would pick whatever it finds first in the list of available protocols. This is now impossible and having both libraries enabled will result in a build failure. But I guess that feature wasn't that useful anyway... Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Nov 1 00:33:45 2017 (r38001) +++ trunk/configure Fri Nov 3 00:20:45 2017 (r38002) @@ -1580,6 +1580,15 @@ libavfilters_all=$(list_subparts FILTE test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" +# a white space separated list (1st arg) +# has an item with the given value (2nd arg) +contains_item() { + test "$1" || false + for item in $1; do + test "$item" = "$2" && return + done + false +} filter_out_component() { eval list=\$libav${1}s type=$(echo $1 | toupper) @@ -4452,7 +4461,12 @@ if test "$_gnutls" = auto ; then fi if test "$_gnutls" = yes ; then def_gnutls='#define CONFIG_GNUTLS 1' - libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_GNUTLS_PROTOCOL" + libavprotocols="$libavprotocols HTTPS_PROTOCOL" + if contains_item "$libavprotocols_all" 'TLS_GNUTLS_PROTOCOL' ; then + libavprotocols="$libavprotocols TLS_GNUTLS_PROTOCOL" + else + libavprotocols="$libavprotocols TLS_PROTOCOL" + fi extra_cflags="$extra_cflags $($_pkg_config --cflags gnutls)" extra_ldflags="$extra_ldflags $($_pkg_config --libs gnutls)" else @@ -4463,7 +4477,12 @@ echores "$_gnutls" echocheck "OpenSSL" if test "$_openssl" = yes ; then def_openssl='#define CONFIG_OPENSSL 1' - libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_OPENSSL_PROTOCOL" + libavprotocols="$libavprotocols HTTPS_PROTOCOL" + if contains_item "$libavprotocols_all" 'TLS_OPENSSL_PROTOCOL' ; then + libavprotocols="$libavprotocols TLS_OPENSSL_PROTOCOL" + else + libavprotocols="$libavprotocols TLS_PROTOCOL" + fi extra_cflags="$extra_cflags $($_pkg_config --cflags openssl)" extra_ldflags="$extra_ldflags $($_pkg_config --libs openssl)" else

1 0