December 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r21474 - in trunk/libass: ass.c ass.h ass_cache.c ass_font.c ass_fontconfig.c ass_fontconfig.h ass_library.c ass_library.h ass_render.c
by eugeni 06 Jan '08

06 Jan '08

Author: eugeni Date: Sun Dec 3 18:59:13 2006 New Revision: 21474 Modified: trunk/libass/ass.c trunk/libass/ass.h trunk/libass/ass_cache.c trunk/libass/ass_font.c trunk/libass/ass_fontconfig.c trunk/libass/ass_fontconfig.h trunk/libass/ass_library.c trunk/libass/ass_library.h trunk/libass/ass_render.c Log: Keep embedded fonts in ass_library_t and perform actual disk write in fontconfig initialization. This is required for some fontconfig-related improvements. Modified: trunk/libass/ass.c ============================================================================== --- trunk/libass/ass.c (original) +++ trunk/libass/ass.c Sun Dec 3 18:59:13 2006 @@ -1046,86 +1046,6 @@ return 0; } -static char* validate_fname(char* name) -{ - char* fname; - char* p; - char* q; - unsigned code; - int sz = strlen(name); - - q = fname = malloc(sz + 1); - p = name; - while (*p) { - code = utf8_get_char(&p); - if (code == 0) - break; - if ( (code > 0x7F) || - (code == '\\') || - (code == '/') || - (code == ':') || - (code == '*') || - (code == '?') || - (code == '<') || - (code == '>') || - (code == '|') || - (code == 0)) - { - *q++ = '_'; - } else { - *q++ = code; - } - if (p - name > sz) - break; - } - *q = 0; - return fname; -} - -/** - * \brief Add a memory font. - * \param name attachment name - * \param data binary font data - * \param data_size data size -*/ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size) -{ - char buf[1000]; - FILE* fp = 0; - int rc; - struct stat st; - char* fname; - const char* fonts_dir = library->fonts_dir; - - if (!fonts_dir) - return; - rc = stat(fonts_dir, &st); - if (rc) { - int res; -#ifndef __MINGW32__ - res = mkdir(fonts_dir, 0700); -#else - res = mkdir(fonts_dir); -#endif - if (res) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); - } - } else if (!S_ISDIR(st.st_mode)) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); - } - - fname = validate_fname((char*)name); - - snprintf(buf, 1000, "%s/%s", fonts_dir, fname); - free(fname); - - fp = fopen(buf, "wb"); - if (!fp) return; - - fwrite(data, data_size, 1, fp); - fclose(fp); -} - long long ass_step_sub(ass_track_t* track, long long now, int movement) { int i; Modified: trunk/libass/ass.h ============================================================================== --- trunk/libass/ass.h (original) +++ trunk/libass/ass.h Sun Dec 3 18:59:13 2006 @@ -182,7 +182,7 @@ * \param data binary font data * \param data_size data size */ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size); +void ass_add_font(ass_library_t* library, char* name, char* data, int data_size); /** * \brief Calculates timeshift from now to the start of some other subtitle event, depending on movement parameter Modified: trunk/libass/ass_cache.c ============================================================================== --- trunk/libass/ass_cache.c (original) +++ trunk/libass/ass_cache.c Sun Dec 3 18:59:13 2006 @@ -27,6 +27,7 @@ #include <assert.h> #include "mputils.h" +#include "ass.h" #include "ass_fontconfig.h" #include "ass_font.h" #include "ass_bitmap.h" Modified: trunk/libass/ass_font.c ============================================================================== --- trunk/libass/ass_font.c (original) +++ trunk/libass/ass_font.c Sun Dec 3 18:59:13 2006 @@ -26,6 +26,8 @@ #include FT_SYNTHESIS_H #include FT_GLYPH_H +#include "ass.h" +#include "ass_library.h" #include "ass_font.h" #include "ass_bitmap.h" #include "ass_cache.h" Modified: trunk/libass/ass_fontconfig.c ============================================================================== --- trunk/libass/ass_fontconfig.c (original) +++ trunk/libass/ass_fontconfig.c Sun Dec 3 18:59:13 2006 @@ -28,6 +28,8 @@ #include <sys/stat.h> #include "mputils.h" +#include "ass.h" +#include "ass_library.h" #include "ass_fontconfig.h" #ifdef HAVE_FONTCONFIG @@ -184,6 +186,89 @@ return fontconfig_select_with_charset(priv, family, bold, italic, index, 0); } +static char* validate_fname(char* name) +{ + char* fname; + char* p; + char* q; + unsigned code; + int sz = strlen(name); + + q = fname = malloc(sz + 1); + p = name; + while (*p) { + code = utf8_get_char(&p); + if (code == 0) + break; + if ( (code > 0x7F) || + (code == '\\') || + (code == '/') || + (code == ':') || + (code == '*') || + (code == '?') || + (code == '<') || + (code == '>') || + (code == '|') || + (code == 0)) + { + *q++ = '_'; + } else { + *q++ = code; + } + if (p - name > sz) + break; + } + *q = 0; + return fname; +} + +/** + * \brief Process embedded matroska font. Saves it to ~/.mplayer/fonts. + * \param name attachment name + * \param data binary font data + * \param data_size data size +*/ +static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int idx) +{ + char buf[1000]; + FILE* fp = 0; + int rc; + struct stat st; + char* fname; + const char* name = library->fontdata[idx].name; + const char* data = library->fontdata[idx].data; + int data_size = library->fontdata[idx].size; + const char* fonts_dir = library->fonts_dir; + + if (!fonts_dir) + return; + rc = stat(fonts_dir, &st); + if (rc) { + int res; +#ifndef __MINGW32__ + res = mkdir(fonts_dir, 0700); +#else + res = mkdir(fonts_dir); +#endif + if (res) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); + } + } else if (!S_ISDIR(st.st_mode)) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); + } + + fname = validate_fname((char*)name); + + snprintf(buf, 1000, "%s/%s", fonts_dir, fname); + free(fname); + + fp = fopen(buf, "wb"); + if (!fp) return; + + fwrite(data, data_size, 1, fp); + fclose(fp); +} + /** * \brief Init fontconfig. * \param dir additional directoryu for fonts @@ -191,11 +276,13 @@ * \param path default font path * \return pointer to fontconfig private data */ -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { int rc; struct stat st; fc_instance_t* priv = calloc(1, sizeof(fc_instance_t)); + const char* dir = library->fonts_dir; + int i; rc = FcInit(); assert(rc); @@ -206,6 +293,9 @@ return 0; } + for (i = 0; i < library->num_fontdata; ++i) + process_fontdata(priv, library, i); + if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache); @@ -265,7 +355,7 @@ return priv->path_default; } -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { fc_instance_t* priv; Modified: trunk/libass/ass_fontconfig.h ============================================================================== --- trunk/libass/ass_fontconfig.h (original) +++ trunk/libass/ass_fontconfig.h Sun Dec 3 18:59:13 2006 @@ -27,7 +27,7 @@ typedef struct fc_instance_s fc_instance_t; -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path); +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path); char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index); void fontconfig_done(fc_instance_t* priv); Modified: trunk/libass/ass_library.c ============================================================================== --- trunk/libass/ass_library.c (original) +++ trunk/libass/ass_library.c Sun Dec 3 18:59:13 2006 @@ -71,3 +71,19 @@ *q = strdup(*p); priv->style_overrides[cnt] = NULL; } + +static void grow_array(void **array, int nelem, size_t elsize) +{ + if (!(nelem & 31)) + *array = realloc(*array, (nelem + 32) * elsize); +} + +void ass_add_font(ass_library_t* priv, char* name, char* data, int size) +{ + grow_array((void**)&priv->fontdata, priv->num_fontdata, sizeof(*priv->fontdata)); + priv->fontdata[priv->num_fontdata].name = name; + priv->fontdata[priv->num_fontdata].data = data; + priv->fontdata[priv->num_fontdata].size = size; + priv->num_fontdata ++; +} + Modified: trunk/libass/ass_library.h ============================================================================== --- trunk/libass/ass_library.h (original) +++ trunk/libass/ass_library.h Sun Dec 3 18:59:13 2006 @@ -21,10 +21,19 @@ #ifndef __ASS_LIBRARY_H__ #define __ASS_LIBRARY_H__ +typedef struct ass_fontdata_s { + char* name; + char* data; + int size; +} ass_fontdata_t; + struct ass_library_s { char* fonts_dir; int extract_fonts; char** style_overrides; + + ass_fontdata_t* fontdata; + int num_fontdata; }; #endif Modified: trunk/libass/ass_render.c ============================================================================== --- trunk/libass/ass_render.c (original) +++ trunk/libass/ass_render.c Sun Dec 3 18:59:13 2006 @@ -1928,7 +1928,7 @@ if (priv->fontconfig_priv) fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = fontconfig_init(priv->library->fonts_dir, default_family, default_font); + priv->fontconfig_priv = fontconfig_init(priv->library, default_family, default_font); return !!priv->fontconfig_priv; }

2 1

r21740 - in trunk: libmpcodecs/vf_zrmjpeg.c libvo/jpeg_enc.c
by rik 08 Jan '07

08 Jan '07

Author: rik Date: Sat Dec 23 14:18:43 2006 New Revision: 21740 Modified: trunk/libmpcodecs/vf_zrmjpeg.c trunk/libvo/jpeg_enc.c Log: compilation fixes: define always_inline and don't use uint64_t_C Modified: trunk/libmpcodecs/vf_zrmjpeg.c ============================================================================== --- trunk/libmpcodecs/vf_zrmjpeg.c (original) +++ trunk/libmpcodecs/vf_zrmjpeg.c Sat Dec 23 14:18:43 2006 @@ -39,6 +39,13 @@ #include "libavcodec/mpegvideo.h" //#include "jpeg_enc.h" /* this file is not present yet */ +/* code from ffmpeg/libavcodec */ +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) +# define always_inline __attribute__((always_inline)) inline +#else +# define always_inline inline +#endif + #undef malloc #undef free #undef realloc @@ -151,7 +158,7 @@ * So 16 <= qscale * quant_matrix[i] <= 7905 * so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 * so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 */ - qmat[qscale][i] = (int)((uint64_t_C(1) << + qmat[qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT_MMX) / (qscale *quant_matrix[j])); qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) Modified: trunk/libvo/jpeg_enc.c ============================================================================== --- trunk/libvo/jpeg_enc.c (original) +++ trunk/libvo/jpeg_enc.c Sat Dec 23 14:18:43 2006 @@ -113,7 +113,7 @@ so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 */ - qmat [qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j])); + qmat [qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j])); qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1;

3 3

r21735 - trunk/configure
by diego 07 Jan '07

07 Jan '07

Author: diego Date: Sat Dec 23 03:47:38 2006 New Revision: 21735 Modified: trunk/configure Log: Fix disabling individual demuxers, parsers and decoders based on a patch by Nicolas Baradakis, nbk sitadelle com Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sat Dec 23 03:47:38 2006 @@ -7560,6 +7560,19 @@ EOF ############################################################################# + +ff_config_enable () { +for part in $1; do + ucname=` echo $part | tr '[a-z]' '[A-Z]' ` + if ` echo $2 | grep $part > /dev/null `; then + echo "#define CONFIG_$ucname 1" + echo "#define ENABLE_$ucname 1" + else + echo "#define ENABLE_$ucname 0" + fi +done +} + echo "Creating config.h" cat > config.h << EOF /* -------- This file has been automatically generated by configure --------- @@ -7886,28 +7899,11 @@ $_def_amr_wb /* Use specific parts from FFmpeg. */ -`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` -`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'` -`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` -`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` -`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'` -`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` -`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define ENABLE_/;s/$/ 1/'` -`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` -`for part in $_libavencoders_all; do - if \` echo $_libavencoders | grep $part > /dev/null \`; then - echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/' - else - echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/' - fi - done` -`for part in $_libavmuxers_all; do - if \` echo $_libavmuxers | grep $part > /dev/null \`; then - echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/' - else - echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/' - fi - done` +`ff_config_enable "$_libavdecoders_all" "$_libavdecoders"` +`ff_config_enable "$_libavencoders_all" "$_libavencoders"` +`ff_config_enable "$_libavparsers_all" "$_libavparsers"` +`ff_config_enable "$_libavdemuxers_all" "$_libavdemuxers"` +`ff_config_enable "$_libavmuxers_all" "$_libavmuxers"` $_def_lavc_faac $_def_lavc_xvid

4 5

r21804 - trunk/etc/codecs.conf
by aurel 01 Jan '07

01 Jan '07

Author: aurel Date: Sun Dec 31 19:12:06 2006 New Revision: 21804 Modified: trunk/etc/codecs.conf Log: Comment about lavf required for musepack and remove unneeded format entry. Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sun Dec 31 19:12:06 2006 @@ -2824,9 +2824,9 @@ audiocodec ffmusepack7 info "Musepack sv7 audio codec" + comment "only works with libavformat demuxer" status working fourcc "MPC " - format 0x2b4d driver ffmpeg dll "mpc sv7"

3 2

r21779 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c
by aurel 31 Dec '06

31 Dec '06

Author: aurel Date: Thu Dec 28 01:40:49 2006 New Revision: 21779 Modified: trunk/etc/codecs.conf trunk/libmpdemux/demux_lavf.c Log: add support for musepack native decoder from ffmpeg (require -demuxer lavf) Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Thu Dec 28 01:40:49 2006 @@ -2822,6 +2822,14 @@ driver ffmpeg dll "dts" +audiocodec ffmusepack7 + info "Musepack sv7 audio codec" + status working + fourcc "MPC " + format 0x2b4d + driver ffmpeg + dll "mpc sv7" + audiocodec musepack info "Musepack audio codec" status working Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Thu Dec 28 01:40:49 2006 @@ -78,6 +78,7 @@ { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, + { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')},

3 2

r21803 - trunk/libmpdemux/demuxer.c
by nicodvb 31 Dec '06

31 Dec '06

Author: nicodvb Date: Sun Dec 31 18:24:14 2006 New Revision: 21803 Modified: trunk/libmpdemux/demuxer.c Log: removed unused variable Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c (original) +++ trunk/libmpdemux/demuxer.c Sun Dec 31 18:24:14 2006 @@ -1053,7 +1053,6 @@ */ int demuxer_get_current_time(demuxer_t *demuxer){ double get_time_ans = 0; - double tm; sh_video_t *sh_video = demuxer->video->sh; if(demuxer->stream_pts != MP_NOPTS_VALUE) get_time_ans = demuxer->stream_pts;

1 0

r21801 - tags/MPlayer-1.0rc1try2
by rtogni 31 Dec '06

31 Dec '06

Author: rtogni Date: Sun Dec 31 14:55:25 2006 New Revision: 21801 Added: tags/MPlayer-1.0rc1try2/ - copied from r21800, /branches/1.0rc1/ Log: MPlayer 1.0rc1try2 security fix release

1 0

r21800 - in branches/1.0rc1/stream/realrtsp: asmrp.c asmrp.h real.c
by rtogni 31 Dec '06

31 Dec '06

Author: rtogni Date: Sun Dec 31 14:46:17 2006 New Revision: 21800 Modified: branches/1.0rc1/stream/realrtsp/asmrp.c branches/1.0rc1/stream/realrtsp/asmrp.h branches/1.0rc1/stream/realrtsp/real.c Log: Fix potential buffer overflow in asm rules matching code Modified: branches/1.0rc1/stream/realrtsp/asmrp.c ============================================================================== --- branches/1.0rc1/stream/realrtsp/asmrp.c (original) +++ branches/1.0rc1/stream/realrtsp/asmrp.c Sun Dec 31 14:46:17 2006 @@ -40,6 +40,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include "asmrp.h" /* #define LOG @@ -645,8 +646,10 @@ #ifdef LOG printf ("rule #%d is true\n", rule_num); #endif - matches[num_matches] = rule_num; - num_matches++; + if(num_matches < MAX_RULEMATCHES - 1) + matches[num_matches++] = rule_num; + else + printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num); } rule_num++; Modified: branches/1.0rc1/stream/realrtsp/asmrp.h ============================================================================== --- branches/1.0rc1/stream/realrtsp/asmrp.h (original) +++ branches/1.0rc1/stream/realrtsp/asmrp.h Sun Dec 31 14:46:17 2006 @@ -40,6 +40,8 @@ #ifndef HAVE_ASMRP_H #define HAVE_ASMRP_H +#define MAX_RULEMATCHES 16 + int asmrp_match (const char *rules, int bandwidth, int *matches) ; #endif Modified: branches/1.0rc1/stream/realrtsp/real.c ============================================================================== --- branches/1.0rc1/stream/realrtsp/real.c (original) +++ branches/1.0rc1/stream/realrtsp/real.c Sun Dec 31 14:46:17 2006 @@ -271,7 +271,7 @@ int j=0; int n; char b[64]; - int rulematches[16]; + int rulematches[MAX_RULEMATCHES]; #ifdef LOG printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);

1 0

r21799 - in trunk/stream/realrtsp: asmrp.c asmrp.h real.c
by rtogni 31 Dec '06

31 Dec '06

Author: rtogni Date: Sun Dec 31 14:27:53 2006 New Revision: 21799 Modified: trunk/stream/realrtsp/asmrp.c trunk/stream/realrtsp/asmrp.h trunk/stream/realrtsp/real.c Log: Fix potential buffer overflow in asm rules matching code Modified: trunk/stream/realrtsp/asmrp.c ============================================================================== --- trunk/stream/realrtsp/asmrp.c (original) +++ trunk/stream/realrtsp/asmrp.c Sun Dec 31 14:27:53 2006 @@ -41,6 +41,7 @@ #include <stdio.h> #include <string.h> #include "mp_msg.h" +#include "asmrp.h" /* #define LOG @@ -646,8 +647,11 @@ #ifdef LOG printf ("rule #%d is true\n", rule_num); #endif - matches[num_matches] = rule_num; - num_matches++; + if(num_matches < MAX_RULEMATCHES - 1) + matches[num_matches++] = rule_num; + else + mp_msg(MSGT_STREAM, MSGL_ERR, + "Ignoring matched asm rule %d, too many matched rules.\n", rule_num); } rule_num++; Modified: trunk/stream/realrtsp/asmrp.h ============================================================================== --- trunk/stream/realrtsp/asmrp.h (original) +++ trunk/stream/realrtsp/asmrp.h Sun Dec 31 14:27:53 2006 @@ -40,6 +40,8 @@ #ifndef HAVE_ASMRP_H #define HAVE_ASMRP_H +#define MAX_RULEMATCHES 16 + int asmrp_match (const char *rules, int bandwidth, int *matches) ; #endif Modified: trunk/stream/realrtsp/real.c ============================================================================== --- trunk/stream/realrtsp/real.c (original) +++ trunk/stream/realrtsp/real.c Sun Dec 31 14:27:53 2006 @@ -275,7 +275,7 @@ int j=0; int n; char b[64]; - int rulematches[16]; + int rulematches[MAX_RULEMATCHES]; #ifdef LOG printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);

1 0

r21798 - trunk/libmpdemux/demuxer.c
by nicodvb 31 Dec '06

31 Dec '06

Author: nicodvb Date: Sun Dec 31 12:09:53 2006 New Revision: 21798 Modified: trunk/libmpdemux/demuxer.c Log: use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME) Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c (original) +++ trunk/libmpdemux/demuxer.c Sun Dec 31 12:09:53 2006 @@ -1055,9 +1055,9 @@ double get_time_ans = 0; double tm; sh_video_t *sh_video = demuxer->video->sh; - if(stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_TIME,(void *)&tm)!=STREAM_UNSUPORTED) { - get_time_ans = tm; - } else if(sh_video) get_time_ans = sh_video->pts; + if(demuxer->stream_pts != MP_NOPTS_VALUE) + get_time_ans = demuxer->stream_pts; + else if(sh_video) get_time_ans = sh_video->pts; return (int) get_time_ans; }

1 0