From patchwork Sun May 3 22:05:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 19472 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E0F1744B916 for ; Mon, 4 May 2020 01:06:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD4AF68C295; Mon, 4 May 2020 01:06:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08C6868C1A9 for ; Mon, 4 May 2020 01:06:11 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id r26so6707414wmh.0 for ; Sun, 03 May 2020 15:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=c3mzGeZYMdIcm54dP5zQ4zNA5ISFzKvdgSisuInGl3k=; b=VyAS2SYe3/WH+JgfU8BLFjRaFY1oOQb9iNHsY0Z5q/Q58+tM7J0sryCzln1kcqpjab o6x7KG4heJxX/i57kg/niUcVOI0xMqnucRFjcwq/up/Ok6DZDmB9k0z2r56wCQxaaguj UolpnS//nkjI+lPl47iBJMUAzGtlCkL66jvuIwvnaqo0PYKF/D7fAeEC409NlOMw3zFb S0Im/eOtxGAsWstRWyeWw5cQ3J+v+YV+95C3sRjX/lM9K4En3L1gdQXx4K/FuuFCarl2 1A5CtISkXoCFeBN2t5+wAsFkvFvjpbu06VZrD01Ko6eip8jv5HbMhR5TcahuBvE71tTy kFPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c3mzGeZYMdIcm54dP5zQ4zNA5ISFzKvdgSisuInGl3k=; b=NhibM682jjPqeBMvpZjGxYOzk52E5w8QdgYGS57H6R+o9x9UFLGRcuVVd6mHvukB85 yzOITCoj6xDozurL5ep14kxMKlJRSyJJ1FI5I1CRd/nwfI8QeoAGY/Ec4AkmpRLTMT2V 9roy2q+g443jbKBKH+xynsjSmhSdfR5n43mcUpy3cRvrwdGDoqS4Yv5kj6RzxnutL+cM M0CJbgC4Rjy++vyBaMhzZB2ugY23WgJxANDYg7uvaIMhGG3kp2a/nB2nsGYHph3uojOI XhqWpj3LmKITHLwfcoUlNy02XnNDFaVIb7iH5dAYcg4KewVhZCtj3dVlBDiqYioukJNk /T+g== X-Gm-Message-State: AGi0PuaTN3Pesto9m6vAmvAEcTpjdvkOzKzLH0jon5GewiTRzQJeUEMN 7mAGDMkImpJ8F61xzEZ/XCAXhI7XA6s= X-Google-Smtp-Source: APiQypIMKBTNN5y9EXhA06gU1j/ydY3cVXakzPINrOGktX2YGtKYfX2tEc6KyOZKWvD9I37OPBZatA== X-Received: by 2002:a7b:ce0b:: with SMTP id m11mr11371609wmc.67.1588543571188; Sun, 03 May 2020 15:06:11 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a24sm10307285wmb.24.2020.05.03.15.06.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 15:06:10 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 May 2020 23:05:48 +0100 Message-Id: <20200503220548.23543-22-sw@jkqxz.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200503220548.23543-1-sw@jkqxz.net> References: <20200503220548.23543-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 22/22] h264_metadata_bsf: Improve interpretation of input display matrices X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The previous code here only worked in more limited cases. --- libavcodec/h264_metadata_bsf.c | 42 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index bfb5b7d7e4..10f4c3c56d 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -440,23 +440,39 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, data = av_packet_get_side_data(pkt, AV_PKT_DATA_DISPLAYMATRIX, &size); if (data && size >= 9 * sizeof(int32_t)) { int32_t matrix[9]; + double dmatrix[9]; int hflip, vflip; - double angle; + double scale_x, scale_y, angle; memcpy(matrix, data, sizeof(matrix)); - hflip = vflip = 0; - if (matrix[0] < 0 && matrix[4] > 0) - hflip = 1; - else if (matrix[0] > 0 && matrix[4] < 0) - vflip = 1; - av_display_matrix_flip(matrix, hflip, vflip); + for (i = 0; i < 9; i++) + dmatrix[i] = matrix[i] / 65536.0; + + // Extract scale factors. + scale_x = hypot(dmatrix[0], dmatrix[3]); + scale_y = hypot(dmatrix[1], dmatrix[4]); + + // Select flips to make the main diagonal positive. + hflip = dmatrix[0] < 0.0; + vflip = dmatrix[4] < 0.0; + if (hflip) + scale_x = -scale_x; + if (vflip) + scale_y = -scale_y; + + // Rescale. + for (i = 0; i < 9; i += 3) { + dmatrix[i] /= scale_x; + dmatrix[i + 1] /= scale_y; + } - angle = av_display_rotation_get(matrix); + // Extract rotation. + angle = atan2(dmatrix[3], dmatrix[0]); - if (!(angle >= -180.0 && angle <= 180.0 /* also excludes NaN */) || - matrix[2] != 0 || matrix[5] != 0 || - matrix[6] != 0 || matrix[7] != 0) { + if (!(angle >= -M_PI && angle <= M_PI) || + matrix[2] != 0.0 || matrix[5] != 0.0 || + matrix[6] != 0.0 || matrix[7] != 0.0) { av_log(bsf, AV_LOG_WARNING, "Input display matrix is not " "representable in H.264 parameters.\n"); } else { @@ -464,8 +480,8 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, disp->ver_flip = vflip; disp->anticlockwise_rotation = (uint16_t)rint((angle >= 0.0 ? angle - : angle + 360.0) * - 65536.0 / 360.0); + : angle + 2 * M_PI) * + 32768.0 / M_PI); write = 1; } }