* This macro will only compare value abdegh, it expects cfi to have already
* been checked
*/
-#define QTCHECK_MATRIX(m,a,b,d,e,g,h) ((m)[0] == (a << 16) && (m)[1] == (b << 16) && \
- (m)[3] == (d << 16) && (m)[4] == (e << 16) && \
- (m)[6] == (g << 16) && (m)[7] == (h << 16))
+#define QTCHECK_MATRIX(m,a,b,d,e) ((m)[0] == (a << 16) && (m)[1] == (b << 16) && \
+ (m)[3] == (d << 16) && (m)[4] == (e << 16))
/* only handle the cases where the last column has standard values */
if (matrix[2] == 0 && matrix[5] == 0 && matrix[8] == 1 << 30) {
const gchar *rotation_tag = NULL;
/* no rotation needed */
- if (QTCHECK_MATRIX (matrix, 1, 0, 0, 1, 0, 0)) {
+ if (QTCHECK_MATRIX (matrix, 1, 0, 0, 1)) {
/* NOP */
- } else if (QTCHECK_MATRIX (matrix, 0, 1, G_MAXUINT16, 0,
- stream->display_height, 0)) {
+ } else if (QTCHECK_MATRIX (matrix, 0, 1, G_MAXUINT16, 0)) {
rotation_tag = "rotate-90";
- } else if (QTCHECK_MATRIX (matrix, G_MAXUINT16, 0, 0, G_MAXUINT16,
- stream->display_width, stream->display_height)) {
+ } else if (QTCHECK_MATRIX (matrix, G_MAXUINT16, 0, 0, G_MAXUINT16)) {
rotation_tag = "rotate-180";
- } else if (QTCHECK_MATRIX (matrix, 0, G_MAXUINT16, 1, 0, 0,
- stream->display_width)) {
+ } else if (QTCHECK_MATRIX (matrix, 0, G_MAXUINT16, 1, 0)) {
rotation_tag = "rotate-270";
} else {
GST_FIXME_OBJECT (qtdemux, "Unhandled transformation matrix values");