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

r37900 - trunk/configure
by al 17 Sep '16

17 Sep '16

Author: al Date: Sun Sep 18 02:13:10 2016 New Revision: 37900 Log: configure: Disable FFmpeg mediacodec HEVC decoder Fix compilation with recent FFmpeg Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Sep 9 20:56:58 2016 (r37899) +++ trunk/configure Sun Sep 18 02:13:10 2016 (r37900) @@ -1600,7 +1600,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 H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID [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 H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID [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')

1 0

r37899 - trunk/configure
by rtogni 09 Sep '16

09 Sep '16

Author: rtogni Date: Fri Sep 9 20:56:58 2016 New Revision: 37899 Log: Fix compilation after the addition of more CUVID decoders to ffmpeg in commit 1891dfe0130991ee138d01f2877678de717b9e23 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 7 14:48:22 2016 (r37898) +++ trunk/configure Fri Sep 9 20:56:58 2016 (r37899) @@ -1600,7 +1600,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 H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID [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 H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID [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')

1 0

r37898 - trunk/Changelog
by ib 07 Sep '16

07 Sep '16

Author: ib Date: Wed Sep 7 14:48:22 2016 New Revision: 37898 Log: Add information about font scanning speedup. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Sep 7 14:26:30 2016 (r37897) +++ trunk/Changelog Wed Sep 7 14:48:22 2016 (r37898) @@ -28,6 +28,7 @@ MPlayer GUI: * No limitation on the number of entries in a font description file + * Dramatic speedup of scanning font description files 1.3.0: "worksforme" February 16, 2016

1 0

r37897 - trunk/gui/skin/font.c
by ib 07 Sep '16

07 Sep '16

Author: ib Date: Wed Sep 7 14:26:30 2016 New Revision: 37897 Log: Cosmetic: Adjust indent. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Wed Sep 7 14:23:07 2016 (r37896) +++ trunk/gui/skin/font.c Wed Sep 7 14:26:30 2016 (r37897) @@ -232,11 +232,11 @@ int fntRead(char *path, char *fname) cutStr(item, item, '"', 1); if (item[0] & 0x80) { - if (Fonts[id]->bit8_count % EXTRA_CHRS == 0) { - if (!fntAllocChr(Fonts[id], EXTRA_CHRS) || - !fntAllocBit8Chr(Fonts[id], EXTRA_CHRS)) - continue; - } + if (Fonts[id]->bit8_count % EXTRA_CHRS == 0) { + if (!fntAllocChr(Fonts[id], EXTRA_CHRS) || + !fntAllocBit8Chr(Fonts[id], EXTRA_CHRS)) + continue; + } strncpy(Fonts[id]->bit8_chr + Fonts[id]->bit8_count * UTF8LENGTH, item, UTF8LENGTH);

1 0

r37896 - in trunk/gui/skin: font.c font.h
by ib 07 Sep '16

07 Sep '16

Author: ib Date: Wed Sep 7 14:23:07 2016 New Revision: 37896 Log: Dramatically speed up fntRead(). Don't scan all existing bit8_chr slots for a free one when adding a new bit8_chr, but use a counter in order to directly access the next free slot. This speeds up scanning the font description file by approx. 97%. Modified: trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Wed Sep 7 14:11:29 2016 (r37895) +++ trunk/gui/skin/font.c Wed Sep 7 14:23:07 2016 (r37896) @@ -232,23 +232,15 @@ int fntRead(char *path, char *fname) cutStr(item, item, '"', 1); if (item[0] & 0x80) { - for (i = 0;; i++) { - if (i == Fonts[id]->extra_chrs) { + if (Fonts[id]->bit8_count % EXTRA_CHRS == 0) { if (!fntAllocChr(Fonts[id], EXTRA_CHRS) || !fntAllocBit8Chr(Fonts[id], EXTRA_CHRS)) - break; - } - - if (!(Fonts[id]->bit8_chr + i * UTF8LENGTH)[0]) { - strncpy(Fonts[id]->bit8_chr + i * UTF8LENGTH, item, UTF8LENGTH); - break; + continue; } - } - if (i == Fonts[id]->extra_chrs) - continue; + strncpy(Fonts[id]->bit8_chr + Fonts[id]->bit8_count * UTF8LENGTH, item, UTF8LENGTH); - i += ASCII_CHRS; + i = Fonts[id]->bit8_count++ + ASCII_CHRS; } else i = item[0]; @@ -334,7 +326,7 @@ static int fntGetCharIndex(int id, unsig *str += direction; } - for (i = 0; (i < Fonts[id]->extra_chrs) && (Fonts[id]->bit8_chr + i * UTF8LENGTH)[0]; i++) { + for (i = 0; i < Fonts[id]->bit8_count; i++) { if (strncmp(Fonts[id]->bit8_chr + i * UTF8LENGTH, uchar, UTF8LENGTH) == 0) return i + ASCII_CHRS; Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Wed Sep 7 14:11:29 2016 (r37895) +++ trunk/gui/skin/font.h Wed Sep 7 14:23:07 2016 (r37896) @@ -34,6 +34,7 @@ typedef struct { fntChar *Chr; int extra_chrs; unsigned char *bit8_chr; + int bit8_count; guiImage Bitmap; char name[MAX_FONT_NAME]; } bmpFont;

1 0

r37895 - trunk/gui/skin/font.c
by ib 07 Sep '16

07 Sep '16

Author: ib Date: Wed Sep 7 14:11:29 2016 New Revision: 37895 Log: Speed up fntRead() a little bit. Although not really measurable, it should be a little bit faster. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Mon Sep 5 23:31:07 2016 (r37894) +++ trunk/gui/skin/font.c Wed Sep 7 14:11:29 2016 (r37895) @@ -219,7 +219,7 @@ int fntRead(char *path, char *fname) if (!*buf) continue; - n = (strncmp(buf, "\"=", 2) == 0 ? 1 : 0); + n = (buf[0] == '"' && buf[1] == '=' ? 1 : 0); cutStr(buf, item, '=', n); cutStr(buf, param, '=', n + 1);

1 0

r37894 - trunk/Changelog
by ib 05 Sep '16

05 Sep '16

Author: ib Date: Mon Sep 5 23:31:07 2016 New Revision: 37894 Log: Add information about lifted font description file limitations. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Aug 25 14:39:03 2016 (r37893) +++ trunk/Changelog Mon Sep 5 23:31:07 2016 (r37894) @@ -26,6 +26,9 @@ MPlayer * MPlayer can link against OpenSSL instead of GnuTLS for https support (Warning: the resulting binary can not be redistributed) + GUI: + * No limitation on the number of entries in a font description file + 1.3.0: "worksforme" February 16, 2016

1 0