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

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

22 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

r37871 - trunk/etc/codecs.conf
by compn 24 May '16

24 May '16

Author: compn Date: Tue May 24 16:02:21 2016 New Revision: 37871 Log: codecs.conf: add viewquest VQC1/VQC2 binary codec, dll in drivers32/new/VQC1/ Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri May 20 23:25:19 2016 (r37870) +++ trunk/etc/codecs.conf Tue May 24 16:02:21 2016 (r37871) @@ -1942,6 +1942,14 @@ videocodec geoavc dll "GXAVC.dll" out BGR32,BGR24 flip +videocodec viewquest + info "Kodak Digital Camera Viewquest VQC1 VQC2" + status working + fourcc VQC1,VQC2 + driver vfw + dll "VQdecode.dll" + out BGR24 flip + videocodec fjhtvfw info "FUJIAN HTC MPEG-4 CODEC" status working

1 0

r37870 - trunk/libmpdemux/demux_lavf.c
by rtogni 21 May '16

21 May '16

Author: rtogni Date: Fri May 20 23:25:19 2016 New Revision: 37870 Log: Fix playback of hls stream where url is longer than 256. MPlayer was not able to update the m3u8 playlist when the lenght of the url is greater than 256, because mp_filename array was only 256 bytes. The patch simply increase the size of mp_filename to 2048, the value matches the size used in ffmpeg url. Patch by Lu Ran <hephooey gmail> Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat May 14 21:27:04 2016 (r37869) +++ trunk/libmpdemux/demux_lavf.c Fri May 20 23:25:19 2016 (r37870) @@ -530,7 +530,7 @@ static demuxer_t* demux_open_lavf(demuxe AVDictionaryEntry *t = NULL; lavf_priv_t *priv= demuxer->priv; int i; - char mp_filename[256]="mp:"; + char mp_filename[2048]="mp:"; stream_seek(demuxer->stream, 0);

1 0

r37869 - trunk/libmpcodecs/vf_fspp.c
by rtogni 14 May '16

14 May '16

Author: rtogni Date: Sat May 14 21:27:04 2016 New Revision: 37869 Log: Fix compilation of vf_fspp for systems with MMX but no MMXEXT The file libmpcodecs/vf_fspp.c doesn't compile if HAVE_MMX_INLINE is true and HAVE_MMXEXT_INLINE is false (i.e. on Pentium MMX, Pentium 2 or K6 processors). Patch by Mikulas Patocka mikulas at twibright com Modified: trunk/libmpcodecs/vf_fspp.c Modified: trunk/libmpcodecs/vf_fspp.c ============================================================================== --- trunk/libmpcodecs/vf_fspp.c Sat May 14 21:09:50 2016 (r37868) +++ trunk/libmpcodecs/vf_fspp.c Sat May 14 21:27:04 2016 (r37869) @@ -173,7 +173,6 @@ static void row_fdct_c(int16_t *data, co #define store_slice_s store_slice_c #define store_slice2_s store_slice2_c #define mul_thrmat_s mul_thrmat_c -#define column_fidct_s column_fidct_c #define row_idct_s row_idct_c #define row_fdct_s row_fdct_c @@ -393,7 +392,6 @@ static void mul_thrmat_mmx(struct vf_pri ); } -static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); static void row_idct_mmx(int16_t* workspace, int16_t* output_adr, int output_stride, int cnt); static void row_fdct_mmx(int16_t *data, const uint8_t *pixels, int line_size, int cnt); @@ -401,11 +399,18 @@ static void row_fdct_mmx(int16_t *data, #define store_slice_s store_slice_mmx #define store_slice2_s store_slice2_mmx #define mul_thrmat_s mul_thrmat_mmx -#define column_fidct_s column_fidct_mmx #define row_idct_s row_idct_mmx #define row_fdct_s row_fdct_mmx #endif // HAVE_MMX_INLINE +#if !HAVE_MMXEXT_INLINE +static void column_fidct_c(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); +#define column_fidct_s column_fidct_c +#else +static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); +#define column_fidct_s column_fidct_mmx +#endif + static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, @@ -728,7 +733,9 @@ DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_ DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4); DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2); -#else /* !HAVE_MMXEXT_INLINE */ +#endif /* !HAVE_MMX_INLINE */ + +#if !HAVE_MMX_INLINE || !HAVE_MMXEXT_INLINE typedef int32_t int_simd16_t; static const int16_t FIX_0_382683433=FIX(0.382683433, 14);

1 0

r37868 - trunk/configure
by rtogni 14 May '16

14 May '16

Author: rtogni Date: Sat May 14 21:09:50 2016 New Revision: 37868 Log: Generate bsf_list and protcol list for ffmpeg in configure, try 2 Move generation at the end of configure, so that protocols and bfs with unmet dependencies are not included in the list. Also remove TLS_PROTOCOL from the list, there is no protocol with that name Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri May 13 22:40:50 2016 (r37867) +++ trunk/configure Sat May 14 21:09:50 2016 (r37868) @@ -1628,24 +1628,6 @@ for ac_option do esac done -# generate the lists of enabled components for ffmpeg -print_enabled_components(){ - file=$1 - struct_name=$2 - name=$3 - shift 3 - list=$(echo $* | tolower) - echo "static const $struct_name *$name[] = {" > $TMPH - for c in $list; do - printf " &ff_%s,\n" $c >> $TMPH - done - echo " NULL };" >> $TMPH - cmp -s $TMPH ffmpeg/$file && return - cp $TMPH ffmpeg/$file -} - -print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs -print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols # Checking CC version... # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure) @@ -4457,7 +4439,7 @@ if test "$_gnutls" = auto ; then fi if test "$_gnutls" = yes ; then def_gnutls='#define CONFIG_GNUTLS 1' - libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_PROTOCOL TLS_GNUTLS_PROTOCOL" + libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_GNUTLS_PROTOCOL" extra_cflags="$extra_cflags $($_pkg_config --cflags gnutls)" extra_ldflags="$extra_ldflags $($_pkg_config --libs gnutls)" else @@ -4468,7 +4450,7 @@ echores "$_gnutls" echocheck "OpenSSL" if test "$_openssl" = yes ; then def_openssl='#define CONFIG_OPENSSL 1' - libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_PROTOCOL TLS_OPENSSL_PROTOCOL" + libavprotocols="$libavprotocols HTTPS_PROTOCOL TLS_OPENSSL_PROTOCOL" extra_cflags="$extra_cflags $($_pkg_config --cflags openssl)" extra_ldflags="$extra_ldflags $($_pkg_config --libs openssl)" else @@ -9494,6 +9476,25 @@ cat > ffmpeg/config.h << EOF EOF touch ffmpeg/.config +# generate the lists of enabled components for ffmpeg +print_enabled_components(){ + file=$1 + struct_name=$2 + name=$3 + shift 3 + list=$(echo $* | tolower) + echo "static const $struct_name *$name[] = {" > $TMPH + for c in $list; do + printf " &ff_%s,\n" $c >> $TMPH + done + echo " NULL };" >> $TMPH + cmp -s $TMPH ffmpeg/$file && return + cp $TMPH ffmpeg/$file +} + +print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs +print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols + fi #############################################################################

1 0

r37867 - trunk/configure
by rtogni 13 May '16

13 May '16

Author: rtogni Date: Fri May 13 22:40:50 2016 New Revision: 37867 Log: Generate bsf_list and protcol list for ffmpeg in configure - FFmpeg now creates the list of enabled protocols and bitstream filters at configure time; do the same in MPlayer. - Fix generation of the list of available bsf, they are now listed into bitstream_filers.c instead of allcodecs.c This fixes compilation with latest ffmpeg Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed May 11 21:40:43 2016 (r37866) +++ trunk/configure Fri May 13 22:40:50 2016 (r37867) @@ -1554,7 +1554,6 @@ 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) -libavbsfs_all=$(list_subparts BSF bsf 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" @@ -1565,6 +1564,11 @@ libavmuxers_all=$(list_subparts _MUX test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" +echocheck "ffmpeg/libavcodec/bitsteram_filters.c" +libavbsfs_all=$(list_subparts_extern AVBitStreamFilter bsf codec/bitstream_filters.c) +test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found" +echores "$_list_subparts_extern" + echocheck "ffmpeg/libavformat/protocols.c" libavprotocols_all=$(list_subparts_extern URLProtocol protocol format/protocols.c) test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found" @@ -1624,6 +1628,24 @@ for ac_option do esac done +# generate the lists of enabled components for ffmpeg +print_enabled_components(){ + file=$1 + struct_name=$2 + name=$3 + shift 3 + list=$(echo $* | tolower) + echo "static const $struct_name *$name[] = {" > $TMPH + for c in $list; do + printf " &ff_%s,\n" $c >> $TMPH + done + echo " NULL };" >> $TMPH + cmp -s $TMPH ffmpeg/$file && return + cp $TMPH ffmpeg/$file +} + +print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $libavbsfs +print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols # Checking CC version... # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)

1 0

r37866 - in trunk: Changelog etc/codecs.conf
by rtogni 11 May '16

11 May '16

Author: rtogni Date: Wed May 11 21:40:43 2016 New Revision: 37866 Log: Matrox uncompressed: support also M102 4cc (HD) Modified: trunk/Changelog trunk/etc/codecs.conf Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed May 11 20:42:05 2016 (r37865) +++ trunk/Changelog Wed May 11 21:40:43 2016 (r37866) @@ -12,7 +12,7 @@ MPlayer * support GBR pixel formats for HEVC * FFmpeg audio decoders: g721, g732 * FFmpeg video decoders: more Matrox mpeg2 formats (M702-3-4-5), Truemotion - RT, Matrox Uncompressed SD + RT, Matrox Uncompressed SD/HD Fixes: * fix more issues reported by Coverity Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed May 11 20:42:05 2016 (r37865) +++ trunk/etc/codecs.conf Wed May 11 21:40:43 2016 (r37866) @@ -3607,9 +3607,9 @@ videocodec ffavui out 422A videocodec ffm101 - info "FFmpeg Matrox Uncompressed SD" + info "FFmpeg Matrox Uncompressed" status working - fourcc M101 + fourcc M101,M102 driver ffmpeg dll m101 out YUY2,422P10

1 0

r37865 - trunk/configure
by rtogni 11 May '16

11 May '16

Author: rtogni Date: Wed May 11 20:42:05 2016 New Revision: 37865 Log: Fix compilation after the addition of OMX encoders to ffmpeg Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon May 9 22:12:48 2016 (r37864) +++ trunk/configure Wed May 11 20:42:05 2016 (r37865) @@ -1597,7 +1597,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 [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 [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 H264_OMX MPEG4_OMX [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')

1 0

r37864 - in trunk: Changelog etc/codecs.conf
by rtogni 09 May '16

09 May '16

Author: rtogni Date: Mon May 9 22:12:48 2016 New Revision: 37864 Log: Support more pixel formats for RSCC and Screnpresso video decoders Modified: trunk/Changelog trunk/etc/codecs.conf Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Mon May 9 20:57:34 2016 (r37863) +++ trunk/Changelog Mon May 9 22:12:48 2016 (r37864) @@ -1,7 +1,7 @@ MPlayer Decoders, demuxers, streams: - * More pixel formats are supported for VP9 + * More pixel formats are supported for VP9, RSCC, Screenpresso * 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) Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon May 9 20:57:34 2016 (r37863) +++ trunk/etc/codecs.conf Mon May 9 22:12:48 2016 (r37864) @@ -164,7 +164,7 @@ videocodec ffrscc fourcc RSCC,ISCC driver ffmpeg dll rscc - out BGRA + out BGRA,BGR24,BGR15LE videocodec ffzmbv info "FFmpeg Zip Motion-Block Video" @@ -2760,7 +2760,7 @@ videocodec ffscreenpresso fourcc SPV1 driver ffmpeg dll screenpresso - out BGR24 + out BGR24,BGRA,BGR15LE videocodec ffhap info "FFmpeg Hap"

1 0

r37863 - trunk/configure
by rtogni 09 May '16

09 May '16

Author: rtogni Date: Mon May 9 20:57:34 2016 New Revision: 37863 Log: Fix compilation after the addition of VAAPI encoders to ffmpeg Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri May 6 21:03:26 2016 (r37862) +++ trunk/configure Mon May 9 20:57:34 2016 (r37863) @@ -1597,7 +1597,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 [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') +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 [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')

1 0