From patchwork Wed Sep 27 13:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2595346pzh; Wed, 27 Sep 2023 06:14:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfFpG3vCryKyYz+gj7MGjabF+MeiHUGtPRu9Nfs/6zDj6QJcHfhlXZaF22zRMs0r4HHl/2 X-Received: by 2002:a17:906:51d0:b0:9b2:b2f8:85dc with SMTP id v16-20020a17090651d000b009b2b2f885dcmr1278499ejk.34.1695820464157; Wed, 27 Sep 2023 06:14:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695820464; cv=none; d=google.com; s=arc-20160816; b=HLGQGYfR/uC2C948o74gt1oLD2XTB9SNTj5/i/UcKv2f4OMbW6Nr9QH38dU+oMH7um 6eWwSRfCShWejAvtz8sfTlLRfe5YXgbficD3fFLwuFVAQQGfTI/QrgvV2EpwmJHenYrP knpVojZW1VoRAb+aJ98QhuyYLqJrL1g9xicEE+PbN7+dT7aDAEc0Bt1+ZuZx/OXYKjgP uVwFGpxFiMmuoiVjhcZUikiFalBC18LrRtiFTwFBd8rSHVC9GE1EUxVwQk8B5Eo6VFSd Cf108M4COweAob/rZUqgms743g1fvP4ycib4z2GSO9V9mWQM9X8R2/Yii5328HbovOZg rI+Q== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=7kAtsfQHXK/IdFDlcKg3+qLqlrIjrna1wan5ypwM1dw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=pdX+i8gt13OsEt/fJhUikL7YNLsFUZlVMZqAIEvurLC/f7zFelY8FGwI2lPMI7bHii Y2k0JGl5WhVAtGFy5rnXGnufDW5bfizc5OXjDHgPiX2JIwqqBwMXFDrRoMSJpuVuY0oD o/bA7FLL8Twn/Mx1diy9fVrqJZ8oVHCnPhvAkJx2RP8/pvthaaRnnpNADpdERupTV5VA rjIHPnQ5SSABccwIt4lCxf7RRQQLXtMadpN6e69nkRn9wAGt5hsxUPQWK8VjnDrLJ24X Ho052gjLk51lsRTRRpcPc4aFx8UGtpESGHuIU1UCBO4C42t5pQ6P9rcULozCkY2zABYQ j85A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ik5E6gx1; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i15-20020a1709063c4f00b009adb02a14ecsi13244165ejg.201.2023.09.27.06.14.23; Wed, 27 Sep 2023 06:14:24 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=ik5E6gx1; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29C2768CB33; Wed, 27 Sep 2023 16:13:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2D0C68CB15 for ; Wed, 27 Sep 2023 16:13:12 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1c0ecb9a075so80338805ad.2 for ; Wed, 27 Sep 2023 06:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695820390; x=1696425190; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=80yAJmLgD0VDMaC+qhrKKEuhySFN2/WJAIaLAa2BiBM=; b=ik5E6gx1+I+Ygm6CssqYigF0txTsZGbVHGlCIQTwaZe0z+i2oUWG6OYIndPNyBIQeK BNZk9RqxmkFtNd2NGjviktVNnA0hOw72ETiz+jC85UDbas7xh5pjh3RoVdu+jvvjobQc IqhbQ2yWFcfWVe+95huGBH/ite6gnH/vPo5LxNH3gpV5AgSoCuBEirkg75pK2qHeLcx5 PAMrWpl4oJd7Tz7clKCsQzT0D8vhiL7M6GFk9ZbEBiJ3XkuzXh5oqXyA85MscmCac9om Y2JxSOyup+T+YTcfSJC2l+H5ssgHoVwrxlnDOYiv0ue+uYJoh4URFgNEogS7Gx66tUs3 QQhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695820390; x=1696425190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=80yAJmLgD0VDMaC+qhrKKEuhySFN2/WJAIaLAa2BiBM=; b=ep+4DoQ7MdAJoqhIbTbbEbz4LhPEYh6JdctqpFT0jIeGlNiTw0dxQduSxnCCyCdGBQ 1gs0f9s/zm2n9scMYGHb1VyjPvApExl4v5Reb2ijYr44zWLyA0RP0PfgXpGK2cDW1Bbq JW7Uy1RGbresDlGJuJ+TkCbeGcwrWLriTYSScJlhcjPOi1iMCwTKtt+j6Z0Y4IYXIkjP lhTkH8JUO6396hhi1oIDf+iDyKU6AcCFb/Bq/KNjOuTFMXpn/mS1+nHYoa7yyY3he6yJ T8r4SKnUeqw4qyfimmRKFJO0Fb6sXifj58AKCGqLgJ6TWWTNQGnFvXNLiq/BjB300vdb i6PQ== X-Gm-Message-State: AOJu0Yw9cJJ4AxHRnrmKesJGI7bqs0rDTGOIxGfhr9c2tLbLowKSDOY0 stEUeRngFZ7g9XQ+aeYapA9UDS//JyQ= X-Received: by 2002:a17:902:e887:b0:1c6:de7:addd with SMTP id w7-20020a170902e88700b001c60de7adddmr1801833plg.48.1695820390648; Wed, 27 Sep 2023 06:13:10 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v10-20020a1709029a0a00b001b53953f306sm13050600plp.178.2023.09.27.06.13.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 06:13:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 10:12:37 -0300 Message-ID: <20230927131242.1950-7-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927131242.1950-1-jamrial@gmail.com> References: <20230927131242.1950-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] fftools/ffplay: stop using AVStream.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: yXoXHXoiW9h9 Signed-off-by: James Almer --- fftools/ffplay.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 006da7ab57..e29b0ad0f9 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1916,8 +1916,13 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX); if (sd) displaymatrix = (int32_t *)sd->data; - if (!displaymatrix) - displaymatrix = (int32_t *)av_stream_get_side_data(is->video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL); + if (!displaymatrix) { + const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->side_data, + is->video_st->codecpar->nb_side_data, + AV_PKT_DATA_DISPLAYMATRIX); + if (sd) + displaymatrix = (int32_t *)sd->data; + } theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) {