RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

print more time_base fps stuff if av_log level is at debug or above 

print more likely correct fps
not sure if this is formated optimally ...

Originally committed as revision 4596 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-09-18 14:45:17 +00:00
parent 357a28430a
commit 2118901192
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/utils.c
View File

@ -1072,9 +1072,14 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
}
if (enc->width) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %dx%d, %0.2f fps",
enc->width, enc->height,
1/av_q2d(enc->time_base));
", %dx%d",
enc->width, enc->height);
if(av_log_get_level() >= AV_LOG_DEBUG){
int g= ff_gcd(enc->time_base.num, enc->time_base.den);
snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %d/%d",
enc->time_base.num/g, enc->time_base.den/g);
}
}
if (encode) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),

5
libavformat/utils.c
View File

@ -2598,6 +2598,7 @@ void dump_format(AVFormatContext *ic,
}
for(i=0;i<ic->nb_streams;i++) {
AVStream *st = ic->streams[i];
int g= ff_gcd(st->time_base.num, st->time_base.den);
avcodec_string(buf, sizeof(buf), st->codec, is_output);
av_log(NULL, AV_LOG_INFO, " Stream #%d.%d", index, i);
/* the pid is an important information, so we display it */
@ -2612,6 +2613,10 @@ void dump_format(AVFormatContext *ic,
if (strlen(st->language) > 0) {
av_log(NULL, AV_LOG_INFO, "(%s)", st->language);
}
av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g);
if(st->codec->codec_type == CODEC_TYPE_VIDEO){
av_log(NULL, AV_LOG_INFO, ", %5.2f fps", av_q2d(st->r_frame_rate));
}
av_log(NULL, AV_LOG_INFO, ": %s\n", buf);
}
}