Mercurial > mplayer.hg
view mp_msg.c @ 23572:a00685941686
demux_mkv very long seek fix
The seek code searching for the closest position in the index used
"int64_t min_diff=0xFFFFFFFL" as the initial "further from the goal
than any real alternative" value. The unit is milliseconds so seeks more
than about 75 hours past the end of the file would fail to recognize the
last index position as the best match. This was triggered in practice by
chapter seek code which apparently uses a seek of 1000000000 seconds
forward to mean "seek to the end". The practical effect was that trying
to seek to the next chapter in a file without chapters made MPlayer
block until it finished reading the file from the current position to
the end.
Fixed by increasing the initial value from FFFFFFF to FFFFFFFFFFFFFFF.
author | uau |
---|---|
date | Wed, 20 Jun 2007 18:19:03 +0000 |
parents | 44746cbd4e5b |
children | 46fa9bcc6ccc |
line wrap: on
line source
//#define MSG_USE_COLORS #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> #include "config.h" #ifdef USE_ICONV #include <iconv.h> #include <errno.h> extern char* get_term_charset(void); #endif #if defined(FOR_MENCODER) #undef HAVE_NEW_GUI #endif #ifdef HAVE_NEW_GUI #include "gui/interface.h" extern int use_gui; #endif #include "mp_msg.h" /* maximum message length of mp_msg */ #define MSGSIZE_MAX 3072 int mp_msg_levels[MSGT_MAX]; // verbose level of this module. inited to -2 int mp_msg_level_all = MSGL_STATUS; int verbose = 0; #ifdef USE_ICONV char *mp_msg_charset = NULL; static char *old_charset = NULL; static iconv_t msgiconv; #endif const char* filename_recode(const char* filename) { #if !defined(USE_ICONV) || !defined(MSG_CHARSET) return filename; #else static iconv_t inv_msgiconv = (iconv_t)(-1); static char recoded_filename[MSGSIZE_MAX]; size_t filename_len, max_path; char* precoded; if (!mp_msg_charset || !strcasecmp(mp_msg_charset, MSG_CHARSET) || !strcasecmp(mp_msg_charset, "noconv")) return filename; if (inv_msgiconv == (iconv_t)(-1)) { inv_msgiconv = iconv_open(MSG_CHARSET, mp_msg_charset); if (inv_msgiconv == (iconv_t)(-1)) return filename; } filename_len = strlen(filename); max_path = MSGSIZE_MAX - 4; precoded = recoded_filename; if (iconv(inv_msgiconv, &filename, &filename_len, &precoded, &max_path) == (size_t)(-1) && errno == E2BIG) { precoded[0] = precoded[1] = precoded[2] = '.'; precoded += 3; } *precoded = '\0'; return recoded_filename; #endif } void mp_msg_init(void){ int i; char *env = getenv("MPLAYER_VERBOSE"); if (env) verbose = atoi(env); for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2; mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default #ifdef USE_ICONV mp_msg_charset = getenv("MPLAYER_CHARSET"); if (!mp_msg_charset) mp_msg_charset = get_term_charset(); #endif } int mp_msg_test(int mod, int lev) { return lev <= (mp_msg_levels[mod] == -2 ? mp_msg_level_all + verbose : mp_msg_levels[mod]); } void mp_msg(int mod, int lev, const char *format, ... ){ va_list va; char tmp[MSGSIZE_MAX]; if (!mp_msg_test(mod, lev)) return; // do not display va_start(va, format); vsnprintf(tmp, MSGSIZE_MAX, format, va); va_end(va); tmp[MSGSIZE_MAX-2] = '\n'; tmp[MSGSIZE_MAX-1] = 0; #ifdef HAVE_NEW_GUI if(use_gui) guiMessageBox(lev, tmp); #endif #if defined(USE_ICONV) && defined(MSG_CHARSET) if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) { char tmp2[MSGSIZE_MAX]; size_t inlen = strlen(tmp), outlen = MSGSIZE_MAX; char *in = tmp, *out = tmp2; if (!old_charset || strcmp(old_charset, mp_msg_charset)) { if (old_charset) { free(old_charset); iconv_close(msgiconv); } msgiconv = iconv_open(mp_msg_charset, MSG_CHARSET); old_charset = strdup(mp_msg_charset); } if (msgiconv == (iconv_t)(-1)) { fprintf(stderr,"iconv: conversion from %s to %s unsupported\n" ,MSG_CHARSET,mp_msg_charset); }else{ memset(tmp2, 0, MSGSIZE_MAX); while (iconv(msgiconv, &in, &inlen, &out, &outlen) == -1) { if (!inlen || !outlen) break; *out++ = *in++; outlen--; inlen--; } strncpy(tmp, tmp2, MSGSIZE_MAX); tmp[MSGSIZE_MAX-1] = 0; tmp[MSGSIZE_MAX-2] = '\n'; } } #endif #ifdef MSG_USE_COLORS /* that's only a silly color test */ #ifdef MP_ANNOY_ME { int c; static int flag=1; if(flag) for(c=0;c<24;c++) printf("\033[%d;3%dm*** COLOR TEST %d ***\n",(c>7),c&7,c); flag=0; } #endif { unsigned char v_colors[10]={9,1,3,15,7,2,2,8,8,8}; static const char *mod_text[MSGT_MAX]= { "GLOBAL", "CPLAYER", "GPLAYER", "VIDEOOUT", "AUDIOOUT", "DEMUXER", "DS", "DEMUX", "HEADER", "AVSYNC", "AUTOQ", "CFGPARSER", "DECAUDIO", "DECVIDEO", "SEEK", "WIN32", "OPEN", "DVD", "PARSEES", "LIRC", "STREAM", "CACHE", "MENCODER", "XACODEC", "TV", "OSDEP", "SPUDEC", "PLAYTREE", "INPUT", "VFILTER", "OSD", "NETWORK", "CPUDETECT", "CODECCFG", "SWS", "VOBSUB", "SUBREADER", "AFILTER", "NETST", "MUXER", "OSDMENU", "IDENTIFY", "RADIO", "ASS", "LOADER", "STATUSLINE", }; int c=v_colors[lev]; int c2=(mod+1)%15+1; static int header=1; FILE *stream= (lev) <= MSGL_WARN ? stderr : stdout; if(header){ fprintf(stream, "\033[%d;3%dm%9s\033[0;37m: ",c2>>3,c2&7, mod_text[mod]); } fprintf(stream, "\033[%d;3%dm",c>>3,c&7); header= tmp[strlen(tmp)-1] == '\n' ||tmp[strlen(tmp)-1] == '\r'; } #endif if (lev <= MSGL_WARN){ fprintf(stderr, "%s", tmp);fflush(stderr); } else { printf("%s", tmp);fflush(stdout); } }