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

lavfi/select: make lavc dependency optional.

Browse Source
This commit is contained in:
Clément Bœsch 2012-06-29 19:13:13 +02:00
parent a16c512374
commit 2f39d7ff3f
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -1915,7 +1915,6 @@ pan_filter_deps="swresample"
removelogo_filter_deps="avcodec avformat swscale" removelogo_filter_deps="avcodec avformat swscale"
scale_filter_deps="swscale" scale_filter_deps="swscale"
smartblur_filter_deps="gpl swscale" smartblur_filter_deps="gpl swscale"
select_filter_deps="avcodec"
showspectrum_filter_deps="avcodec" showspectrum_filter_deps="avcodec"
super2xsai_filter_deps="gpl" super2xsai_filter_deps="gpl"
tinterlace_filter_deps="gpl" tinterlace_filter_deps="gpl"

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 16 #define LIBAVFILTER_VERSION_MINOR 16
#define LIBAVFILTER_VERSION_MICRO 105 #define LIBAVFILTER_VERSION_MICRO 106
#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, \

17
libavfilter/vf_select.c
View File

@ -25,13 +25,16 @@
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavcodec/dsputil.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "avfilter.h" #include "avfilter.h"
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
#if CONFIG_AVCODEC
#include "libavcodec/dsputil.h"
#endif
static const char *const var_names[] = { static const char *const var_names[] = {
"TB", ///< timebase "TB", ///< timebase
@ -116,9 +119,11 @@ typedef struct {
AVExpr *expr; AVExpr *expr;
double var_values[VAR_VARS_NB]; double var_values[VAR_VARS_NB];
int do_scene_detect; ///< 1 if the expression requires scene detection variables, 0 otherwise int do_scene_detect; ///< 1 if the expression requires scene detection variables, 0 otherwise
#if CONFIG_AVCODEC
AVCodecContext *avctx; ///< codec context required for the DSPContext (scene detect only) AVCodecContext *avctx; ///< codec context required for the DSPContext (scene detect only)
DSPContext c; ///< context providing optimized SAD methods (scene detect only) DSPContext c; ///< context providing optimized SAD methods (scene detect only)
double prev_mafd; ///< previous MAFD (scene detect only) double prev_mafd; ///< previous MAFD (scene detect only)
#endif
AVFilterBufferRef *prev_picref; ///< previous frame (scene detect only) AVFilterBufferRef *prev_picref; ///< previous frame (scene detect only)
double select; double select;
int cache_frames; int cache_frames;
@ -143,6 +148,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
} }
select->do_scene_detect = args && strstr(args, "scene"); select->do_scene_detect = args && strstr(args, "scene");
if (select->do_scene_detect && !CONFIG_AVCODEC) {
av_log(ctx, AV_LOG_ERROR, "Scene detection is not available without libavcodec.\n");
return AVERROR(EINVAL);
}
return 0; return 0;
} }
@ -175,7 +184,7 @@ static int config_input(AVFilterLink *inlink)
select->var_values[VAR_INTERLACE_TYPE_T] = INTERLACE_TYPE_T; select->var_values[VAR_INTERLACE_TYPE_T] = INTERLACE_TYPE_T;
select->var_values[VAR_INTERLACE_TYPE_B] = INTERLACE_TYPE_B; select->var_values[VAR_INTERLACE_TYPE_B] = INTERLACE_TYPE_B;
if (select->do_scene_detect) { if (CONFIG_AVCODEC && select->do_scene_detect) {
select->avctx = avcodec_alloc_context3(NULL); select->avctx = avcodec_alloc_context3(NULL);
if (!select->avctx) if (!select->avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -184,6 +193,7 @@ static int config_input(AVFilterLink *inlink)
return 0; return 0;
} }
#if CONFIG_AVCODEC
static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref) static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref)
{ {
double ret = 0; double ret = 0;
@ -217,6 +227,7 @@ static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref)
select->prev_picref = avfilter_ref_buffer(picref, ~0); select->prev_picref = avfilter_ref_buffer(picref, ~0);
return ret; return ret;
} }
#endif
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
@ -227,7 +238,7 @@ static int select_frame(AVFilterContext *ctx, AVFilterBufferRef *picref)
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
double res; double res;
if (select->do_scene_detect) if (CONFIG_AVCODEC && select->do_scene_detect)
select->var_values[VAR_SCENE] = get_scene_score(ctx, picref); select->var_values[VAR_SCENE] = get_scene_score(ctx, picref);
if (isnan(select->var_values[VAR_START_PTS])) if (isnan(select->var_values[VAR_START_PTS]))
select->var_values[VAR_START_PTS] = TS2D(picref->pts); select->var_values[VAR_START_PTS] = TS2D(picref->pts);