generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo

Browse Source
This commit is contained in:
Stefano Sabatini 2012-02-09 19:30:26 +01:00
parent 5d12b83ff1
commit 175ab5f9a9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/af_ashowinfo.c
View File

@ -25,6 +25,7 @@
#include "libavutil/adler32.h" #include "libavutil/adler32.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/timestamp.h"
#include "avfilter.h" #include "avfilter.h"
typedef struct { typedef struct {
@ -63,11 +64,11 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
samplesref->audio->channel_layout); samplesref->audio->channel_layout);
av_log(ctx, AV_LOG_INFO, av_log(ctx, AV_LOG_INFO,
"n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" " "n:%d pts:%s pts_time:%s pos:%"PRId64" "
"fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d " "fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d "
"checksum:%08X plane_checksum[%08X %08X %08X %08X %08X %08X %08X %08X]\n", "checksum:%08X plane_checksum[%08X %08X %08X %08X %08X %08X %08X %08X]\n",
showinfo->frame, showinfo->frame,
samplesref->pts, samplesref->pts * av_q2d(inlink->time_base), av_ts2str(samplesref->pts), av_ts2timestr(samplesref->pts, &inlink->time_base),
samplesref->pos, samplesref->pos,
av_get_sample_fmt_name(samplesref->format), av_get_sample_fmt_name(samplesref->format),
chlayout_str, chlayout_str,

5
libavfilter/vf_showinfo.c
View File

@ -25,6 +25,7 @@
#include "libavutil/adler32.h" #include "libavutil/adler32.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/timestamp.h"
#include "avfilter.h" #include "avfilter.h"
typedef struct { typedef struct {
@ -59,11 +60,11 @@ static void end_frame(AVFilterLink *inlink)
} }
av_log(ctx, AV_LOG_INFO, av_log(ctx, AV_LOG_INFO,
"n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" " "n:%d pts:%s pts_time:%s pos:%"PRId64" "
"fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
"checksum:%08X plane_checksum:[%08X %08X %08X %08X]\n", "checksum:%08X plane_checksum:[%08X %08X %08X %08X]\n",
showinfo->frame, showinfo->frame,
picref->pts, picref ->pts * av_q2d(inlink->time_base), picref->pos, av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), picref->pos,
av_pix_fmt_descriptors[picref->format].name, av_pix_fmt_descriptors[picref->format].name,
picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den, picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den,
picref->video->w, picref->video->h, picref->video->w, picref->video->h,