From patchwork Wed Feb 14 18:24:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46277 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b819:b0:19e:cdac:8cce with SMTP id fi25csp114841pzb; Wed, 14 Feb 2024 10:25:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX79w0cgrDS2as+oBA8Yd94AR/1Hq+89hRJPv6cuPS2yuBIzuQygNJRkxqqS35I0J4BfBjphgtPKuO7/WBAOWmeN0ylhndqLAmfvQ== X-Google-Smtp-Source: AGHT+IGoD2rPdxkdfkyOfuw43rOvVNxRQzhevBnR9NHknQYn1eplinr/kz+GU1AU2YWlTuGs6pxf X-Received: by 2002:aa7:d7cb:0:b0:560:8fb7:a720 with SMTP id e11-20020aa7d7cb000000b005608fb7a720mr2354265eds.24.1707935123977; Wed, 14 Feb 2024 10:25:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707935123; cv=none; d=google.com; s=arc-20160816; b=Sebh/E6OIgDqcSyzhewA5ZjY/TrBluqRypx7aDOZSCIWspQ3EksiPYXd9cOxUpfWW5 0ZZQL63ZyCbuWnrBDVMJIwHYDpmknS6qmFLRBgG3z+kTv16Z4myihehjZlu+nI2ml8uw pGfM1AXN50Hmv+X40cjmjclf1kvzXEmVzgWLONmAnYn2mkidd8as9xB1gz/eyxN6iNnI x1izyE5ZHJriyXHePL0bz9s96lU9tPXVYy+KUlfZIDjV6Y0QsvdW+iRAoNvMkXVZGR2l CcQhqaw54JPcj+vPh/pB7D4X6vd9MMRCs+sBBjPo9JI8vczNO4Rr+j/D0mNcKBvzz0gt Qsbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=fUp24DsaZreGHBWsZZCsg4Dkz7UK1G+h2YTMvvTLj1s=; fh=ciD4Nuls+kZ5WvgI1JYk1wdQ2L2VGGCYbgiNx66puoU=; b=sV54NtXnIwV+MqpvICNzpEv5iax9rBH6GW0K/cYHXVvy0IrBl3aMiJ8s3i7gJmossZ C+u9JiKWhBFsfN53tWt3D4JSQR/QP+Xsmlc1RFLs+kBVL/m2ApKGD06tL+ClSCVp+40c R+Pe438kYxdHkYPqf312uH2C4H18nJs2s6ZaVuZ4abXjCdxy4LMVLi4VDpeCjN0JCAdh 7nyMEBEQp6ccCH4mjzemJdNQm9goNkg52F43u6B6oz/O5B2OeBiZr+M/sC0JXpJY8+hL lgCPUbiUkSDyuzHoNe4p5hT2ToXdZ1OwaVF3zsOWwHxnirHVWU4WWPgGAsZDJMDanUKH MeIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=svk33QLB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org X-Forwarded-Encrypted: i=1; AJvYcCVXCbp9QfR5PPevLq7vTsyG7+0BHchtEfIi75zvEUX1jXEn1nJZGEPdK3SDZ6qm1qnL91UQ4ZtE0RfWdY5kPGBUnJrF7cmRr3JFP/Ovry/SvukCDYdP9SMDZ1y1xaHdwxTaECnJQcqISzV5GbBTEA4L7xOqPBHJkfXQbSCUDw6mW7jFiwsPJYIxKKO8qgZ/uNNTkuiix0SqnsV04Yx+CjwgO02t3V8Nwc293Urqb8EqW9xiCweGnuu3z/064WLVxTB2GpGG3gzmMEwC+fqlVo1uS6BgGypCiPqq4+HwVONsDLJEV3WAceznUgSqFlIl1Bcl6A1+mM5scF8yXskNskVl5PZIKLDJkQOiw+/glaCW2WljHT+9THDT05r/7oO/Bn6WR1UIyQFtBaU31ztYGnNLOTAsxYPtJPccRMzrJ01Koutn1iTjh4zcpfj1wAKSCwtkDN4Adc8mMCxxFybbXXkKb2fuwHekApdEyNRw69E6O7lUQmr57L8OV5hnUjYkP1SyYJdowJaEidg0J10cD3Erv3VxjiRbDxVf8PaKzknEG6mvDflT+y3r+n0dR1hklHKazFfAC764ZwCcMxJjgew4lLeqF8mPqkGjes47RsIG90+EFa5UbkEz/uRn8VLfoNHiZpO/xA/Q/hKSXZvQ3Y0yLJHP3iQeyyiT2ilx6TayMDnM/0Wlk3key4X8CDKTWhZUXyn84yZETpV2YXPToRfxGg63clZbRfNH3B3020mT47NnONSgwjZapUBBX1a/i/M/ReYEcX0657h7wzmX2mBsDfkPe2hoISGSvqeGlDL62MC7n+OnoGV8b5saMRe2BSHxrBVdU0ywADVBzO0/9c5L6nCY0BTrkrynHv4WwoZ8RLdqkkQIEhUC9+ZsXoaAORlUPQOd8CDlEen+VtKTNE2QkVuEPwV/yEEJRWP/ReeS8g5FC1oTgeFgGnObhywlvoAica mR0OFNPy3YspZlNFyZdD8ovQcBBf9PJg2LtjUx2J8ovD6xETwoSmxKrMFySXPIiy7uctri50b1lxajCUPu/1o5HA4/RtcBtOqGvg6z/0qTwBAl1AYyToyrL5ZoBrwqoKiE6JVzaCWPyE/6bd/jm/60Bt/Ue64C5z1jumeO/Y9Rqg4vaVENaggFDoSETarhcE1TSD7Gax5UzDJHe18ss5wucnXKxfALE9gM+bCAtGNhILPGFScbmBw1gbmNhqYh7tpZ3dPgVznAS1nmPskAdCmok14/tPvu4YHCSP7Fpv12W4BCSDaaGzB18s1of2Avv/UejmIhqXefucdkO37MJ8hC8QrNvIvvUEF0XJf1fEsB0ubKwEGpRA9w1MULgGbkKJMNtbbDWBtq/bFkuydxANYlxcLmAIkzpOfQnwCuZ1qoIRCVkiR4vrfhUh6JEJpjWFmqBTOWHtX0xVQS3AYXfHi7xoc0NB3DUZ3R2a3/wgyXM7GiUt58doB+bWCkH3/sH4F2pU45gBDi8xJOjTtkU4psGyq157eZO+7qpz7ZK74LPNcDVnOuqQd060HfkTdXp+PW4LVYnYmIkloanqFBkA8kqE7l5YgjqBs8wYXhxw== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f20-20020a05640214d400b00561899cf7f3si4071963edx.144.2024.02.14.10.25.23; Wed, 14 Feb 2024 10:25:23 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=svk33QLB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3D8868D223; Wed, 14 Feb 2024 20:24:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D359E68D1B1 for ; Wed, 14 Feb 2024 20:24:41 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=svk33QLB; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 039D94D3C for ; Wed, 14 Feb 2024 19:24:41 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Mwl2wpfmT_pS for ; Wed, 14 Feb 2024 19:24:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1707935078; bh=KvLfYz+U937XtLEC9H5PiTn/F157Urx/d87R84d8N0k=; h=From:To:Subject:Date:From; b=svk33QLBqdOJeToJGesk8b2wQ9sjSKG3JdsuhbHbBpIb2ZfsGC6hRwcQLhAkGsHvC kvNl5qYTvjDgkwRZYl3O6uzWd/iOwJQyi3oDrQwTgJiuZAb66XbGzfXGT/t86IFJls q7vDxFT3LoJjs7J+lfJys0rPQH49jJf3prF/FQAlLsS4Qzc+GajPmSnlbtQ5vm2/D4 +0eeho/5ayfIZxRK802Evv2nScKnq2VknUEClWaR9snxY55vkuW9NKStmjk2HRm4KS di1rEQ9+0wdMVGCBYtgHWaT3t/DStheQIEWPgz6+VexOxWgdovLXtkL3Pt6ek3Vs+v rF9AFmZkptF8w== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 79DDA72E for ; Wed, 14 Feb 2024 19:24:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5240B3A0534 for ; Wed, 14 Feb 2024 19:24:38 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 19:24:26 +0100 Message-ID: <20240214182435.31380-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] fftools/ffmpeg_filter: stop taking display matrix from global side data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: eDxQ7IFI/RzX It should never be necessary now that decoders propagate global side data to frames. --- fftools/ffmpeg_filter.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 38ddd1963a..ed62e1d8ec 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1523,16 +1523,9 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph, // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { - const AVPacketSideData *sd = NULL; int32_t *displaymatrix = ifp->displaymatrix; double theta; - if (!ifp->displaymatrix_present) - sd = av_packet_side_data_get(ist->st->codecpar->coded_side_data, - ist->st->codecpar->nb_coded_side_data, - AV_PKT_DATA_DISPLAYMATRIX); - if (sd) - displaymatrix = (int32_t *)sd->data; theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) {