[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[210] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[210] mplayerxp
|
From: <nic...@us...> - 2012-10-25 17:23:54
|
Revision: 210
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=210&view=rev
Author: nickols_k
Date: 2012-10-25 17:23:43 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
remove redundant element
Modified Paths:
--------------
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_bmp.c
mplayerxp/libmpdemux/demux_dv.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_fli.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_nsv.c
mplayerxp/libmpdemux/demux_nuv.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_roq.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpdemux/video.c
mplayerxp/mplayer.c
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -367,7 +367,7 @@
} else {
sh_video_t *sh_video=demuxer->video->sh;
sh_video=d_video->sh;sh_video->ds=d_video;
- sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
+ sh_video->fps=1000.0f; // 1ms
MSG_V("VIDEO: [%.4s] %ldx%ld %dbpp\n",
(char *)&sh_video->bih->biCompression,
sh_video->bih->biWidth,
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -321,7 +321,6 @@
sh_video->aspect=get_avi_aspect(*(((char *)sh_video->bih)+0x28));
chunksize=0;
// sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
-// sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
// if(demuxer->video->id==-1) demuxer->video->id=stream_id;
// IdxFix:
idxfix_videostream=stream_id;
@@ -1249,7 +1248,6 @@
}
// calc. FPS:
sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
- sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
demuxer->movi_length=(unsigned)((float)demuxer->movi_length/sh_video->fps);
// calculating video bitrate:
if(priv->idx_size>0){
@@ -1295,12 +1293,12 @@
sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
} else {
asize=sh_audio->audio.dwLength;
- sh_audio->i_bps=(float)asize/(sh_video->frametime*priv->numberofframes);
+ sh_audio->i_bps=(float)asize*sh_video->fps/priv->numberofframes;
}
}
vsize=demuxer->movi_end-demuxer->movi_start-asize-8*priv->numberofframes;
MSG_V("AVI video size=%lu (%lu) audio size=%lu\n",vsize,priv->numberofframes,asize);
- sh_video->i_bps=(float)vsize/(sh_video->frametime*priv->numberofframes);
+ sh_video->i_bps=(float)vsize*sh_video->fps/priv->numberofframes;
}
MSG_V("VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
(char *)&sh_video->bih->biCompression,
Modified: mplayerxp/libmpdemux/demux_bmp.c
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_bmp.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -182,7 +182,6 @@
sh_video->is_static = 1;
// get the speed
sh_video->fps = 2;
- sh_video->frametime = 2 / sh_video->fps;
// demuxer->priv = bmp_image;
@@ -282,7 +281,6 @@
// get the speed
sh_video->is_static = 1;
sh_video->fps = 1;
- sh_video->frametime = 1 / sh_video->fps;
demuxer->priv = bmp_image;
Modified: mplayerxp/libmpdemux/demux_dv.c
===================================================================
--- mplayerxp/libmpdemux/demux_dv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_dv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -182,7 +182,6 @@
mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() frame_size: %d w: %d h: %d dif_seq: %d system: %d\n",dv_decoder->frame_size,dv_decoder->width, dv_decoder->height,dv_decoder->num_dif_seqs,dv_decoder->system);
sh_video->fps= (dv_decoder->system==e_dv_system_525_60?29.97:25);
- sh_video->frametime = 1.0/sh_video->fps;
// emulate BITMAPINFOHEADER for win32 decoders:
sh_video->bih=calloc(1, sizeof(BITMAPINFOHEADER));
Modified: mplayerxp/libmpdemux/demux_film.c
===================================================================
--- mplayerxp/libmpdemux/demux_film.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_film.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -354,7 +354,6 @@
if (sh_video)
{
sh_video->fps = stream_read_dword(demuxer->stream);
- sh_video->frametime = 1.0 / sh_video->fps;
}
// fetch the number of chunks
Modified: mplayerxp/libmpdemux/demux_fli.c
===================================================================
--- mplayerxp/libmpdemux/demux_fli.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_fli.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -147,9 +147,8 @@
if (speed == 0)
speed = 1;
if (magic_number == 0xAF11)
- speed *= 1000/70;
- sh_video->fps = 1000 / speed;
- sh_video->frametime = 1/sh_video->fps;
+ speed *= 1000.0f/70.0f;
+ sh_video->fps = 1000.0f / speed;
// build the frame index
stream_seek(demuxer->stream, demuxer->movi_start);
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_lavf.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -364,7 +364,6 @@
sh_video->video.dwScale= codec->time_base.num;
}
sh_video->fps=av_q2d(st->r_frame_rate);
- sh_video->frametime=1/av_q2d(st->r_frame_rate);
sh_video->format = bih->biCompression;
sh_video->aspect= codec->width * codec->sample_aspect_ratio.num
/ (float)(codec->height * codec->sample_aspect_ratio.den);
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -2245,7 +2245,6 @@
if (track->v_frate == 0.0)
track->v_frate = 25.0;
sh_v->fps = track->v_frate;
- sh_v->frametime = 1 / track->v_frate;
sh_v->aspect = 0;
if (!track->realmedia)
{
Modified: mplayerxp/libmpdemux/demux_mov.c
===================================================================
--- mplayerxp/libmpdemux/demux_mov.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_mov.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -1100,7 +1100,7 @@
trak->stream_header_len = atom_len-8;
trak->stream_header = (unsigned char *)malloc(trak->stream_header_len);
memcpy(trak->stream_header, trak->stdata+pos+8, trak->stream_header_len);
- }
+ }
break;
case MOV_FOURCC('d','2','6','3'):
MSG_V("MOV: Found H.263 decoder atom %c%c%c%c (%d)!\n", trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],atom_len);
@@ -1120,7 +1120,6 @@
}
sh->fps=trak->timescale/
((trak->durmap_size>=1)?(float)trak->durmap[0].dur:1);
- sh->frametime=1.0f/sh->fps;
sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8);
sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8);
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -225,7 +225,6 @@
demuxer->video->sh=sh;
sh->ds=demuxer->video;
sh->fps=(float)(priv->sprop[id].num_packets*1000.)/(priv->sprop[id].PlayDuration-priv->sprop[id].Preroll);
- sh->frametime=1/sh->fps;
sh->format=sh->bih->biCompression;
sh->disp_w=sh->bih->biWidth;
sh->disp_h=sh->bih->biHeight;
Modified: mplayerxp/libmpdemux/demux_nsv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_nsv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -81,8 +81,8 @@
}
if (sh_video)
- priv->v_pts =demuxer->video->pts= priv->video_pack_no *
- (float)sh_video->frametime;
+ priv->v_pts =demuxer->video->pts= priv->video_pack_no /
+ (float)sh_video->fps;
else
priv->v_pts = priv->video_pack_no;
@@ -302,14 +302,13 @@
break;
default:
sh_video->fps = (float)priv->fps;
- }
- sh_video->frametime = (float)1.0 / (float)sh_video->fps;
+ }
}
- }
+ }
// seek to start of NSV header
stream_seek(demuxer->stream,stream_tell(demuxer->stream)-17);
-
+
return demuxer;
}
Modified: mplayerxp/libmpdemux/demux_nuv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_nuv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -255,7 +255,6 @@
/* Get the FPS */
sh_video->fps = rtjpeg_fileheader.fps;
- sh_video->frametime = 1 / sh_video->fps;
if (rtjpeg_fileheader.audioblocks != 0)
{
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -837,8 +837,6 @@
sh_v->bih->biCompression= sh_v->format = FOURCC_THEORA;
sh_v->fps = ((double)inf.fps_numerator)/
(double)inf.fps_denominator;
- sh_v->frametime = ((double)inf.fps_denominator)/
- (double)inf.fps_numerator;
sh_v->disp_w = sh_v->bih->biWidth = inf.frame_width;
sh_v->disp_h = sh_v->bih->biHeight = inf.frame_height;
sh_v->bih->biBitCount = 24;
@@ -882,8 +880,7 @@
sh_v->bih->biCompression=
sh_v->format = mmioFOURCC(pack.packet[68],pack.packet[69],
pack.packet[70],pack.packet[71]);
- sh_v->frametime = get_uint64(pack.packet+164)*0.0000001;
- sh_v->fps = 1/sh_v->frametime;
+ sh_v->fps = 1/(get_uint64(pack.packet+164)*0.0000001);
sh_v->disp_w = sh_v->bih->biWidth = get_uint32(pack.packet+176);
sh_v->disp_h = sh_v->bih->biHeight = get_uint32(pack.packet+180);
sh_v->bih->biBitCount = get_uint16(pack.packet+182);
@@ -933,8 +930,7 @@
sh_v->bih->biCompression=
sh_v->format = mmioFOURCC(st->subtype[0],st->subtype[1],
st->subtype[2],st->subtype[3]);
- sh_v->frametime = get_uint64(&st->time_unit)*0.0000001;
- sh_v->fps = 1.0/sh_v->frametime;
+ sh_v->fps = 1.0/(get_uint64(&st->time_unit)*0.0000001);
sh_v->bih->biBitCount = get_uint16(&st->bits_per_sample);
sh_v->disp_w = sh_v->bih->biWidth = get_uint32(&st->sh.video.width);
sh_v->disp_h = sh_v->bih->biHeight = get_uint32(&st->sh.video.height);
Modified: mplayerxp/libmpdemux/demux_rawvideo.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_rawvideo.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -103,7 +103,6 @@
sh_video = new_sh_video(demuxer,0);
sh_video->format=format;
sh_video->fps=fps;
- sh_video->frametime=1.0/fps;
sh_video->disp_w=width;
sh_video->disp_h=height;
sh_video->i_bps=fps*imgsize;
@@ -137,7 +136,7 @@
pos+=(seeka->flags&DEMUX_SEEK_PERCENTS?demuxer->movi_end-demuxer->movi_start:sh_video->i_bps)*seeka->secs;
pos/=imgsize;
stream_seek(s,pos*imgsize);
- sh_video->timer=pos * sh_video->frametime;
+ sh_video->timer=pos / sh_video->fps;
// printf("demux_rawvideo: streamtell=%d\n",(int)stream_tell(demuxer->stream));
}
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -333,7 +333,7 @@
#define SKIP_BITS(n) buffer<<=n
#define SHOW_BITS(n) ((buffer)>>(32-(n)))
-static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, float frametime, unsigned int format)
+static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, unsigned int format)
{
float v_pts;
uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3];
@@ -378,7 +378,6 @@
}
#endif
v_pts=kf*0.001f;
-// if(v_pts<priv->v_pts || !kf) v_pts=priv->v_pts+frametime;
priv->v_pts=v_pts;
return v_pts;
}
@@ -643,7 +642,7 @@
priv->video_after_seek = 0;
} else
dp->pts=(dp_hdr->len<3)?0:
- real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format);
+ real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->format);
ds_add_packet(ds,dp);
ds->asf_packet=NULL;
} else {
@@ -679,7 +678,7 @@
priv->video_after_seek = 0;
} else
dp->pts=(dp_hdr->len<3)?0:
- real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format);
+ real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->format);
ds_add_packet(ds,dp);
ds->asf_packet=NULL;
// continue parsing
@@ -736,7 +735,7 @@
priv->video_after_seek = 0;
} else
dp->pts=(dp_hdr->len<3)?0:
- real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format);
+ real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->format);
ds_add_packet(ds,dp);
} // while(len>0)
@@ -1231,15 +1230,14 @@
sh->fps = (float) stream_read_word(demuxer->stream);
if (sh->fps<=0) sh->fps=24; // we probably won't even care about fps
- sh->frametime = 1.0f/sh->fps;
-
+
stream_skip(demuxer->stream, 4);
// if(sh->format==0x30335652 || sh->format==0x30325652 )
if(1)
{
int tmp=stream_read_word(demuxer->stream);
if(tmp>0){
- sh->fps=tmp; sh->frametime = 1.0f/sh->fps;
+ sh->fps=tmp;
}
} else {
int fps=stream_read_word(demuxer->stream);
Modified: mplayerxp/libmpdemux/demux_roq.c
===================================================================
--- mplayerxp/libmpdemux/demux_roq.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_roq.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -151,7 +151,6 @@
// constant frame rate
sh_video->fps = fps;
- sh_video->frametime = 1 / sh_video->fps;
}
}
else if ((chunk_id == RoQ_SOUND_MONO) ||
Modified: mplayerxp/libmpdemux/demux_smjpeg.c
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -125,7 +125,6 @@
stream_skip(demuxer->stream, 4); /* number of frames */
// sh_video->fps = 24;
-// sh_video->frametime = 1.0f/sh_video->fps;
sh_video->disp_w = stream_read_word(demuxer->stream);
sh_video->disp_h = stream_read_word(demuxer->stream);
sh_video->format = stream_read_dword_le(demuxer->stream);
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_viv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -578,7 +578,6 @@
else
sh->fps=15.0f;
}
- sh->frametime=1.0f/sh->fps;
/* XXX: FIXME: can't scale image. */
/* hotfix to disable: */
Modified: mplayerxp/libmpdemux/demux_y4m.c
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/demux_y4m.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -179,7 +179,6 @@
sh->fps = 25.0f;
}
}
- sh->frametime = 1.0f/sh->fps;
}
else
{
@@ -188,14 +187,13 @@
MSG_FATAL( "error parsing YUV4MPEG header: %s\n", y4m_strerr(err));
if(!sh->fps) {
- ratio = y4m_si_get_framerate(priv->si);
- if (ratio.d != 0)
- sh->fps=(float)ratio.n/(float)ratio.d;
- else
- sh->fps=15.0f;
+ ratio = y4m_si_get_framerate(priv->si);
+ if (ratio.d != 0)
+ sh->fps=(float)ratio.n/(float)ratio.d;
+ else
+ sh->fps=15.0f;
}
- sh->frametime=1.0f/sh->fps;
-
+
ratio = y4m_si_get_sampleaspect(priv->si);
if (ratio.d != 0 && ratio.n != 0)
sh->aspect = (float)ratio.n/(float)ratio.d;
Modified: mplayerxp/libmpdemux/s_tv.c
===================================================================
--- mplayerxp/libmpdemux/s_tv.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/s_tv.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -269,7 +269,7 @@
// if (IMGFMT_IS_RGB(sh_video->format) || IMGFMT_IS_BGR(sh_video->format))
// sh_video->format = 0x0;
- /* set FPS and FRAMETIME */
+ /* set FPS */
if(!sh_video->fps)
{
@@ -282,10 +282,8 @@
if (tv_param_fps != -1.0f)
sh_video->fps = tv_param_fps;
- sh_video->frametime = 1.0f/sh_video->fps;
+ MSG_V("fps: %f, frametime: %f\n", sh_video->fps, 1.0f/sh_video->fps);
- MSG_V("fps: %f, frametime: %f\n", sh_video->fps, sh_video->frametime);
-
#ifdef HAVE_TV_BSDBT848
/* If playback only mode, go to immediate mode, fail silently */
if(tv_param_immediate == 1)
Modified: mplayerxp/libmpdemux/stheader.h
===================================================================
--- mplayerxp/libmpdemux/stheader.h 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/stheader.h 2012-10-25 17:23:43 UTC (rev 210)
@@ -66,7 +66,6 @@
// output format:
float timer; // value of old v_frame
float fps;
- float frametime; // 1/fps
int chapter_change;
unsigned i_bps; // == bitrate (compressed bytes/sec)
unsigned disp_w,disp_h;// display size (filled by fileformat parser)
Modified: mplayerxp/libmpdemux/video.c
===================================================================
--- mplayerxp/libmpdemux/video.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/libmpdemux/video.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -215,7 +215,6 @@
}
if(picture.fps) {
sh_video->fps=picture.fps*0.0001f;
- sh_video->frametime=10000.0f/(float)picture.fps;
MSG_INFO("FPS seems to be: %d/10000\n", picture.fps);
}
MSG_V("OK!\n");
@@ -269,7 +268,6 @@
sh_video->format=0x10000005;
if(picture.fps) {
sh_video->fps=picture.fps*0.0001f;
- sh_video->frametime=10000.0f/(float)picture.fps;
MSG_INFO("FPS seems to be: %d/10000\n", picture.fps);
}
break;
@@ -359,11 +357,6 @@
#if 0
sh_video->fps=mpeg_framerates[picture.frame_rate_code & 0x0F];
#endif
- if(!sh_video->fps){
- sh_video->frametime=0;
- } else {
- sh_video->frametime=1.0/sh_video->fps;
- }
sh_video->disp_w=picture.display_picture_width;
sh_video->disp_h=picture.display_picture_height;
// bitrate:
@@ -464,7 +457,6 @@
if((int)(sh_video->fps*10000+0.5)!=picture.fps) if(!force_fps && !telecine){
MSG_WARN("Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,picture.fps*0.0001,sh_video->fps-picture.fps*0.0001,picture.frame_rate_code);
sh_video->fps=picture.fps*0.0001;
- sh_video->frametime=10000.0f/(float)picture.fps;
}
#endif
@@ -486,7 +478,6 @@
} else
if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){
sh_video->fps=sh_video->fps*4/5;
- sh_video->frametime=sh_video->frametime*5/4;
MSG_INFO("Enter telecine mode\n");
telecine=1;
}
@@ -517,7 +508,6 @@
h264_parse_sps(&picture, &(videobuffer[pos]), videobuf_len - pos);
if(picture.fps > 0) {
sh_video->fps=picture.fps*0.0001f;
- sh_video->frametime=10000.0f/(float)picture.fps;
}
i=sync_video_packet(d_video);
if(!i) return -1;
@@ -534,7 +524,7 @@
}
// Increase video timers:
- frame_time*=sh_video->frametime;
+ frame_time*=1.0f/sh_video->fps;
/* override frame_time for variable/unknown FPS formats: */
if(!force_fps)
@@ -559,7 +549,6 @@
if(d>0)
if((int)sh_video->fps==1000)
MSG_STATUS("\rASF framerate: %d fps \n",(int)(1.0f/d));
- sh_video->frametime=d; // 1ms
sh_video->fps=1.0f/d;
frame_time = d;
} else {
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-10-25 17:08:21 UTC (rev 209)
+++ mplayerxp/mplayer.c 2012-10-25 17:23:43 UTC (rev 210)
@@ -1787,13 +1787,12 @@
} else {
MSG_V("[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n",
demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
- sh_video->fps,sh_video->frametime
+ sh_video->fps,1/sh_video->fps
);
vo_data->fps = sh_video->fps;
/* need to set fps here for output encoders to pick it up in their init */
if(force_fps){
sh_video->fps=force_fps;
- sh_video->frametime=1.0f/sh_video->fps;
vo_data->fps = force_fps;
}
@@ -2651,8 +2650,7 @@
if(force_fps && sh_video) {
vo_data->fps = sh_video->fps=force_fps;
- sh_video->frametime=1.0f/sh_video->fps;
- MSG_INFO(MSGTR_FPSforced,sh_video->fps,sh_video->frametime);
+ MSG_INFO(MSGTR_FPSforced,sh_video->fps,1.0f/sh_video->fps);
}
/* Init timers and benchmarking */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
