lavfi: name anonymous structs

Vittorio Giovara committed 12 years ago

Commit 58400ac1 parent 4936ef634 files · +40 −40Browse files

Unified · Split

34 files

libavfilter/buffersink.c +1 −1
libavfilter/buffersrc.c +1 −1
libavfilter/fifo.c +1 −1
libavfilter/setpts.c +1 −1
libavfilter/settb.c +1 −1
libavfilter/vf_aspect.c +1 −1
libavfilter/vf_blackframe.c +1 −1
libavfilter/vf_boxblur.c +2 −2
libavfilter/vf_crop.c +1 −1
libavfilter/vf_cropdetect.c +1 −1
libavfilter/vf_delogo.c +1 −1
libavfilter/vf_drawbox.c +1 −1
libavfilter/vf_drawtext.c +2 −2
libavfilter/vf_fade.c +1 −1
libavfilter/vf_fieldorder.c +1 −1
libavfilter/vf_format.c +1 −1
libavfilter/vf_hflip.c +1 −1
libavfilter/vf_hqdn3d.h +1 −1
libavfilter/vf_interlace.c +1 −1
libavfilter/vf_libopencv.c +4 −4
libavfilter/vf_lut.c +1 −1
libavfilter/vf_overlay.c +1 −1
libavfilter/vf_pad.c +1 −1
libavfilter/vf_pixdesctest.c +1 −1
libavfilter/vf_scale.c +1 −1
libavfilter/vf_select.c +1 −1
libavfilter/vf_showinfo.c +1 −1
libavfilter/vf_transpose.c +1 −1
libavfilter/vf_unsharp.c +1 −1
libavfilter/vf_vflip.c +1 −1
libavfilter/vsrc_color.c +1 −1
libavfilter/vsrc_movie.c +1 −1
libavfilter/vsrc_nullsrc.c +1 −1
libavfilter/vsrc_testsrc.c +2 −2

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	35	#include "buffersink.h"
36	36	#include "internal.h"
37	37
38		−typedef struct {
	38	+typedef struct BufferSinkContext {
39	39	AVFrame *cur_frame; ///< last frame delivered on the sink
40	40	AVAudioFifo *audio_fifo; ///< FIFO for audio samples
41	41	int64_t next_pts; ///< interpolating audio pts

libavfilter/buffersrc.c+1−1

@@ -40,7 +40,7 @@ · 39 unmodified lines
40	40	#include "internal.h"
41	41	#include "video.h"
42	42
43		−typedef struct {
	43	+typedef struct BufferSourceContext {
44	44	const AVClass *class;
45	45	AVFifoBuffer *fifo;
46	46	AVRational time_base; ///< time_base to set in the output link

libavfilter/fifo.c+1−1

@@ -39,7 +39,7 @@ typedef struct Buf { · 38 unmodified lines
39	39	struct Buf *next;
40	40	} Buf;
41	41
42		−typedef struct {
	42	+typedef struct FifoContext {
43	43	Buf root;
44	44	Buf *last; ///< last buffered frame
45	45

libavfilter/setpts.c+1−1

@@ -73,7 +73,7 @@ enum var_name { · 72 unmodified lines
73	73	VAR_VARS_NB
74	74	};
75	75
76		−typedef struct {
	76	+typedef struct SetPTSContext {
77	77	const AVClass *class;
78	78	char *expr_str;
79	79	AVExpr *expr;

libavfilter/settb.c+1−1

@@ -57,7 +57,7 @@ enum var_name { · 56 unmodified lines
57	57	VAR_VARS_NB
58	58	};
59	59
60		−typedef struct {
	60	+typedef struct SetTBContext {
61	61	const AVClass *class;
62	62	char *tb_expr;
63	63	double var_values[VAR_VARS_NB];

libavfilter/vf_aspect.c+1−1

@@ -62,7 +62,7 @@ enum var_name { · 61 unmodified lines
62	62	VARS_NB
63	63	};
64	64
65		−typedef struct {
	65	+typedef struct AspectContext {
66	66	const AVClass *class;
67	67	AVRational dar;
68	68	AVRational sar;

libavfilter/vf_blackframe.c+1−1

@@ -38,7 +38,7 @@ · 37 unmodified lines
38	38	#include "internal.h"
39	39	#include "video.h"
40	40
41		−typedef struct {
	41	+typedef struct BlackFrameContext {
42	42	const AVClass *class;
43	43	int bamount; ///< black amount
44	44	int bthresh; ///< black threshold

libavfilter/vf_boxblur.c+2−2

@@ -55,12 +55,12 @@ enum var_name { · 54 unmodified lines
55	55	VARS_NB
56	56	};
57	57
58		−typedef struct {
	58	+typedef struct FilterParam {
59	59	int radius;
60	60	int power;
61	61	} FilterParam;
62	62
63		−typedef struct {
	63	+typedef struct BoxBlurContext {
64	64	const AVClass *class;
65	65	FilterParam luma_param;
66	66	FilterParam chroma_param;

libavfilter/vf_crop.c+1−1

@@ -68,7 +68,7 @@ enum var_name { · 67 unmodified lines
68	68	VAR_VARS_NB
69	69	};
70	70
71		−typedef struct {
	71	+typedef struct CropContext {
72	72	const AVClass *class;
73	73	int x; ///< x offset of the non-cropped area with respect to the input area
74	74	int y; ///< y offset of the non-cropped area with respect to the input area

libavfilter/vf_cropdetect.c+1−1

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	34	#include "internal.h"
35	35	#include "video.h"
36	36
37		−typedef struct {
	37	+typedef struct CropDetectContext {
38	38	const AVClass *class;
39	39	int x1, y1, x2, y2;
40	40	int limit;

libavfilter/vf_delogo.c+1−1

@@ -130,7 +130,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, · 129 unmodified lines
130	130	}
131	131	}
132	132
133		−typedef struct {
	133	+typedef struct DelogoContext {
134	134	const AVClass *class;
135	135	int x, y, w, h, band, show;
136	136	} DelogoContext;

libavfilter/vf_drawbox.c+1−1

@@ -36,7 +36,7 @@ · 35 unmodified lines
36	36
37	37	enum { Y, U, V, A };
38	38
39		−typedef struct {
	39	+typedef struct DrawBoxContext {
40	40	const AVClass *class;
41	41	int x, y, w_opt, h_opt, w, h;
42	42	char *color_str;

libavfilter/vf_drawtext.c+2−2

@@ -105,7 +105,7 @@ enum var_name { · 104 unmodified lines
105	105	VAR_VARS_NB
106	106	};
107	107
108		−typedef struct {
	108	+typedef struct DrawTextContext {
109	109	const AVClass *class;
110	110	#if CONFIG_LIBFONTCONFIG
111	111	uint8_t *font; ///< font to be used
@@ -223,7 +223,7 @@ struct ft_error · 111 unmodified lines
223	223
224	224	#define FT_ERRMSG(e) ft_errors[e].err_msg
225	225
226		−typedef struct {
	226	+typedef struct Glyph {
227	227	FT_Glyph *glyph;
228	228	uint32_t code;
229	229	FT_Bitmap bitmap; ///< array holding bitmaps of font

libavfilter/vf_fade.c+1−1

@@ -36,7 +36,7 @@ · 35 unmodified lines
36	36	#define FADE_IN 0
37	37	#define FADE_OUT 1
38	38
39		−typedef struct {
	39	+typedef struct FadeContext {
40	40	const AVClass *class;
41	41	int type;
42	42	int factor, fade_per_frame;

libavfilter/vf_fieldorder.c+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	35	#include "internal.h"
36	36	#include "video.h"
37	37
38		−typedef struct {
	38	+typedef struct FieldOrderContext {
39	39	const AVClass *class;
40	40	int dst_tff; ///< output bff/tff
41	41	int line_size[4]; ///< bytes of pixel data per line for each plane

libavfilter/vf_format.c+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	35	#include "internal.h"
36	36	#include "video.h"
37	37
38		−typedef struct {
	38	+typedef struct FormatContext {
39	39	const AVClass *class;
40	40	char *pix_fmts;
41	41	/**

libavfilter/vf_hflip.c+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	35	#include "libavutil/intreadwrite.h"
36	36	#include "libavutil/imgutils.h"
37	37
38		−typedef struct {
	38	+typedef struct FlipContext {
39	39	int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes
40	40	int hsub, vsub; ///< chroma subsampling
41	41	} FlipContext;

libavfilter/vf_hqdn3d.h+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24
25	25	#include "libavutil/opt.h"
26	26
27		−typedef struct {
	27	+typedef struct HQDN3DContext {
28	28	const AVClass *class;
29	29	int16_t *coefs[4];
30	30	uint16_t *line;

libavfilter/vf_interlace.c+1−1

@@ -42,7 +42,7 @@ enum FieldType { · 41 unmodified lines
42	42	FIELD_LOWER = 1,
43	43	};
44	44
45		−typedef struct {
	45	+typedef struct InterlaceContext {
46	46	const AVClass *class;
47	47	enum ScanMode scan; // top or bottom field first scanning
48	48	#if FF_API_INTERLACE_LOWPASS_SET

libavfilter/vf_libopencv.c+4−4

@@ -68,7 +68,7 @@ static int query_formats(AVFilterContext *ctx) · 67 unmodified lines
68	68	return 0;
69	69	}
70	70
71		−typedef struct {
	71	+typedef struct OCVContext {
72	72	const AVClass *class;
73	73	char *name;
74	74	char *params;
@@ -78,7 +78,7 @@ typedef struct { · 3 unmodified lines
78	78	void *priv;
79	79	} OCVContext;
80	80
81		−typedef struct {
	81	+typedef struct SmoothContext {
82	82	int type;
83	83	int param1, param2;
84	84	double param3, param4;
@@ -245,7 +245,7 @@ static int parse_iplconvkernel(IplConvKernel *kernel, char buf, void *log_ctx) · 160 unmodified lines
245	245	return 0;
246	246	}
247	247
248		−typedef struct {
	248	+typedef struct DilateContext {
249	249	int nb_iterations;
250	250	IplConvKernel *kernel;
251	251	} DilateContext;
@@ -301,7 +301,7 @@ static void erode_end_frame_filter(AVFilterContext ctx, IplImage inimg, IplIma · 49 unmodified lines
301	301	cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations);
302	302	}
303	303
304		−typedef struct {
	304	+typedef struct OCVFilterEntry {
305	305	const char *name;
306	306	size_t priv_size;
307	307	int (init)(AVFilterContext ctx, const char *args);

libavfilter/vf_lut.c+1−1

@@ -63,7 +63,7 @@ enum var_name { · 62 unmodified lines
63	63	VAR_VARS_NB
64	64	};
65	65
66		−typedef struct {
	66	+typedef struct LutContext {
67	67	const AVClass *class;
68	68	uint8_t lut[4][256]; ///< lookup table for each component
69	69	char *comp_expr_str[4];

libavfilter/vf_overlay.c+1−1

@@ -73,7 +73,7 @@ static const char *eof_action_str[] = { · 72 unmodified lines
73	73	#define MAIN 0
74	74	#define OVERLAY 1
75	75
76		−typedef struct {
	76	+typedef struct OverlayContext {
77	77	const AVClass *class;
78	78	int x, y; ///< position of overlayed picture
79	79

libavfilter/vf_pad.c+1−1

@@ -94,7 +94,7 @@ static int query_formats(AVFilterContext *ctx) · 93 unmodified lines
94	94	return 0;
95	95	}
96	96
97		−typedef struct {
	97	+typedef struct PadContext {
98	98	const AVClass *class;
99	99	int w, h; ///< output dimensions, a value of 0 will result in the input size
100	100	int x, y; ///< offsets of the input area with respect to the padded area

libavfilter/vf_pixdesctest.c+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29	#include "internal.h"
30	30	#include "video.h"
31	31
32		−typedef struct {
	32	+typedef struct PixdescTestContext {
33	33	const AVPixFmtDescriptor *pix_desc;
34	34	uint16_t *line;
35	35	} PixdescTestContext;

libavfilter/vf_scale.c+1−1

@@ -68,7 +68,7 @@ enum var_name { · 67 unmodified lines
68	68	VARS_NB
69	69	};
70	70
71		−typedef struct {
	71	+typedef struct ScaleContext {
72	72	const AVClass *class;
73	73	struct SwsContext *sws; ///< software scaler context
74	74

libavfilter/vf_select.c+1−1

@@ -115,7 +115,7 @@ enum var_name { · 114 unmodified lines
115	115
116	116	#define FIFO_SIZE 8
117	117
118		−typedef struct {
	118	+typedef struct SelectContext {
119	119	const AVClass *class;
120	120	char *expr_str;
121	121	AVExpr *expr;

libavfilter/vf_showinfo.c+1−1

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	34	#include "internal.h"
35	35	#include "video.h"
36	36
37		−typedef struct {
	37	+typedef struct ShowInfoContext {
38	38	unsigned int frame;
39	39	} ShowInfoContext;
40	40

libavfilter/vf_transpose.c+1−1

@@ -45,7 +45,7 @@ enum TransposeDir { · 44 unmodified lines
45	45	TRANSPOSE_CLOCK_FLIP,
46	46	};
47	47
48		−typedef struct {
	48	+typedef struct TransContext {
49	49	const AVClass *class;
50	50	int hsub, vsub;
51	51	int pixsteps[4];

libavfilter/vf_unsharp.c+1−1

@@ -62,7 +62,7 @@ typedef struct FilterParam { · 61 unmodified lines
62	62	uint32_t sc[(MAX_SIZE MAX_SIZE) - 1]; ///< finite state machine storage
63	63	} FilterParam;
64	64
65		−typedef struct {
	65	+typedef struct UnsharpContext {
66	66	const AVClass *class;
67	67	int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
68	68	float lamount, camount;

libavfilter/vf_vflip.c+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29	#include "internal.h"
30	30	#include "video.h"
31	31
32		−typedef struct {
	32	+typedef struct FlipContext {
33	33	int vsub; ///< vertical chroma subsampling
34	34	} FlipContext;
35	35

libavfilter/vsrc_color.c+1−1

@@ -40,7 +40,7 @@ · 39 unmodified lines
40	40	#include "libavutil/parseutils.h"
41	41	#include "drawutils.h"
42	42
43		−typedef struct {
	43	+typedef struct ColorContext {
44	44	const AVClass *class;
45	45	int w, h;
46	46	uint8_t color[4];

libavfilter/vsrc_movie.c+1−1

@@ -41,7 +41,7 @@ · 40 unmodified lines
41	41	#include "internal.h"
42	42	#include "video.h"
43	43
44		−typedef struct {
	44	+typedef struct MovieContext {
45	45	const AVClass *class;
46	46	int64_t seek_point; ///< seekpoint in microseconds
47	47	double seek_point_d;

libavfilter/vsrc_nullsrc.c+1−1

@@ -49,7 +49,7 @@ enum var_name { · 48 unmodified lines
49	49	VAR_VARS_NB
50	50	};
51	51
52		−typedef struct {
	52	+typedef struct NullContext {
53	53	const AVClass *class;
54	54	int w, h;
55	55	char *tb_expr;

libavfilter/vsrc_testsrc.c+2−2

@@ -42,7 +42,7 @@ · 41 unmodified lines
42	42	#include "internal.h"
43	43	#include "video.h"
44	44
45		−typedef struct {
	45	+typedef struct TestSourceContext {
46	46	const AVClass *class;
47	47	int h, w;
48	48	unsigned int nb_frame;
@@ -193,7 +193,7 @@ static void draw_digit(int digit, uint8_t *dst, unsigned dst_linesize, · 144 unmodified lines
193	193	#define LEFT_BOT_VBAR 16
194	194	#define RIGHT_TOP_VBAR 32
195	195	#define RIGHT_BOT_VBAR 64
196		− struct {
	196	+ struct segments {
197	197	int x, y, w, h;
198	198	} segments[] = {
199	199	{ 1, 0, 5, 1 }, /* TOP_HBAR */

lavfi: name anonymous structs

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code