lavfi: modify avfilter_get_matrix to support separate scale factors

Jarek Samic committed 7 years ago

Commit 5b5746b1 parent d3cd33a3 files · +34 −16Browse files

Showing the changes to libavfilter/transform.c (1 of 3 files). Show all

Unified · Split

@@ -103,12 +103,19 @@ INTERPOLATE_METHOD(interpolate_biquadratic) · 102 unmodified lines
103	103	}
104	104	}
105	105
106		−void avfilter_get_matrix(float x_shift, float y_shift, float angle, float zoom, float *matrix) {
107		− matrix[0] = zoom * cos(angle);
	106	+void ff_get_matrix(
	107	+ float x_shift,
	108	+ float y_shift,
	109	+ float angle,
	110	+ float scale_x,
	111	+ float scale_y,
	112	+ float *matrix
	113	+) {
	114	+ matrix[0] = scale_x * cos(angle);
108	115	matrix[1] = -sin(angle);
109	116	matrix[2] = x_shift;
110	117	matrix[3] = -matrix[1];
111		− matrix[4] = matrix[0];
	118	+ matrix[4] = scale_y * cos(angle);
112	119	matrix[5] = y_shift;
113	120	matrix[6] = 0;
114	121	matrix[7] = 0;

Keyboard shortcuts