October 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37309 - trunk/stream/stream.h
by reimar 06 Dec '14

06 Dec '14

Author: reimar Date: Sat Oct 25 17:27:08 2014 New Revision: 37309 Log: stream: Avoid unnecessary seek when our buffer is empty. Modified: trunk/stream/stream.h Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Sat Oct 25 15:40:40 2014 (r37308) +++ trunk/stream/stream.h Sat Oct 25 17:27:08 2014 (r37309) @@ -324,6 +324,8 @@ static inline int stream_seek(stream_t * "Invalid seek to negative position %"PRIx64"!\n", pos); pos = 0; } + if (s->buf_len == 0 && s->pos == pos) + return 1; if(pos<s->pos){ int64_t x=pos-(s->pos-s->buf_len); if(x>=0){

3 5

r37315 - trunk/configure
by michael 29 Oct '14

29 Oct '14

Author: michael Date: Wed Oct 29 03:37:46 2014 New Revision: 37315 Log: configure: update for "lavu/atomic: add support for the new memory model aware gcc built-ins" This keeps the previous state to avoid breaking build on older gcc. Better would be actual autodetection or using ffmpegs configure Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Oct 27 20:05:03 2014 (r37314) +++ trunk/configure Wed Oct 29 03:37:46 2014 (r37315) @@ -9295,6 +9295,7 @@ $def_gnutls #define HAVE_AS_DN_DIRECTIVE 1 #define HAVE_ASM_MOD_Q 1 #define HAVE_ATOMICS_GCC 1 +#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1 #define HAVE_ATOMICS_NATIVE 1 #define HAVE_ATTRIBUTE_PACKED 1 #define HAVE_GETHRTIME 0

1 0

r37314 - trunk/configure
by reimar 27 Oct '14

27 Oct '14

Author: reimar Date: Mon Oct 27 20:05:03 2014 New Revision: 37314 Log: configure: Enable both VDA HWAccels. It seems the old one is required for the h264_vda decoder not to crash. See FFmpeg trac #4056. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Oct 26 03:08:08 2014 (r37313) +++ trunk/configure Mon Oct 27 20:05:03 2014 (r37314) @@ -4702,7 +4702,7 @@ fi if test "$_vda" = yes ; then def_vda='#define CONFIG_VDA 1' extra_ldflags="$extra_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" - libavhwaccels="$libavhwaccels H264_VDA_HWACCEL" + libavhwaccels="$libavhwaccels H264_VDA_HWACCEL H264_VDA_OLD_HWACCEL" else def_vda='#define CONFIG_VDA 0' libavdecoders=$(filter_out_component decoder '[A-Z0-9]*_VDA')

1 0

r37313 - trunk/configure
by michael 26 Oct '14

26 Oct '14

Author: michael Date: Sun Oct 26 03:08:08 2014 New Revision: 37313 Log: configure: detect gmtime_r / localtime_r, this is needed for avutil/time_internal.h to not break the build Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Oct 26 00:14:31 2014 (r37312) +++ trunk/configure Sun Oct 26 03:08:08 2014 (r37313) @@ -3424,6 +3424,25 @@ else fi echores "$_mkstemp" +echocheck "gmtime_r" +_gmtime_r=no +statement_check time.h 'gmtime_r(0, 0)' && _gmtime_r=yes +if test "$_gmtime_r" = yes ; then + def_gmtime_r='#define HAVE_GMTIME_R 1' +else + def_gmtime_r='#undef HAVE_GMTIME_R' +fi +echores "$_gmtime_r" + +echocheck "localtime_r" +_localtime_r=no +statement_check time.h 'localtime_r(0, 0)' && _localtime_r=yes +if test "$_localtime_r" = yes ; then + def_localtime_r='#define HAVE_LOCALTIME_R 1' +else + def_localtime_r='#undef HAVE_LOCALTIME_R' +fi +echores "$_localtime_r" echocheck "nanosleep" _nanosleep=no @@ -8868,7 +8887,9 @@ $def_gethostbyname2 $def_gettimeofday $def_clock_gettime $def_glob +$def_gmtime_r $def_langinfo +$def_localtime_r $def_map_memalign $def_memalign $def_nanosleep @@ -9284,7 +9305,6 @@ $def_gnutls #define HAVE_ISATTY 0 #define HAVE_LDBRX 0 #define HAVE_LIBC_MSVCRT 0 -#define HAVE_LOCALTIME_R 0 #define HAVE_MACH_MACH_TIME_H 0 #define HAVE_MAPVIEWOFFILE 0 #define HAVE_MIPSDSPR1 0

1 0

r37307 - trunk/etc/codecs.conf
by cehoyos 26 Oct '14

26 Oct '14

Author: cehoyos Date: Sat Oct 25 14:55:58 2014 New Revision: 37307 Log: Support Go2Meeting fourcc G2M5. Only works with -demuxer lavf, binary decoder not tested. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Oct 25 13:08:31 2014 (r37306) +++ trunk/etc/codecs.conf Sat Oct 25 14:55:58 2014 (r37307) @@ -1930,7 +1930,7 @@ videocodec eescreen videocodec ffg2m info "FFmpeg Go2Meeting" status working - fourcc G2M4 + fourcc G2M4,G2M5 driver ffmpeg dll g2m out RGB24 @@ -1938,7 +1938,7 @@ videocodec ffg2m videocodec gotomeeting info "GoToMeeting codec" status working - fourcc G2M2,G2M3,G2M4 + fourcc G2M2,G2M3,G2M4,G2M5 driver dmo dll "G2M.dll" guid 0x23F891A4, 0x572B, 0x474A, 0x86, 0xDA, 0x66, 0xCD, 0xD3, 0xD1, 0xAC, 0x2E

2 1

r37312 - trunk/libmpdemux/demux_lavf.c
by al 25 Oct '14

25 Oct '14

Author: al Date: Sun Oct 26 00:14:31 2014 New Revision: 37312 Log: demux_lavf: Also add AV_CODEC_ID_OTF attachments Make those font attachments work with demux_lavf. Fix other part of 2207 Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sun Oct 26 00:09:27 2014 (r37311) +++ trunk/libmpdemux/demux_lavf.c Sun Oct 26 00:14:31 2014 (r37312) @@ -483,10 +483,11 @@ static void handle_stream(demuxer_t *dem break; } case AVMEDIA_TYPE_ATTACHMENT:{ - if (st->codec->codec_id == AV_CODEC_ID_TTF) { + if (st->codec->codec_id == AV_CODEC_ID_TTF || st->codec->codec_id == AV_CODEC_ID_OTF) { AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0); + AVDictionaryEntry *mimetype = av_dict_get(st->metadata, "mimetype", NULL, 0); demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL, - "application/x-truetype-font", + mimetype ? mimetype->value : "application/x-font", codec->extradata, codec->extradata_size); } break;

1 0

r37311 - trunk/mplayer.c
by al 25 Oct '14

25 Oct '14

Author: al Date: Sun Oct 26 00:09:27 2014 New Revision: 37311 Log: Pass application/vnd.ms-opentype attachments to libass Make those font attachments work with at least demux_mkv. Fix part of ticket 2207 Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Oct 25 17:27:09 2014 (r37310) +++ trunk/mplayer.c Sun Oct 26 00:09:27 2014 (r37311) @@ -3436,6 +3436,7 @@ goto_enable_cache: if (extract_embedded_fonts && att->name && att->type && att->data && att->data_size && (strcmp(att->type, "application/x-truetype-font") == 0 || + strcmp(att->type, "application/vnd.ms-opentype") == 0 || strcmp(att->type, "application/x-font") == 0)) ass_add_font(ass_library, att->name, att->data, att->data_size); }

1 0

r37306 - trunk/configure
by reimar 25 Oct '14

25 Oct '14

Author: reimar Date: Sat Oct 25 13:08:31 2014 New Revision: 37306 Log: configure: use pkg-config for libdvd* if dvd*-config does not exist. Needed to support never libdvdnav and libdvdread versions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Oct 25 01:01:02 2014 (r37305) +++ trunk/configure Sat Oct 25 13:08:31 2014 (r37306) @@ -745,8 +745,10 @@ _xmms=no _vcd=auto _bluray=auto _dvdnav=auto -_dvdnavconfig=dvdnav-config -_dvdreadconfig=dvdread-config +_dvdnavconfig="pkg-config dvdnav" +type dvdnav-config >/dev/null 2>&1 && _dvdnavconfig=dvdnav-config +_dvdreadconfig="pkg-config dvdread" +type dvdread-config >/dev/null 2>&1 && _dvdnavconfig=dvdread-config _dvdread=auto _dvdread_internal=auto _libdvdcss_internal=auto

2 1

r37310 - in trunk: libmpdemux/demux_lavf.c stream/stream.c stream/stream.h
by reimar 25 Oct '14

25 Oct '14

Author: reimar Date: Sat Oct 25 17:27:09 2014 New Revision: 37310 Log: stream: Fix unreliable probe behaviour on non-seekable streams. We assumed that we could probe STREAM_BUFFER_SIZE bytes and then seek to the back. However this was not the case if the protocol could return with a short read. Instead ensure that a buffer fill always guarantees a seekback of STREAM_BUFFER_MIN. Modified: trunk/libmpdemux/demux_lavf.c trunk/stream/stream.c trunk/stream/stream.h Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat Oct 25 17:27:08 2014 (r37309) +++ trunk/libmpdemux/demux_lavf.c Sat Oct 25 17:27:09 2014 (r37310) @@ -45,7 +45,7 @@ #include "mp_taglists.h" -#define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE +#define INITIAL_PROBE_SIZE STREAM_BUFFER_MIN #define SMALL_MAX_PROBE_SIZE (32 * 1024) #define PROBE_BUF_SIZE (2*1024*1024) Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Sat Oct 25 17:27:08 2014 (r37309) +++ trunk/stream/stream.c Sat Oct 25 17:27:09 2014 (r37310) @@ -359,10 +359,17 @@ int stream_fill_buffer(stream_t *s){ return 0; s->buf_pos=0; s->buf_len=len; + while (s->buf_len < STREAM_BUFFER_MIN) { + assert(s->buf_len + STREAM_BUFFER_MIN < STREAM_BUFFER_SIZE); + len = stream_read_internal(s, s->buffer + s->buf_len, STREAM_BUFFER_MIN); + if (len <= 0) + break; + s->buf_len += len; + } // printf("[%d]",len);fflush(stdout); if (s->capture_file) stream_capture_do(s); - return len; + return s->buf_len; } int stream_write_buffer(stream_t *s, unsigned char *buf, int len) { Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Sat Oct 25 17:27:08 2014 (r37309) +++ trunk/stream/stream.h Sat Oct 25 17:27:09 2014 (r37310) @@ -51,7 +51,8 @@ #define STREAMTYPE_BLURAY 20 #define STREAMTYPE_BD 21 -#define STREAM_BUFFER_SIZE 2048 +#define STREAM_BUFFER_MIN 2048 +#define STREAM_BUFFER_SIZE (2*STREAM_BUFFER_MIN) // must be at least 2*STREAM_BUFFER_MIN #define STREAM_MAX_SECTOR_SIZE (8*1024) #define VCD_SECTOR_SIZE 2352

1 0

r37308 - trunk/configure
by reimar 25 Oct '14

25 Oct '14

Author: reimar Date: Sat Oct 25 15:40:40 2014 New Revision: 37308 Log: configure: Fix typo that broke old external libdvdread. Thanks to Nicolas for spotting it. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Oct 25 14:55:58 2014 (r37307) +++ trunk/configure Sat Oct 25 15:40:40 2014 (r37308) @@ -748,7 +748,7 @@ _dvdnav=auto _dvdnavconfig="pkg-config dvdnav" type dvdnav-config >/dev/null 2>&1 && _dvdnavconfig=dvdnav-config _dvdreadconfig="pkg-config dvdread" -type dvdread-config >/dev/null 2>&1 && _dvdnavconfig=dvdread-config +type dvdread-config >/dev/null 2>&1 && _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto _libdvdcss_internal=auto

1 0