mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
74a8dbe1c4
@ -36,7 +36,7 @@
|
||||
#include "buffersink.h"
|
||||
#include "internal.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct BufferSinkContext {
|
||||
const AVClass *class;
|
||||
AVFifoBuffer *fifo; ///< FIFO buffer of video frame references
|
||||
unsigned warning_limit;
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "video.h"
|
||||
#include "avcodec.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct BufferSourceContext {
|
||||
const AVClass *class;
|
||||
AVFifoBuffer *fifo;
|
||||
AVRational time_base; ///< time_base to set in the output link
|
||||
|
@ -138,7 +138,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct SelectContext {
|
||||
const AVClass *class;
|
||||
char *expr_str;
|
||||
AVExpr *expr;
|
||||
|
@ -39,7 +39,7 @@ typedef struct Buf {
|
||||
struct Buf *next;
|
||||
} Buf;
|
||||
|
||||
typedef struct {
|
||||
typedef struct FifoContext {
|
||||
Buf root;
|
||||
Buf *last; ///< last buffered frame
|
||||
|
||||
|
@ -82,7 +82,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct SetPTSContext {
|
||||
const AVClass *class;
|
||||
char *expr_str;
|
||||
AVExpr *expr;
|
||||
|
@ -51,7 +51,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct SetTBContext {
|
||||
const AVClass *class;
|
||||
char *tb_expr;
|
||||
double var_values[VAR_VARS_NB];
|
||||
|
@ -44,12 +44,12 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct MovieStream {
|
||||
AVStream *st;
|
||||
int done;
|
||||
} MovieStream;
|
||||
|
||||
typedef struct {
|
||||
typedef struct MovieContext {
|
||||
/* common A/V fields */
|
||||
const AVClass *class;
|
||||
int64_t seek_point; ///< seekpoint in microseconds
|
||||
|
@ -64,7 +64,7 @@ typedef struct UnsharpFilterParam {
|
||||
uint32_t *sc[MAX_MATRIX_SIZE - 1]; ///< finite state machine storage
|
||||
} UnsharpFilterParam;
|
||||
|
||||
typedef struct {
|
||||
typedef struct UnsharpContext {
|
||||
const AVClass *class;
|
||||
int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
|
||||
float lamount, camount;
|
||||
|
@ -56,7 +56,7 @@ enum var_name {
|
||||
VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct AspectContext {
|
||||
const AVClass *class;
|
||||
AVRational dar;
|
||||
AVRational sar;
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct BlackFrameContext {
|
||||
const AVClass *class;
|
||||
int bamount; ///< black amount
|
||||
int bthresh; ///< black threshold
|
||||
|
@ -55,13 +55,13 @@ enum var_name {
|
||||
VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct FilterParam {
|
||||
int radius;
|
||||
int power;
|
||||
char *radius_expr;
|
||||
} FilterParam;
|
||||
|
||||
typedef struct {
|
||||
typedef struct BoxBlurContext {
|
||||
const AVClass *class;
|
||||
FilterParam luma_param;
|
||||
FilterParam chroma_param;
|
||||
|
@ -73,7 +73,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct CropContext {
|
||||
const AVClass *class;
|
||||
int x; ///< x offset of the non-cropped area with respect to the input area
|
||||
int y; ///< y offset of the non-cropped area with respect to the input area
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct CropDetectContext {
|
||||
const AVClass *class;
|
||||
int x1, y1, x2, y2;
|
||||
int limit;
|
||||
|
@ -148,7 +148,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct DelogoContext {
|
||||
const AVClass *class;
|
||||
int x, y, w, h, band, show;
|
||||
} DelogoContext;
|
||||
|
@ -66,7 +66,7 @@ enum var_name {
|
||||
VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct DrawBoxContext {
|
||||
const AVClass *class;
|
||||
int x, y, w, h;
|
||||
int thickness;
|
||||
|
@ -126,7 +126,7 @@ enum expansion_mode {
|
||||
EXP_STRFTIME,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct DrawTextContext {
|
||||
const AVClass *class;
|
||||
enum expansion_mode exp_mode; ///< expansion mode to use for the text
|
||||
int reinit; ///< tells if the filter is being reinited
|
||||
@ -260,7 +260,7 @@ struct ft_error
|
||||
|
||||
#define FT_ERRMSG(e) ft_errors[e].err_msg
|
||||
|
||||
typedef struct {
|
||||
typedef struct Glyph {
|
||||
FT_Glyph *glyph;
|
||||
uint32_t code;
|
||||
FT_Bitmap bitmap; ///< array holding bitmaps of font
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct ColorContext {
|
||||
const AVClass *class;
|
||||
AVLFG lfg;
|
||||
unsigned int lfg_seed;
|
||||
|
@ -49,7 +49,7 @@
|
||||
#define FADE_IN 0
|
||||
#define FADE_OUT 1
|
||||
|
||||
typedef struct {
|
||||
typedef struct FadeContext {
|
||||
const AVClass *class;
|
||||
int type;
|
||||
int factor, fade_per_frame;
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct FieldOrderContext {
|
||||
const AVClass *class;
|
||||
int dst_tff; ///< output bff/tff
|
||||
int line_size[4]; ///< bytes of pixel data per line for each plane
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct FormatContext {
|
||||
const AVClass *class;
|
||||
char *pix_fmts;
|
||||
/**
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct NullContext {
|
||||
const AVClass *class;
|
||||
int frame_step;
|
||||
} FrameStepContext;
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/imgutils.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct FlipContext {
|
||||
int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes
|
||||
int planewidth[4]; ///< width of each plane
|
||||
int planeheight[4]; ///< height of each plane
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include "libavutil/opt.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct HQDN3DContext {
|
||||
const AVClass *class;
|
||||
int16_t *coefs[4];
|
||||
uint16_t *line;
|
||||
|
@ -47,7 +47,7 @@ enum FieldType {
|
||||
FIELD_LOWER = 1,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct InterlaceContext {
|
||||
const AVClass *class;
|
||||
enum ScanMode scan; // top or bottom field first scanning
|
||||
#if FF_API_INTERLACE_LOWPASS_SET
|
||||
|
@ -68,7 +68,7 @@ static int query_formats(AVFilterContext *ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct OCVContext {
|
||||
const AVClass *class;
|
||||
char *name;
|
||||
char *params;
|
||||
@ -78,7 +78,7 @@ typedef struct {
|
||||
void *priv;
|
||||
} OCVContext;
|
||||
|
||||
typedef struct {
|
||||
typedef struct SmoothContext {
|
||||
int type;
|
||||
int param1, param2;
|
||||
double param3, param4;
|
||||
@ -245,7 +245,7 @@ static int parse_iplconvkernel(IplConvKernel **kernel, char *buf, void *log_ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct DilateContext {
|
||||
int nb_iterations;
|
||||
IplConvKernel *kernel;
|
||||
} DilateContext;
|
||||
@ -302,7 +302,7 @@ static void erode_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplIma
|
||||
cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct OCVFilterEntry {
|
||||
const char *name;
|
||||
size_t priv_size;
|
||||
int (*init)(AVFilterContext *ctx, const char *args);
|
||||
|
@ -57,7 +57,7 @@ enum var_name {
|
||||
VAR_VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct LutContext {
|
||||
const AVClass *class;
|
||||
uint8_t lut[4][256]; ///< lookup table for each component
|
||||
char *comp_expr_str[4];
|
||||
|
@ -91,7 +91,7 @@ static const char *eof_action_str[] = {
|
||||
#define U 1
|
||||
#define V 2
|
||||
|
||||
typedef struct {
|
||||
typedef struct OverlayContext {
|
||||
const AVClass *class;
|
||||
int x, y; ///< position of overlayed picture
|
||||
|
||||
|
@ -77,7 +77,7 @@ static int query_formats(AVFilterContext *ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct PadContext {
|
||||
const AVClass *class;
|
||||
int w, h; ///< output dimensions, a value of 0 will result in the input size
|
||||
int x, y; ///< offsets of the input area with respect to the padded area
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct PixdescTestContext {
|
||||
const AVPixFmtDescriptor *pix_desc;
|
||||
uint16_t *line;
|
||||
} PixdescTestContext;
|
||||
|
@ -71,7 +71,7 @@ enum var_name {
|
||||
VARS_NB
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct ScaleContext {
|
||||
const AVClass *class;
|
||||
struct SwsContext *sws; ///< software scaler context
|
||||
struct SwsContext *isws[2]; ///< software scaler context for interlaced material
|
||||
|
@ -51,7 +51,7 @@ enum TransposeDir {
|
||||
TRANSPOSE_CLOCK_FLIP,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
typedef struct TransContext {
|
||||
const AVClass *class;
|
||||
int hsub, vsub;
|
||||
int pixsteps[4];
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct FlipContext {
|
||||
int vsub; ///< vertical chroma subsampling
|
||||
} FlipContext;
|
||||
|
||||
|
@ -47,7 +47,7 @@
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct TestSourceContext {
|
||||
const AVClass *class;
|
||||
int w, h;
|
||||
unsigned int nb_frame;
|
||||
@ -488,7 +488,7 @@ static void draw_digit(int digit, uint8_t *dst, int dst_linesize,
|
||||
#define LEFT_BOT_VBAR 16
|
||||
#define RIGHT_TOP_VBAR 32
|
||||
#define RIGHT_BOT_VBAR 64
|
||||
struct {
|
||||
struct segments {
|
||||
int x, y, w, h;
|
||||
} segments[] = {
|
||||
{ 1, 0, 5, 1 }, /* TOP_HBAR */
|
||||
|
Loading…
Reference in New Issue
Block a user