From patchwork Mon Apr 19 14:09:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27110 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1094311yba; Mon, 19 Apr 2021 07:14:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUmsoSzjY/26LTogyp66rGlAdCeIaLguVdaw9tr1fqrEyWBQdctx28/BPBL79km2aN+Pbd X-Received: by 2002:a17:906:4ed0:: with SMTP id i16mr21752141ejv.96.1618841680020; Mon, 19 Apr 2021 07:14:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841680; cv=none; d=google.com; s=arc-20160816; b=lle4WdEoMY+iMrhav8t0lac7GZ+qAWVfFVLYfaKYVm5Wm4s8y0AwgkC42Un/Dki2h5 6q2ibOwGvo8fAtoijEjD2UvZglYcetIJJdmJS7IxwDb35eN07WPykTlCcs2tNHFhAn0K P1KZzDQlA6CVNnKSOSRgB9EnHzJlo3BcLUACP0OValgl+khj+WU5+v9rbZZZ6rBWqv1/ /uENtni9sfxTURx8DUvkf2RUBREtw4q/Nw3tuUmOkkCJLizkPjxgEyTIGRsGJ4CaEA96 zQkJrjzsnwdn5ddab9al4+8DFk0WXE9m38Yv6OcWkcGhPMEBTz5JFbiE5giaFPM82T2P f6Qw== 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=tBthwFCCcDp4QX4roSvOP2hxQibs2fzk4RwSwk3iTt4=; b=fZ5al69F9Ge9GfrYMn2srXqeSY8XtRJYJylWTVOxwmzxjrvckHoZjrsBQtThmGVWLD ZcPKmPsH1J1IGmxJYZ5Knw0UqIxSACIxVDdEmXsHFA10mvKJ3gxV1YWB+URKelCPKI61 dyWRZh5B82Pp/vn2tNPz06Jq1C6YUPzev6EhuIicL/87RZF12QcGFz3TJ1dMa9af9IPP 7T75tOcIaWIAg1TNaiibft87gQgQagJ9HA5dsYsSYJDiJZxKxLykQcHjYTGkWysjysEx KxEpsPle/DHaxpmGnlLZjBKMY0xcDqIEIq1f7unBkVPlcF/5ynL8hNLFrZmEaRep8ugm QYAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OxDFB66w; 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 q1si11910097ejy.298.2021.04.19.07.14.39; Mon, 19 Apr 2021 07:14:40 -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=20161025 header.b=OxDFB66w; 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 A0770687FB2; Mon, 19 Apr 2021 17:11:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C02CE68799C for ; Mon, 19 Apr 2021 17:11:41 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id i12so4318823qke.3 for ; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jklNGqeBnpQPwrWsJYgnz9DoJ1SU3LOBZEVqGRKzCJ0=; b=OxDFB66wAaibePjNSAbeo7JjGWO+BOfoCu0dKboi9yhWjVnPf4TgcecaYi5Ruoot3m p5zhvg2W/O2QJtDE/lnnQefmal01q2c1Wratg4wFwrE9c2otR9aYRj4zi+2aISlTBNHe DrQg9oGS/gxXcjgmOsGMrXh/GN6TbdaEeTXS5lG/SQPuwpNFnqdoE9qblVnXgBBpZ5I8 rG4jWY68pTGvMgRZJxGJG/VXveCjLUeGGfTvjvGZfCQCPLuRqJhjHesLHHHnwqJhmJLy 3hCd2552iFEQ3J2xVrtK/4D3fr4ibX5Nq/592zAf+gR5Jtc2hVoMEH+w/Wdyo0oDl6YK KH1g== 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:mime-version:content-transfer-encoding; bh=jklNGqeBnpQPwrWsJYgnz9DoJ1SU3LOBZEVqGRKzCJ0=; b=gWvwAi2xc56KuFPuaVFXBoCTSxm49Wk1ELeAbqG5cjnKI27MmpXSRR+8h5WLAx2p9m 5RqIG6K/xscP8Z8ZayYQYrd8pwTK54KGxoww+zP4k4Hm5Nbjf+ijxkkI4AfJVubBxiCV ebktY9D0fCEol+EjkD3X0JSkNy0jDjavL6TARg8UVy5F8YjtaSxKfXzB5yxwo4TjZL+z IYUkCQkwvRAsSoH6wcckchQ0Lw7OgPshDKtdcVW66fmYufo+4adNdlYxNfbk86zuxZQH kP9/CPZmF/RqgwOJFIIzclnUZ+TShp5HvaTtvWVapxK8UR4FInt/ef91kZhP3P+cOOrx MOWg== X-Gm-Message-State: AOAM531/pfGs2uloURQR2yDmP9sKPB2ByeW/36XDoAH7bRA6Yyrf/15z bzMEUT27XinVjI+7IUUN2EPc6tgKmHM= X-Received: by 2002:a37:b103:: with SMTP id a3mr12612477qkf.261.1618841500078; Mon, 19 Apr 2021 07:11:40 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:29 -0300 Message-Id: <20210419141024.8174-33-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 32/87] avcodec: Switch AVCPBProperties to 64bits 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: qA+wHOgUpgL0 Content-Length: 4394 From: Andreas Rheinhardt Announced in 2e8b0446c6798947dac77fee4a06f9c4e8131ab5. Two FATE-tests needed to be updated because the checksums of side data containing an AVCPBProperties struct changed. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 12 ------------ libavcodec/version.h | 3 --- libavformat/dump.c | 4 ---- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/ts-demux | 2 +- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 43b83ac348..c99b455814 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -455,29 +455,17 @@ typedef struct AVCPBProperties { * Maximum bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int max_bitrate; -#else int64_t max_bitrate; -#endif /** * Minimum bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int min_bitrate; -#else int64_t min_bitrate; -#endif /** * Average bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int avg_bitrate; -#else int64_t avg_bitrate; -#endif /** * The size of the buffer to which the ratecontrol is applied, in bits. diff --git a/libavcodec/version.h b/libavcodec/version.h index 17cd17c327..0830acf8b2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_UNSANITIZED_BITRATES -#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OPENH264_SLICE_MODE #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavformat/dump.c b/libavformat/dump.c index 62ef5e9852..2b6ed1ed1f 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -322,11 +322,7 @@ static void dump_cpb(void *ctx, const AVPacketSideData *sd) } av_log(ctx, AV_LOG_INFO, -#if FF_API_UNSANITIZED_BITRATES - "bitrate max/min/avg: %d/%d/%d buffer size: %d ", -#else "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d ", -#endif cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, cpb->buffer_size); if (cpb->vbv_delay == UINT64_MAX) diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 13761fb0ce..609271ac05 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -6,7 +6,7 @@ #codec_id 0: mpeg2video #dimensions 0: 1280x720 #sar 0: 3/4 -0, -1, 0, 1, 150000, 0x0547870d, S=1, 24, 0x5aa90ad0 +0, -1, 0, 1, 150000, 0x0547870d, S=1, 40, 0x7ea50ad0 0, 0, 1, 1, 150000, 0xe80a1612, F=0x0 0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0 0, 2, 3, 1, 150000, 0x51e28a04, F=0x0 diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index cdf34d6af0..c20364483b 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -15,7 +15,7 @@ 1, 5760, 5760, 2880, 1536, 0xbab5129c 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd 1, 11520, 11520, 2880, 906, 0x69cdcbcd -0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 24, 0x663d0b52 +0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 40, 0x91e10b52 0, 33538, 33538, 1501, 12560, 0xb559a3d4, F=0x0, S=1, 1, 0x00e000e0 0, 35040, 35040, 1501, 12704, 0x2614adf4, F=0x0, S=1, 1, 0x00e000e0 0, 36541, 41046, 1501, 51976, 0x9ff1dbfe, F=0x0, S=1, 1, 0x00e000e0