From patchwork Fri Oct 27 18:54:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp57638pzb; Fri, 27 Oct 2023 12:04:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1OyHHLGOfGbiBp5E+o3GhypH5GtiIWFNQMAU0RTjE1Uyk2NR2oQtQ7/UpKPWY4FxYBik9 X-Received: by 2002:aa7:c918:0:b0:53f:25c4:357d with SMTP id b24-20020aa7c918000000b0053f25c4357dmr2914768edt.6.1698433479192; Fri, 27 Oct 2023 12:04:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698433479; cv=none; d=google.com; s=arc-20160816; b=YFtIdtRL8XcJ0UhAS0Mr+vUf6cAunyyQgn1oJKWOQ6ttRJgpcVh1LUfwzxiFte29Ch EAnFGSNlG8RkXgnsuViY3XCSEFxFVwV+aMFZ5WcmXCRjJWio+YLstqTOZoC8SPHRRh8h SgJBy+jWQ1S20DRLBlfKTAYaqr7+4RsqnJblm42O6CQmmvpL39z4tCevuivAGwG5+GxU Wb/Nh35FPpBmkzSVV/p3/nrAi40OrP5IPH6Lui2jsxWCpFMQRa/N8P0HGxPG9Ntvy5Xx YKG3TdFF4AET76WEpKfhj90R9OQPQc3qgW1X4wvE1cSkK+wguBSt6ZMBH3U67bWTWn50 Sdlw== 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 :delivered-to; bh=98OdSwmlzOplz8QS2vUl/BzXbYdNmGkavmwlM9dXt7w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=S1JFbnbq+xjjR/+WGrI8i+CNchhxaPPo8nQmibpE8mvs0JFDNQKg9i3emkZMTf9uA+ kwNGDQcXOzqPnZzrNXKHEObiBYVQO5qd/8JmhrmPtsKJj14X7CxhmXoK0hRTTSdruFuA bj2t4saUXv+hlE6cTe0cFDFUdlYqEMRaxbJcnfCb8gDjhcbH7Gcixf6VmdQp/L4MXBiz 6aG0Km+Epx6BNBTDvbuVW6srhrLOFMm8B2KNsqFU2PP9IbJvZS+ab950JX6RZ4bWJugs jkaVdUzkv4JSsXNsdybxSgM8bsG6PrkjubRr/qTj1KTNQPLgzP+XVxenZSizXcLAeFJH hU5Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ee13-20020a056402290d00b0053e3d8f1da0si1020934edb.484.2023.10.27.12.04.38; Fri, 27 Oct 2023 12:04:39 -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; 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 90E2168CBB3; Fri, 27 Oct 2023 22:04:28 +0300 (EEST) 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 2DDE768CBA6 for ; Fri, 27 Oct 2023 22:04:22 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 807679F6 for ; Fri, 27 Oct 2023 21:04:21 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 49hjMMf0pKbT for ; Fri, 27 Oct 2023 21:04:19 +0200 (CEST) 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 500D29E7 for ; Fri, 27 Oct 2023 21:04:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B23B83A068B for ; Fri, 27 Oct 2023 20:54:40 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 20:54:34 +0200 Message-ID: <20231027185434.672-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/smacker: export sample_aspect_ratio 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: PervmGnU8ooB Fixes #10617 --- libavformat/smacker.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 1d54e8e917..d04c8b91a6 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -34,6 +34,8 @@ #define SMACKER_PAL 0x01 #define SMACKER_FLAG_RING_FRAME 0x01 +#define SMACKER_FLAG_Y_INTERLACE (1 << 1) +#define SMACKER_FLAG_Y_DOUBLE (1 << 2) enum SAudFlags { SMK_AUD_PACKED = 0x80, @@ -144,6 +146,9 @@ static int smacker_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 33, pts_inc, tbase); st->duration = smk->frames; + st->sample_aspect_ratio = (AVRational){ 1, 1 + + !!(flags & (SMACKER_FLAG_Y_INTERLACE | SMACKER_FLAG_Y_DOUBLE)) }; + /* init video codec */ par = st->codecpar; par->width = width;