Message ID | 20230904150411.56777-6-jamrial@gmail.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1273309pzb; Mon, 4 Sep 2023 08:05:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLodC56dO/CYvJldvVHXDHd/ApHOLKDJvds9NpkScpSPnVjmFUYVZuycbpvGwD+460F3TQ X-Received: by 2002:a17:907:a068:b0:9a5:9305:83fb with SMTP id ia8-20020a170907a06800b009a5930583fbmr10602496ejc.34.1693839925579; Mon, 04 Sep 2023 08:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693839925; cv=none; d=google.com; s=arc-20160816; b=wXlT6a0Rk9fcizg75TQW0643OTlCkzNFX8E6iB3qx8/Zmr/5L6e+M012S8M1K4cqWj 6t3Vs9Dq1WLGa1Ti67+yZOrB/1x+yOpnCz8MCCeX5AP8fS0y0NNlTRSLBalLHC1jio22 L9gf+NBAGHXi5FCcjc8yNUuFegEQi6xcQSTCDSw48yk5N5pT7dsMQ8T2xNEh76V4kcNl FVwk8Fdnq3Q2A2jVgUeRPnBcMDzsL5H1Zt+GIpNhSunPB1QqkWa/rRY3wF08tRc3obaE vvPOlT+9M5L9Wjps3RTZAg/fvFUB1g3TfyIs8PiCJXcp/o1nV3+c90Z0hLZe2qqg4NFt JoNA== 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=Gaulzr181z+vK/HU9r8z/El5VlZNASMF80Ma+5gVujg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=MBJ23dIaK9Qt4WoFsQrPIEy5Wbtr4w7+k3jgQVNq9RoTkJ/3InRgUCgJLOKTePy4R/ p8rPM0E4VBlRw04RQtuSYTA72FHf8mmSOxr8oKL8Env0yhBBj74A9CSeF3HhE6bdbc2x lbi/aORn9f1nQY2WFv9CHJj0rE6XGfzIAIJg/dNnhyPoF/LyeBQlXqIshvUk2kwFx0P1 5eEWxbARPKkBtBBN8wwxtihozX6MQ6xXJjuyOHcJWGZ81Efh7FmIEMpBGFjme+tMj1GR WTaRxx6ZQzpopqpAmrBep8/zHwgiM5LkI6cdE4+OfNELVEhgn8DmVBS2WGF1ms8W7Vy5 2fag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=SoCr+zfi; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d22-20020a1709067f1600b0098d1c816d43si6669820ejr.85.2023.09.04.08.05.23; Mon, 04 Sep 2023 08:05:25 -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=SoCr+zfi; 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 94C7B68C7DD; Mon, 4 Sep 2023 18:04:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DD7C68C7B8 for <ffmpeg-devel@ffmpeg.org>; Mon, 4 Sep 2023 18:04:27 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3aa139a0ab2so1142210b6e.2 for <ffmpeg-devel@ffmpeg.org>; Mon, 04 Sep 2023 08:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839865; x=1694444665; 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=/OIk6NV9IzbN5VnDhSgAhXIxfYkb4u0KmrY6lCf1knc=; b=SoCr+zfikSsGr4FSseX6kMQHQmvRyuR+kGvU15QpMtBz4ISv7yMP97SMNQqKAFHAhy WjFnbI31MLKR2pvVZzBI2p21oOpGtQ0FGpSrf07kdQYRiU51zK0MbcbLcVfVeeOMczyn XDAO+AxM2EQe81NLlWBYViJK/0H0Dy1cUqrj7R+B7xb3auPd8JBQwwEP56++i6eLiEvH MU3B+TjSVPbQ1mZAYWi/KS6D4jKtJXyFG3+DHD57dqXzGDiY/5kzH6kn60pUo3QmleqJ QJxiSziCaH8K/ay3i1i9hMtDr61aSfWq4zvYspdgTUugfeWCvp1xqAS98lcgZnj9y07z 0RJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839865; x=1694444665; 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=/OIk6NV9IzbN5VnDhSgAhXIxfYkb4u0KmrY6lCf1knc=; b=coAM52bDg335dB3O+w4yphTGJNb/Q+vjleAQeBunFUtycRURmO65RSmslSTKmb4DRr K1TmjRtJFznOjXRGGlNxttHkxgN2U5KOIP4Rb+RWYAnwItUJmDaEE0VsdFiZ0Wo5HTe0 0pwZUr4v0by6VOCCF+pbhKhusWEIcpxPAFtzk3h4NITVmDwmBFa66G4F47R/ljvvucq4 6SX8ARNEKdyNpeQZNnv80JhmzwN26ygYlStHDqnH7grrwHfLT98bCB5lwVB+lu0SBjKv wKWjF+ESkx33ubnpDZ2xEVFLsuPg0/LJHuBulXpAYVATkfIWl/zpUvckmYrYluvce5Sj VnbA== X-Gm-Message-State: AOJu0YxVh8tTGblVUj7P9l6xWNQpMK1ys1eA5jAdYdrPuFi8edh8k6nQ P/8csOJs3UFYLPew9cCOQgGfBskEn/M= X-Received: by 2002:a05:6808:23cd:b0:3a8:c5d6:c582 with SMTP id bq13-20020a05680823cd00b003a8c5d6c582mr13151712oib.40.1693839865588; Mon, 04 Sep 2023 08:04:25 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.24 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:25 -0700 (PDT) From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:03:58 -0300 Message-ID: <20230904150411.56777-6-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/17] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: UNoLZTDoB1/X |
Series |
AVCodecContext and AVCodecParameters side data
|
expand
|
diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 006da7ab57..751526a2a3 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1916,8 +1916,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_side_data_set_get(&is->video_st->codecpar->side_data, + AV_PKT_DATA_DISPLAYMATRIX); + if (sd) + displaymatrix = (int32_t *)sd->data; + } theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) {
Signed-off-by: James Almer <jamrial@gmail.com> --- fftools/ffplay.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)