From patchwork Tue Sep 12 23:44:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5124 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp297737jaa; Tue, 12 Sep 2017 16:47:28 -0700 (PDT) X-Received: by 10.28.95.9 with SMTP id t9mr754685wmb.109.1505260048646; Tue, 12 Sep 2017 16:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505260048; cv=none; d=google.com; s=arc-20160816; b=0LAcLoW/MvDX+v38vU32ku0cKnISA+u4f8qraw2Ysf78HLuyYXO+hfu3+ZYLuIJ/8u kSKuB5En2s3AZjhQ0RkKTJQEncGoghb5KiBfOA1UnyRkzDpv+Z+kPQFXJKDLGnD/pcHv T8UbWLYcx7WhwhPd4np3n6vogcyKoY67Pi3IqH8VCenXDP26qNVNcJpwbuYCjcg45OMZ W/9W9uQ378yVKWf5d3Kairfwv9RrSreolqxGoxOpoodWSGhJV+U3k0LQMd6sf3DZozFE RzznI9WTQTrurOAfQ8p/UQLx2n5Irs5qF0+GfwJU7nQtwheRmtK+FzI75ITkAYTFL7XW DiCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+maLVNiQqvTCjaDVm8VNFei1oXnsWgVZ0Omq7wlsQp8=; b=fP4JNw5UmnAS7ZCurMRUOL5pZJy4unyVEFMz4bY922NQoz9/NYr1dcKYm72DXjlJri gxja8zuMai27Yt2PWVw1mmud/7ijXlR/rbNn18F0mTJA9FeHn2oYtORRwRnWFBJexqPN Jxc6ko1hQoE7o3uxNvRiAPf8SSwsV9rcPZ2AcAuMgWzP0T6pLe2msbnSPAyUHwLPMrcA BZPJXc9aFN1ju4GbvLpjmGwKl5GsWhBd/MPe5p2RsdrVFkdBQVrnrOqbw/ozQOae1B21 KW9y9t7MXnPe7hCV8Wd9nBPdrK2994MTHooKhjghBih7O6qmULhNyppatt4Kj4BOqnkH MF6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=MIVXmfji; 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 l133si9855500wmb.24.2017.09.12.16.47.28; Tue, 12 Sep 2017 16:47:28 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=MIVXmfji; 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 EA734689EAD; Wed, 13 Sep 2017 02:44:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C31C0689E84 for ; Wed, 13 Sep 2017 02:44:27 +0300 (EEST) Received: by mail-wr0-f179.google.com with SMTP id 108so25570073wra.5 for ; Tue, 12 Sep 2017 16:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=i3jbsEfZoRoPGyEMAUwHQA01zfi3G2eXzpWzXAfRTig=; b=MIVXmfjivrriSw+jOhMfCewVRg2D0tDo+VgAtSlTmVi/8wo3VFLerwhUAX5Zi4+mjD /y07/6xfKPhkvFbDCxBbVkeL1Ut19T8v36texGxPF5A57rgbaAagDwKCDXBUlo6bNlNx sLgAg2exi4Q62QGXq7M93U2cH8QSCBcvpAqhuL53lxnvK03PqwuCTUcGhNtQGlleYHTS l1V67O5SLNjajPV73IEtxEmXPiMQVXTRCxX4j2N3j7irAa9sdDkcw+KBTr1qrmEGwQnG r5HYdKgM/dIkvAvb3w1OdrvxM3uWpzkzM3KC8ra2gSCKECpxib08LhRpcUhDnFicROLQ b8Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=i3jbsEfZoRoPGyEMAUwHQA01zfi3G2eXzpWzXAfRTig=; b=RLEA9u9mfQanigGPc+vtlOSPp4OuTIiKFkUdJToEgQjXCyhy3hkgP8mO14q6TLXqI1 iZskbexe7UdLoqVz/2nuiPyU2bPk8MvivjFExcp3mB/6xv1V078jyM2Zo9edlxV38Jpv 5zbyJLopqy914xS7xw2S0jIZ0u2nI2KXNS+AdPsLTFgPWBYaKIanWaXFgulbHBKDDDZQ qxiqGtp2H+Qn5m2zB5LW+4KAM7k0wTXArhuv0igNEftHdnkU0+uawCBzOrZRRDvVZE+X KhmNJgkYSPUE6sdnizGaZgreWYdm5L7DN0KSdvF4DAywJ2+IYEl+RfH205eSTWW3yS2Y B53g== X-Gm-Message-State: AHPjjUjG324Es1soWVnF5ciy7mn+KY8J70vnp7Dal+nXbI2V1QIqsLzz +fGkWgzYXlS1VatOmao= X-Google-Smtp-Source: ADKCNb7FclsCCf5uqb4RFTJTH8tE6E1aQODKwtB2CRgs8pRSWHJvpkaY9xJIGuC0ae4cNYt/SoxrhQ== X-Received: by 10.223.134.23 with SMTP id 23mr13806580wrv.93.1505259872956; Tue, 12 Sep 2017 16:44:32 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p193sm4378138wmg.37.2017.09.12.16.44.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:44:32 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 00:44:08 +0100 Message-Id: <20170912234410.14093-19-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912234410.14093-1-sw@jkqxz.net> References: <20170912234410.14093-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 18/20] mpeg12: Move finding the best frame rate to common code 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Previously in the mpeg2_metadata filter. Also adds a test. (cherry picked from commit b5859e0b04bdbe12c97cb12ac10a45d51d2d73c9) --- libavcodec/Makefile | 1 + libavcodec/mpeg12.h | 4 ++ libavcodec/mpeg12framerate.c | 64 ++++++++++++++++++++++++++++ libavcodec/mpeg2_metadata_bsf.c | 58 +++---------------------- libavcodec/tests/mpeg12framerate.c | 87 ++++++++++++++++++++++++++++++++++++++ tests/fate/libavcodec.mak | 5 +++ 6 files changed, 166 insertions(+), 53 deletions(-) create mode 100644 libavcodec/tests/mpeg12framerate.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 135eb1751f..605dba2d25 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1069,6 +1069,7 @@ TESTPROGS-$(CONFIG_GOLOMB) += golomb TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter TESTPROGS-$(HAVE_MMX) += motion +TESTPROGS-$(CONFIG_MPEGVIDEO) += mpeg12framerate TESTPROGS-$(CONFIG_RANGECODER) += rangecoder TESTPROGS-$(CONFIG_SNOW_ENCODER) += snowenc diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index f551504b8c..1ec99f17e1 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -73,4 +73,8 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], void ff_mpeg1_encode_init(MpegEncContext *s); void ff_mpeg1_encode_slice_header(MpegEncContext *s); +void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, + int *code, int *ext_n, int *ext_d, + int nonstandard); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12framerate.c b/libavcodec/mpeg12framerate.c index 094cd180a5..ab3d351173 100644 --- a/libavcodec/mpeg12framerate.c +++ b/libavcodec/mpeg12framerate.c @@ -18,6 +18,9 @@ #include "libavutil/rational.h" +#include "mpeg12.h" +#include "mpeg12data.h" + const AVRational ff_mpeg12_frame_rate_tab[16] = { { 0, 0}, {24000, 1001}, @@ -37,3 +40,64 @@ const AVRational ff_mpeg12_frame_rate_tab[16] = { { 15, 1}, { 0, 0}, }; + +void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, + int *code, int *ext_n, int *ext_d, + int nonstandard) +{ + int mpeg2 = ext_n && ext_d; + int max_code = nonstandard ? 12 : 8; + int c, n, d, best_c, best_n, best_d; + AVRational best_error = { INT_MAX, 1 }; + + // Default to NTSC if the inputs make no sense. + best_c = 4; + best_n = best_d = 1; + + for (c = 1; c <= max_code; c++) { + if (av_cmp_q(frame_rate, ff_mpeg12_frame_rate_tab[c]) == 0) { + best_c = c; + goto found; + } + } + + for (c = 1; c <= max_code; c++) { + for (n = 1; n <= (mpeg2 ? 4 : 1); n++) { + for (d = 1; d <= (mpeg2 ? 32 : 1); d++) { + AVRational test, error; + int cmp; + + test = av_mul_q(ff_mpeg12_frame_rate_tab[c], + (AVRational) { n, d }); + + cmp = av_cmp_q(test, frame_rate); + if (cmp == 0) { + best_c = c; + best_n = n; + best_d = d; + goto found; + } + + if (cmp < 0) + error = av_div_q(frame_rate, test); + else + error = av_div_q(test, frame_rate); + + cmp = av_cmp_q(error, best_error); + if (cmp < 0 || (cmp == 0 && n == 1 && d == 1)) { + best_c = c; + best_n = n; + best_d = d; + best_error = error; + } + } + } + } + +found: + *code = best_c; + if (mpeg2) { + *ext_n = best_n - 1; + *ext_d = best_d - 1; + } +} diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 9da8fd128d..4d33f29bf2 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -23,6 +23,7 @@ #include "bsf.h" #include "cbs.h" #include "cbs_mpeg2.h" +#include "mpeg12.h" typedef struct MPEG2MetadataContext { const AVClass *class; @@ -99,63 +100,14 @@ static int mpeg2_metadata_update_fragment(AVBSFContext *bsf, } if (ctx->frame_rate.num && ctx->frame_rate.den) { - // Table 6-4. - static AVRational frame_rate_table[] = { - { 0, 0 }, - { 24000, 1001 }, - { 24, 1 }, - { 25, 1 }, - { 30000, 1001 }, - { 30, 1 }, - { 50, 1 }, - { 60000, 1001 }, - { 60, 1 }, - }; int code, ext_n, ext_d; - AVRational best_error = { INT_MAX, 1 }; - - for (i = 1; i < FF_ARRAY_ELEMS(frame_rate_table); i++) { - if (av_cmp_q(ctx->frame_rate, frame_rate_table[i]) == 0) { - code = i; - ext_n = 1; - ext_d = 1; - goto found_frame_rate; - } - } - for (i = 1; i < FF_ARRAY_ELEMS(frame_rate_table); i++) { - AVRational fr, error; - int n, d, cmp; - for (n = 1; n <= 4; n++) { - for (d = 1; d <= 32; d++) { - fr = av_mul_q(frame_rate_table[i], - (AVRational) { n, d }); - cmp = av_cmp_q(fr, ctx->frame_rate); - if (cmp == 0) { - code = i; - ext_n = n; - ext_d = d; - goto found_frame_rate; - } - if (cmp < 0) - error = av_div_q(ctx->frame_rate, fr); - else - error = av_div_q(fr, ctx->frame_rate); - cmp = av_cmp_q(error, best_error); - if (cmp < 0 || (cmp == 0 && n == 1 && d == 1)) { - code = i; - ext_n = n; - ext_d = d; - best_error = error; - } - } - } - } + ff_mpeg12_find_best_frame_rate(ctx->frame_rate, + &code, &ext_n, &ext_d, 0); - found_frame_rate: sh->frame_rate_code = code; - se->frame_rate_extension_n = ext_n - 1; - se->frame_rate_extension_d = ext_d - 1; + se->frame_rate_extension_n = ext_n; + se->frame_rate_extension_d = ext_d; } if (ctx->video_format >= 0 || diff --git a/libavcodec/tests/mpeg12framerate.c b/libavcodec/tests/mpeg12framerate.c new file mode 100644 index 0000000000..595bdb278a --- /dev/null +++ b/libavcodec/tests/mpeg12framerate.c @@ -0,0 +1,87 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/mpeg12.h" +#include "libavcodec/mpeg12data.h" + +int main(void) +{ + int i; + +#define TEST_MATCH(frame_rate, code, ext_n, ext_d) do { \ + AVRational fr = frame_rate; \ + int c, n, d; \ + ff_mpeg12_find_best_frame_rate(fr, &c, &n, &d, 0); \ + if (c != code || n != ext_n || d != ext_d) { \ + av_log(NULL, AV_LOG_ERROR, "Failed to match %d/%d: " \ + "code = %d, ext_n = %d, ext_d = %d.\n", \ + fr.num, fr.den, c, n, d); \ + return 1; \ + } \ + } while (0) +#define TEST_EXACT(frn, frd) do { \ + AVRational fr = (AVRational) { frn, frd }; \ + int c, n, d; \ + ff_mpeg12_find_best_frame_rate(fr, &c, &n, &d, 0); \ + if (av_cmp_q(fr, av_mul_q(ff_mpeg12_frame_rate_tab[c], \ + (AVRational) { n + 1, d + 1 })) != 0) { \ + av_log(NULL, AV_LOG_ERROR, "Failed to find exact %d/%d: " \ + "code = %d, ext_n = %d, ext_d = %d.\n", \ + fr.num, fr.den, c, n, d); \ + return 1; \ + } \ + } while (0) + + // Framerates in the table must be chosen exactly. + for (i = 1; i <= 8; i++) + TEST_MATCH(ff_mpeg12_frame_rate_tab[i], i, 0, 0); + + // As should the same ones with small perturbations. + // (1/1000 used here to be smaller than half the difference + // between 24 and 24000/1001.) + for (i = 1; i <= 8; i++) { + TEST_MATCH(av_sub_q(ff_mpeg12_frame_rate_tab[i], + (AVRational) { 1, 1000 }), i, 0, 0); + TEST_MATCH(av_add_q(ff_mpeg12_frame_rate_tab[i], + (AVRational) { 1, 1000 }), i, 0, 0); + } + + // Exactly constructable framerates should be exact. Note that some + // values can be made in multiple ways (e.g. 12 = 24 / 2 == 60 / 5), + // and there is no reason to favour any particular choice. + TEST_EXACT( 1, 1); + TEST_EXACT( 2, 1); + TEST_EXACT( 12, 1); + TEST_EXACT( 15000, 1001); + TEST_EXACT( 15, 1); + TEST_EXACT( 120, 1); + TEST_EXACT(120000, 1001); + TEST_EXACT( 200, 1); + TEST_EXACT( 240, 1); + + // Values higher than 240 (the highest representable, as 60 * 4 / 1) + // should be mapped to 240. + for (i = 240; i < 1000; i += 10) + TEST_MATCH(((AVRational) { i, 1 }), 8, 3, 0); + // Values lower than 24000/32032 (the lowest representable, as + // 24000/1001 * 1 / 32) should be mapped to 24000/32032. + for (i = 74; i > 0; i--) + TEST_MATCH(((AVRational) { i, 100 }), 1, 0, 31); + + return 0; +} diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index fc8075c532..2d85849309 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -50,6 +50,11 @@ FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter fate-iirfilter: libavcodec/tests/iirfilter$(EXESUF) fate-iirfilter: CMD = run libavcodec/tests/iirfilter +FATE_LIBAVCODEC-$(CONFIG_MPEGVIDEO) += fate-mpeg12framerate +fate-mpeg12framerate: libavcodec/tests/mpeg12framerate$(EXESUF) +fate-mpeg12framerate: CMD = run libavcodec/tests/mpeg12framerate +fate-mpeg12framerate: REF = /dev/null + FATE_LIBAVCODEC-yes += fate-libavcodec-options fate-libavcodec-options: libavcodec/tests/options$(EXESUF) fate-libavcodec-options: CMD = run libavcodec/tests/options