Showing the changes to libavfilter/transform.h (1 of 3 files). Show all
Unified · Split
| @@ -60,20 +60,28 @@ enum FillMethod { · 59 unmodified lines | ||
| 60 | 60 | #define FILL_DEFAULT FILL_ORIGINAL |
| 61 | 61 | |
| 62 | 62 | /** |
| 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: | |
| 65 | 65 | * |
| 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 ] | |
| 69 | 69 | * |
| 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 | |
| 75 | 76 | */ |
| 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 | +); | |
| 77 | 85 | |
| 78 | 86 | /** |
| 79 | 87 | * Add two matrices together. result = m1 + m2. |