From patchwork Mon Apr 19 14:37:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp577856iob; Mon, 19 Apr 2021 07:37:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcv0fvrBOR3g+rhK2qnalLDTP6oCLyHQr84hXgS8/lN5dx54aRlTO66OcF4QiXXTE9Zg0n X-Received: by 2002:a05:6402:11c7:: with SMTP id j7mr8011405edw.119.1618843062583; Mon, 19 Apr 2021 07:37:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f27si12800127edj.425.2021.04.19.07.37.41; Mon, 19 Apr 2021 07:37:42 -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=@outlook.com header.s=selector1 header.b=VB66EcXE; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E883868A38D; Mon, 19 Apr 2021 17:37:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075011.outbound.protection.outlook.com [40.92.75.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B983680236 for ; Mon, 19 Apr 2021 17:37:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PdSfF8Mh0fXyjatRI32xyF9httE9H6MRBx48IIvqFMmN/c/DESJBb/h3CAwWbBBcE2mW8uABrKWRING+EvkIACtwa2GdTcXnuzD8MkjphghkU95EgnV8K77oCS3ta18DKqrMxjIqpjg7rSSEzxmAcaHWNTISjb5b76P6Ck4JjOAtvS9uSL3PFrJkUd04BxD8H7TpZ1UNbQVp6aNiT+sTrhrQv60WfkI7VuX4jLcw3YBHUZ5flB9zQNCCX9bS/rLMURY/J2rsVvbB8b7i2/CmHsT5kHWbCXLYIOQusmVcFKhV47as63J3MPgHnnU2v0rSd9p7S8snbubzGIBPW0wJWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2PmP0pZ+T04mn+A1QQ7m3xfzWq3sr8d6Ll2Htf1/NCw=; b=A23dnDBOkf/PQq59XbQ4mnVfIaY/X0nKMJyCl+k7dzKSGyOfhhXd9lpK/FeH5J5pWEWAhzrxx0i/NO9WLR2WB83ogzDmn3TOoFQ7iRhQ8wBG9eLS5JZP7/zm5qgAsrGS3rCyNlWaE3pMLM2s9bql+Fur+n2GZNXsvFSDom+tKDsrr/s32guggkbXC+RsbAc0RylPGolLGF0yHsDIzdDxIAMUqguV2331bATlu02uKffq0//Ql7ZlH82jKMBzjeuwRhxhJ3U3PqPKomucn5FmTiEvuWDhgZ71cDVchKuDgYGbmbi/5Iu8yxXWF+kfPkPsI9upk/kHwDMsNEyKZH1x1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2PmP0pZ+T04mn+A1QQ7m3xfzWq3sr8d6Ll2Htf1/NCw=; b=VB66EcXEXA71QtlNDG4IW2fvvVHOsnO6pBbxXm/EVd0sZuRXzdxbwHBnWd/1eTmw0ooGv8O7T+SpvR6erGr/x7557ZwgxuQRa4hRaItt+RO+INdsRsoA4Gaq//Ff0sFDkWpsvEGLnziyBhADNHq6vnnfvX0O6eHrsG+shBml7ou1dT7aspNbCYpgJ+oP0mdZK3PaOdYhfl7x69Rqzx6graoFdOSP2qkkliThUgbQmmEMgBMiUjkBnfVo0dWAOkX+X731n8pRvRJFatsFmOv3yAEyTexERhcnovRyZNQv4yRF9AhHjAoFio3UQDjGK3dbam753s2rArffZYIoGDYbiA== Received: from DB3EUR04FT013.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::48) by DB3EUR04HT110.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::349) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Mon, 19 Apr 2021 14:37:26 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::44) by DB3EUR04FT013.mail.protection.outlook.com (2a01:111:e400:7e0c::277) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Mon, 19 Apr 2021 14:37:26 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:10148B6E09E0D109C39AB9B57F754052855DA3A4C89077A9740BD38A0A8B986B; UpperCasedChecksum:0C87B016BC216B0BE1E2E317A98707A863382E95F625D1229D65760997C45BF6; SizeAsReceived:7495; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.024; Mon, 19 Apr 2021 14:37:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 16:37:05 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210419141024.8174-33-jamrial@gmail.com> References: <20210419141024.8174-33-jamrial@gmail.com> X-TMN: [AHkddUM0dd/4VU97xSUqL7ZytklkOmpp] X-ClientProxiedBy: AM3PR07CA0085.eurprd07.prod.outlook.com (2603:10a6:207:6::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210419143705.412103-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM3PR07CA0085.eurprd07.prod.outlook.com (2603:10a6:207:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.6 via Frontend Transport; Mon, 19 Apr 2021 14:37:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2de99dcc-6917-4572-e5f8-08d90340a6b6 X-MS-TrafficTypeDiagnostic: DB3EUR04HT110: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7Dl6EL4qs+DTSeMUUTou+sTW3iCquIn0X0qG5SaxGXHmKazlLX+fBst/XSTT0s6aIv0fz9Kk+E096Fb+s2J8T0Wmt4sARwcO6ig7cVHP+f+7F5kjuvB6qoWl3WlLWjS/c9EgN7C0xOsUxs5o/kWx9Eo+zEtmY0fDvmqYZx22Y+g3zsIu1tXWPVHYW+XE6we+oSoacCuAojPa+UzpGT4FdJs89AF9TM5JALBCvyunCCPFGnMr81v9VdlRg6ucNeBUWdwLO+XG5wGh9ZHae2Mu619AnpssaTFxVRAR8JTiCqya4V4hFK5d6kovcm7gx8mdolI590fM6jbJrCpR71F8MQnKWFkD5gnDy6NicXvgPK5T58gudDe7CEAp6Bt55e9htcAfN5LePlHBq6zlNE3eA== X-MS-Exchange-AntiSpam-MessageData: jXTfTSeVn34r3n/N74sImvwc3WY5w22zsvy4Oj9kk23spO/lCIZL0QH5nmVG4t30nThsWcMUR6pZGQ8LBQUBTTMzgAYsC3FGLT2gY3EEPHxxE2iWj/xNKldvejBQ+jaHoQLPHkQZPJ5djlxKvwC0aA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2de99dcc-6917-4572-e5f8-08d90340a6b6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2021 14:37:26.2608 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT013.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT110 Subject: [FFmpeg-devel] [PATCH v2 32/32] 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XWSwEOLVpZjr From: Andreas Rheinhardt Announced in 2e8b0446c6798947dac77fee4a06f9c4e8131ab5. Two FATE-tests needed to be updated because the checksums of side data containing an AVCPBProperties struct changed. buffer_size has also been switched to 64bits because it is a bitsize. Signed-off-by: Andreas Rheinhardt --- Now also switching buffer_size to 64bits. This has the intended side-effect of fixing the framecrc checksums for non-x64 arches. libavcodec/avcodec.h | 14 +------------- 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, 3 insertions(+), 22 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 43b83ac348..684602f22f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -455,35 +455,23 @@ 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. * Zero if unknown or unspecified. */ - int buffer_size; + int64_t buffer_size; /** * The delay between the time the packet this structure is associated with 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