virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vf_blackframe: port missing features from libmpcodecs blackframe

Browse Source 
Use and show picref->video->pict_type and key_frame information.
The pict_type and key_frame information was not available at the time
of the port.
This commit is contained in:
Stefano Sabatini 2011-07-17 17:05:14 +02:00
parent daa6237229
commit c76974524a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avfilter.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 27 #define LIBAVFILTER_VERSION_MINOR 27
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \

11
libavfilter/vf_blackframe.c
View File

@ -34,6 +34,7 @@ typedef struct {
unsigned int bthresh; ///< black threshold unsigned int bthresh; ///< black threshold
unsigned int frame; ///< frame number unsigned int frame; ///< frame number
unsigned int nblack; ///< number of black pixels counted so far unsigned int nblack; ///< number of black pixels counted so far
unsigned int last_keyframe; ///< frame number of the last received key-frame
} BlackFrameContext; } BlackFrameContext;
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
@ -56,6 +57,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
blackframe->bthresh = 32; blackframe->bthresh = 32;
blackframe->nblack = 0; blackframe->nblack = 0;
blackframe->frame = 0; blackframe->frame = 0;
blackframe->last_keyframe = 0;
if (args) if (args)
sscanf(args, "%u:%u", &blackframe->bamount, &blackframe->bthresh); sscanf(args, "%u:%u", &blackframe->bamount, &blackframe->bthresh);
@ -95,11 +97,16 @@ static void end_frame(AVFilterLink *inlink)
AVFilterBufferRef *picref = inlink->cur_buf; AVFilterBufferRef *picref = inlink->cur_buf;
int pblack = 0; int pblack = 0;
if (picref->video->key_frame)
blackframe->last_keyframe = blackframe->frame;
pblack = blackframe->nblack * 100 / (inlink->w * inlink->h); pblack = blackframe->nblack * 100 / (inlink->w * inlink->h);
if (pblack >= blackframe->bamount) if (pblack >= blackframe->bamount)
av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pos:%"PRId64" pts:%"PRId64" t:%f\n", av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pos:%"PRId64" pts:%"PRId64" t:%f "
"type:%c last_keyframe:%d\n",
blackframe->frame, pblack, picref->pos, picref->pts, blackframe->frame, pblack, picref->pos, picref->pts,
picref->pts == AV_NOPTS_VALUE ? -1 : picref->pts * av_q2d(inlink->time_base)); picref->pts == AV_NOPTS_VALUE ? -1 : picref->pts * av_q2d(inlink->time_base),
av_get_picture_type_char(picref->video->pict_type), blackframe->last_keyframe);
blackframe->frame++; blackframe->frame++;
blackframe->nblack = 0; blackframe->nblack = 0;