From patchwork Thu Aug 13 16:54:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Mallon X-Patchwork-Id: 21635 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E64CF44AF54 for ; Thu, 13 Aug 2020 19:54:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCB0368AC45; Thu, 13 Aug 2020 19:54:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f99.google.com (mail-vs1-f99.google.com [209.85.217.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FED96883D0 for ; Thu, 13 Aug 2020 19:54:21 +0300 (EEST) Received: by mail-vs1-f99.google.com with SMTP id k25so3241771vsm.11 for ; Thu, 13 Aug 2020 09:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codex.online; s=google; h=from:mime-version:date:message-id:subject:to:cc; bh=LNgaAzb0c8ZAwACr+HCBSrwrKe3tltvmJXT8cAtXsLY=; b=s4nrbgecQmC1mHHJCGnpD0VgVPokfS/ux0c3G8byMISG9sgHB+nXEhjhvEDs1nUgdS 3ELYHZ2hd6d+RTvOZMxU4S8edrZYn76nQIINKF+JSir+d+3PGm8GvGtN9uqv/5B8JrCL UwhlobZJzOFPsxbn+5j+V6iR6Mqdfj1XQ2M8I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:message-id:subject:to:cc; bh=LNgaAzb0c8ZAwACr+HCBSrwrKe3tltvmJXT8cAtXsLY=; b=M/R78aedVO4bwKKTLSvzpwhqGDcGSTqkfe7xcIP6x9x6itjqI9qqvNYLCVXXiKiWDy fRXDqHng08VIgIpiegheYCYMcVJmjQV23K5X3BGu56tqF8ggFhCC6QM8gL9WB/+zG/R9 2q1lnwj7orP1S8soiKxWhh/kUlRnxIfX1dcqPO4xwB6/3vJEXlc5Bm8l+3NTbe7lg+4H Wcet293RQcgSswZjDoFzYvpxBlYRQZx3r0jZtNvBaCRiess67VdPW9vpEsGNNrXTYnMA Ap9KdSXvYn1xm4znYLMA0hqYEp80GIeMtpFgROl6RbsR7GX00vJxIHrG2Rvhb2rQZIB6 3w5g== X-Gm-Message-State: AOAM532r2y3N6ZwsFZg9msRiRc51CpQg6JDHKOd3u9aYrYz/SXCQtu3C J7RulDIcU4JUYVkATcMpk6KV8KaPUYb6yDYSHfObXvNaBq8r0A== X-Google-Smtp-Source: ABdhPJwwPO0Aayk0Tgfo5VsCoAvDMTU3mZc02npUwGeTdbMmiFfNYjTfXyClUhl71kCzLDTzacwvIpt0sLSw X-Received: by 2002:a67:2d4d:: with SMTP id t74mr4384985vst.111.1597337660468; Thu, 13 Aug 2020 09:54:20 -0700 (PDT) Received: from us2.smtp.exclaimer.net (us2.smtp.exclaimer.net. [104.209.35.28]) by smtp-relay.gmail.com with ESMTPS id h67sm729309vka.8.2020.08.13.09.54.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2020 09:54:20 -0700 (PDT) X-Relaying-Domain: pixsystem.com Received: from mail-ej1-f69.google.com (209.85.218.69) by us2.smtp.exclaimer.net (104.209.35.28) with Exclaimer Signature Manager ESMTP Proxy us2.smtp.exclaimer.net (tlsversion=TLS12, tlscipher=TLS_ECDHE_WITH_AES256_SHA1); Thu, 13 Aug 2020 16:54:19 +0000 X-ExclaimerHostedSignatures-MessageProcessed: true X-ExclaimerProxyLatency: 18154432 X-ExclaimerImprintLatency: 2340680 X-ExclaimerImprintAction: af22a761abcc43b0a328a10021de1c2f Received: by mail-ej1-f69.google.com with SMTP id y10so2325022ejd.1 for ; Thu, 13 Aug 2020 09:54:18 -0700 (PDT) X-Received: by 2002:a05:6402:b26:: with SMTP id bo6mr5651817edb.104.1597337656396; Thu, 13 Aug 2020 09:54:16 -0700 (PDT) X-Received: by 2002:a05:6402:b26:: with SMTP id bo6mr5651805edb.104.1597337656210; Thu, 13 Aug 2020 09:54:16 -0700 (PDT) Received: from 795182654588 named unknown by gmailapi.google.com with HTTPREST; Thu, 13 Aug 2020 09:54:15 -0700 From: Harry Mallon X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Date: Thu, 13 Aug 2020 09:54:15 -0700 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avcodec/dpx: Read alternative frame rate from television header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Harry Mallon Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Harry Mallon --- libavcodec/dpx.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) avctx->framerate = q; diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index b1833ed9ef..694deb27c5 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -216,10 +216,22 @@ static int decode_frame(AVCodecContext *avctx, else avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; + /* preferred frame rate from Motion-picture film header */ if (offset >= 1724 + 4) { buf = avpkt->data + 1724; i = read32(&buf, endian); - if(i) { + if(i && i != 0xFFFFFFFF) { + AVRational q = av_d2q(av_int2float(i), 4096); + if (q.num > 0 && q.den > 0) + avctx->framerate = q; + } + } + + /* alternative frame rate from television header */ + if (!(avctx->framerate.num && avctx->framerate.den) && offset >= 1940 + 4) { + buf = avpkt->data + 1940; + i = read32(&buf, endian); + if(i && i != 0xFFFFFFFF) { AVRational q = av_d2q(av_int2float(i), 4096); if (q.num > 0 && q.den > 0)