From patchwork Thu Jul 20 20:34:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp77108pzh; Thu, 20 Jul 2023 13:35:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlEcs7k+NwWKWG+MvYsNqSu2Vc+9GnQopyjLkzaxYNRNGRC2pDshFmhdmVh3EjTWkggdABoj X-Received: by 2002:a17:906:3f0c:b0:997:e9a3:9c54 with SMTP id c12-20020a1709063f0c00b00997e9a39c54mr3387392ejj.0.1689885319843; Thu, 20 Jul 2023 13:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885319; cv=none; d=google.com; s=arc-20160816; b=e9j3qNbwA8BIdfK6ZU4JQTVpiw7Q1rdE4WCw/rm13mZg54B/usKWh4S/AnguTfnxbT VMvIh2b1jMcEgFVZ5/y9CIAFHXXnyEl1bTvjx0i8ac1RScMzVmzblAZ9C6zAtQDP38g6 OD5j29KqC2iOu7mRKoD4IW4As+ddscpi3r/D0jmWFdyxwMoH4RGTo/eYDH2jnXo786Ls 2tIeYrvsatm6f84az8WclMQlbpzjAy1gvG57CSW8eSSOsB6a9T8G84fTq0PbvQa+HUhh sgBbr4gf0/jbDZ4ECBFJH/9sVfSJVSLeWwhfxE7hHAEFajLG3Om4gWAWMiP7tZSrcEv9 7Kpg== 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=y04q+iN8c1Ta5rizkbmX12XxubVOweYpmwSj76pqwWw=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=cZGC7B4ld516dFB78bTglvwTwos3HW0NdWN9FLISIs8cUYKQtXBBkK2Ygeea0GIkql Domf8ndolTTiKxWN3op3sZwAyQyGtnNCg7jNXX3tlzub6EpjqvN7O5sOIwYERuGXL8x/ x6AqVkUWTK4arYUMktrGAjBaTSZ+6vWjDrvE44+cid/nBwjNqLPEiF62f0ah06MhsPF8 dRMXDJe3TL9jsg9lO86PFLLrISP3S3YRMIlCcGarzvmrUIugZqcOFrcrBPA7NgFJofig 3eBuSCsc30haF9z8fSLXMfeG2gDLXoEnFv+bwRAbFqVxUqgfPQhjgtPJAdvI0RU+1AVn z8Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=PKq2J82z; 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 me25-20020a170906aed900b00993fe9ca8cfsi1007980ejb.766.2023.07.20.13.35.19; Thu, 20 Jul 2023 13:35:19 -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=20221208 header.b=PKq2J82z; 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 628F268C5FD; Thu, 20 Jul 2023 23:34:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4B3E68C4D4 for ; Thu, 20 Jul 2023 23:34:30 +0300 (EEST) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6b9aadde448so1007123a34.0 for ; Thu, 20 Jul 2023 13:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885269; x=1690490069; 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=R08R+4Ob+tih1z02adcst6MwV1dQ4r+kg7GVr0xPiWM=; b=PKq2J82zd1rRt3hA+2XBQCq8sXJpUwWg4DWB24Ebb571XkbscyT7Liq40Af5W+f91T sK58l1NesOwaanyKzk4IJtIVsUhn/M7gaGLyBUbbd2wx4k8Ltc+2UDl9Uqv8xXaCYXRZ 51Ngt0S2GC4Ptf7k4LdTlOuBW43lARsOPv3OnMrjgX6rYRiNOcqtymjSt4xGUa8kfGT0 LdoNmUtXEya7rvs+DicXYhpbesbMOaHCvLSxQYM1o5cv4nqNCmxZBcSFNNgtZ2lsl8eS eBW5ylGa/6VZL48Sv0kGoLtTnVMcJ5TyAXULlEtdl+Q2HCqDHQlgfok1tblvK/bdTaHl cogg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885269; x=1690490069; 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=R08R+4Ob+tih1z02adcst6MwV1dQ4r+kg7GVr0xPiWM=; b=QhwKVpJdluqHdaFmi60xf/6mh3g9dNzKkIqj9ExUNixjmvrWCNsg6hffCGpLlPEL6C nQ2ye3dd3UDfE6nMPhLx78wz9FFRGYtlQN2zRrKaO6h81czfHtCdXEY9QoabchYX8o+f /VCGZ16sRVOeBPUFsixNWLUIAHKOVDvpVFl6r7zL5oWDziS31nWo0e+U35VmimN5Nhez pD8gAIo42xtFxYKQIKU6rp78QI5G4DLwUSQIrK7bB/9+SE/MVvK0E19OzCCqjT5Mo5Z/ TX+Kcax5N53K0BLxwpkpk7pWCDRKeukcQKBa+AoRpgb+GZdQS0AvS//ncXVGavAhkd5V SWpg== X-Gm-Message-State: ABy/qLZjTS2qKDDZqnnvBBVG/0aZoeT2MTK3igWPK1PWSRTW4E21Bmvx /xWfIx+tbz/oajodXWwc0HHUxeeRWDI= X-Received: by 2002:a9d:7ac2:0:b0:6b9:8feb:4930 with SMTP id m2-20020a9d7ac2000000b006b98feb4930mr3205922otn.35.1689885269020; Thu, 20 Jul 2023 13:34:29 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m24-20020a0568301e7800b006b95e17fcc7sm800094otr.49.2023.07.20.13.34.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:07 -0300 Message-ID: <20230720203415.41757-5-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720203415.41757-1-jamrial@gmail.com> References: <20230720203415.41757-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/13] 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: 4E8hrgv7pv5d Signed-off-by: James Almer --- fftools/ffplay.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 5212ad053e..c123511027 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1904,8 +1904,12 @@ 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) { + AVPacketSideData *sd = av_packet_get_side_data_from_set(&is->video_st->codecpar->side_data_set, + AV_PKT_DATA_DISPLAYMATRIX); + if (sd) + displaymatrix = (int32_t *)sd->data; + } theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) {