History

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.h (1 of 3 files). Show all

Unified · Split

libavfilter/transform.h+19−11
@@ -60,20 +60,28 @@ enum FillMethod { · 59 unmodified lines
6060 #define FILL_DEFAULT FILL_ORIGINAL
6161
6262 /**
63− * Get an affine transformation matrix from a given translation, rotation, and
64− * zoom factor. The matrix will look like:
63+ * Get an affine transformation matrix from given translation, rotation, and
64+ * zoom factors. The matrix will look like:
6565 *
66− * [ zoom * cos(angle), -sin(angle), x_shift,
67− * sin(angle), zoom * cos(angle), y_shift,
68− * 0, 0, 1 ]
66+ * [ scale_x * cos(angle), -sin(angle), x_shift,
67+ * sin(angle), scale_y * cos(angle), y_shift,
68+ * 0, 0, 1 ]
6969 *
70− * @param x_shift horizontal translation
71− * @param y_shift vertical translation
72− * @param angle rotation in radians
73− * @param zoom scale percent (1.0 = 100%)
74− * @param matrix 9-item affine transformation matrix
70+ * @param x_shift horizontal translation
71+ * @param y_shift vertical translation
72+ * @param angle rotation in radians
73+ * @param scale_x x scale percent (1.0 = 100%)
74+ * @param scale_y y scale percent (1.0 = 100%)
75+ * @param matrix 9-item affine transformation matrix
7576 */
76−void avfilter_get_matrix(float x_shift, float y_shift, float angle, float zoom, float *matrix);
77+void ff_get_matrix(
78+ float x_shift,
79+ float y_shift,
80+ float angle,
81+ float scale_x,
82+ float scale_y,
83+ float *matrix
84+);
7785
7886 /**
7987 * Add two matrices together. result = m1 + m2.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t