RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

accurate bitrate calculation using index, and more accurate guessing 

if no index available.
based on patch by eviv bulgroz <ebulgroz@yahoo.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8517 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-12-21 22:11:48 +00:00
parent 08346ddf82
commit ab560e0258
1 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libmpdemux/demux_avi.c
View File

@ -547,20 +547,58 @@ demuxer_t* demux_open_avi(demuxer_t* demuxer){
// calc. FPS: // calc. FPS:
sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; 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; sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
// calculating video bitrate:
sh_video->i_bps=demuxer->movi_end-demuxer->movi_start-priv->idx_size*8; // calculating audio/video bitrate:
if(sh_audio) sh_video->i_bps-=sh_audio->audio.dwLength; if(priv->idx_size>0){
mp_msg(MSGT_DEMUX,MSGL_V,"AVI video length=%lu\n",(unsigned long)sh_video->i_bps); // we have index, let's count 'em!
sh_video->i_bps=((float)sh_video->i_bps/(float)sh_video->video.dwLength)*sh_video->fps; size_t vsize=0;
size_t asize=0;
if((priv->numberofframes=sh_video->video.dwLength)<=1) size_t vsamples=0;
// bad video header, try to get number of frames from audio size_t asamples=0;
if(sh_audio && sh_audio->wf->nAvgBytesPerSec) priv->numberofframes=sh_video->fps*sh_audio->audio.dwLength/sh_audio->wf->nAvgBytesPerSec; int i;
if(priv->numberofframes<=1){ for(i=0;i<priv->idx_size;i++){
mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CouldntDetFNo); int id=avi_stream_id(((AVIINDEXENTRY *)priv->idx)[i].ckid);
priv->numberofframes=0; int len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
} if(sh_video->ds->id == id) {
vsize+=len;
++vsamples;
}
else if(sh_audio && sh_audio->ds->id == id) {
asize+=len;
asamples+=(len+priv->audio_block_size-1)/priv->audio_block_size;
}
}
mp_msg(MSGT_DEMUX,MSGL_V,"AVI video size=%lu (%lu) audio size=%lu (%lu)\n",vsize,vsamples,asize,asamples);
priv->numberofframes=vsamples;
sh_video->i_bps=((float)vsize/(float)vsamples)*(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
if(sh_audio) sh_audio->i_bps=((float)asize/(float)asamples)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
} else {
// guessing, results may be inaccurate:
size_t vsize;
size_t asize=0;
if((priv->numberofframes=sh_video->video.dwLength)<=1)
// bad video header, try to get number of frames from audio
if(sh_audio && sh_audio->wf->nAvgBytesPerSec) priv->numberofframes=sh_video->fps*sh_audio->audio.dwLength/sh_audio->wf->nAvgBytesPerSec;
if(priv->numberofframes<=1){
mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CouldntDetFNo);
priv->numberofframes=0;
}
if(sh_audio){
if(sh_audio->wf->nAvgBytesPerSec && sh_audio->audio.dwSampleSize!=1){
asize=sh_audio->wf->nAvgBytesPerSec*priv->numberofframes*sh_video->frametime;
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);
}
}
vsize=demuxer->movi_end-demuxer->movi_start-asize-8*priv->numberofframes;
mp_msg(MSGT_DEMUX,MSGL_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);
}
mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n", mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n",
(char *)&sh_video->bih->biCompression, (char *)&sh_video->bih->biCompression,
sh_video->bih->biWidth, sh_video->bih->biWidth,