From patchwork Wed Aug 24 01:40:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2229498pzh; Tue, 23 Aug 2022 18:41:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR6iHTnt3d1EnTrdE3TpbydZGmucL+AXPBfPI2ax2dOWysXlw9KQWaeDNfvLo/v1er1Yinlx X-Received: by 2002:a17:907:2cf2:b0:730:d73e:acb7 with SMTP id hz18-20020a1709072cf200b00730d73eacb7mr1379689ejc.223.1661305270666; Tue, 23 Aug 2022 18:41:10 -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 qk10-20020a1709077f8a00b0073d7d0aaa16si1110163ejc.226.2022.08.23.18.41.10; Tue, 23 Aug 2022 18:41:10 -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=KBe+Y+2j; 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 EF27868B9EE; Wed, 24 Aug 2022 04:40:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11DC868B9DD for ; Wed, 24 Aug 2022 04:40:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ltTHvGqKYh21KOCLXPhO9VMKs5TVjUKr0nda+koTtGmv8NYYzri7cpPcMNQRIf1aEwhu970AC3fmkcA80n6h1pvk4mQ7PQzSw81j5I41bMGHnHQE8D9pztsDVWV95sKmbzZUIaOTTRlBJSpuakfTq3L929xLfjHgH1NNxUFqvTP0d5xBBpLEk8A2zN+P/LxDZmh9nzdpi1ZQbY9sgHTUQ1TYv7cW1DLRGzTSMgYR5zjDUk0azoPiomeOh0aYv6AZh+b8g3TauscPKJTw2UYYWzJsJfXvO0YPYFWbnzCWG31VyOOUGVi7/GqD23QMZV0G/xe3PKsC9Yiz4sq1YcoNCQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GH48eO+iybKd9ZHTjy3R3h8nJk7txKHam2+WUXEe46E=; b=Dbc3mDnH8L3yDkgjU+bxu/0hPnLiAkb0eTbqMhfvwca53Tl8R9k+A8be44PXXuOuhZbsiemzBrSetVvb+IUYR1t75fMC94tQquBDocA8IUI+W0NxB7PIu8H81be9veUG9eFYCepmBXQqa9ueW4HckLHX/AB/XnFYpNuTdpqCVgY9y+2Wppfl3SBDjViJ8fSrtPAS7PoBHLKMVESNVulYOyz3nv+xLwWwjbRpP16fgG72ew3hUBdQ1222IjHVL7Z0z+edPoDE5nZQuLGmRcdqMA3HK4DECJ3f1qY57Sw6BfUI+nmOjTu8C1OmcEYBkl6irKlEvzS3U7R+7h99B8picQ== 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=GH48eO+iybKd9ZHTjy3R3h8nJk7txKHam2+WUXEe46E=; b=KBe+Y+2jC0G6g6+OBnDxckeHThwpGpFCr3xnlbIHYTqY90KQG7Cr+fb8PYOu6T3oUks1a0L3M85NQvmfrMcdvJJJHhciBiaLoxPbZqHjxA9CLeeTDaoXIlSVep3NIPcaAZ+qHN9dbAz6SLy+fafNEXKmENVxbGlwv1v4jr9HMwglvty1Zy38Tjb64VaAteRdR3+UZv2l/YjgWoILF14NVMvVg8OuH+Nx55RMWbybo+ctug0ng/P1Q+HGW+RuJCxJOtKdocJME2uFQVqKb3+HCCGHGcdQ0mYwJrJpw2lyN1BXE9Gru3XapoFp9bwx3qKUPBkoj3F1H0pbFqdB7s5wRw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB8966.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4e5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Wed, 24 Aug 2022 01:40:24 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Wed, 24 Aug 2022 01:40:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 03:40:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cto0wFMqZ4D+xClLqcs9KWk+UJR4WF+r] X-ClientProxiedBy: ZR0P278CA0110.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220824014006.2441856-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b535490d-6fd1-477c-d2fa-08da85719d31 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqqMbmmUl3hmz+Lb9LXv/kA3oQl7kry/x+EfvHB58VqVkpSzyEGRyVxGFZVP+ZnXcu2Id6lJHD67SqJ4RFuCsSXrZIW0w8k5dcV5dN6RiMAC2gtOEUug/R8scls8l02gcbte9Q0y0WSE/CoOcJV9Vqvce4metJfJ1ayWrT/Xo/9ZgB1sNtVjKYGvbWCvsZgEH63lndgvFKusWhBjgZC4koayjUQI3rEHQd0DV9zUVVcC+gAVfKegL1xj8Wa4uSPmiowZLCQFbi2XYCqcaQtwA8YxKKatZzGs4nzlVXwgrAJkD9OBdDzImAjIAUZYi6gdp5rXnUiGT3uR2fi5Q5sllr57lEZHPClYe3EJ3ZDw+AfB1ML27de1e/y6y9PtAtiUTDYT8nM60G0YvNmLPrpT+DVvEjpSmq8gOpno2rQl6KC76V9sFE+67XrLAkewzdW6cHpvs1PGcJ/KnKwcgyVG7UECzJcd7Xrre0ifJTmcjnKTbbqdT2cSURjqp9NkM4aytKImkmZ+wqcxT9vQu/HMVLV4ifydzmKZA740WixARpCZgnEaF08NgpYrRUq1prMPm0D1oCrcb6Qn9fdlLT/XMo5cEhNakulF7AkERBd7GTjqRBKv3mpKLI+u7/lvTWYzei4QVC3cWvfPWYRGb997zO5eGbXzwKbr+cpUx2R7ss+XDs2bmXottHO+dC1XPpnBnem14X5UIpJ0nAesQFhQiyqNyUdGWeZfkqaaqTvdYIPFvAOPgAFtECMBbsEfktuHRM= X-MS-TrafficTypeDiagnostic: AS4PR01MB8966:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XNvXPUolFj8kHpjrO388quOyu4WibVPpXjFb9lY/DP74gJ+HLxK4/BBL5hmoVIguZJMWWYGtAOWFw65+v0jBEUROiSDE6/7Z958FaxAQdQ9+nFZ4DX6QtinP3ZO/0wrz4YD6w6gTwv8ISAnO1DPigOBimAm9jvea4efPHtcEoTZiPNpBpMc+FainOnMH1dSTULO7uRSCcUlC5TKFF3T6P2zKo2t050EqezicFXJ9ot+Lo8i+y+ajrFC6alRXejVbL8FNv+wm/M3h0kSQMhu9WkIWpbFUBtVtq2RjxV75HJHfvYmcc32iu7pEAc6HbYr6+YN8RFhgD9Gaa1WGLfUG0NqQ2rFnMJI8JCeiRxHuklLXjzQhJ5zUFPIfsCFQP/cZlZJ6+YqICvCOmKP7sNT8aZxETOY6i8gBbfsSwWjBnKbpvPbVG/L2AuRWrmjauC8ohJ9LLTVzYWckG3Pbeb9R4Y0Xp+tj+1ybZLCZjM7MSmEp8VEuj3SUn+zIHCbaDkS9GPUjdoICr9yq2RXjJHaig+ksYdE6YmhZACunjqiiJSf/rSBgC6SPCqe+zHrf5pC+qSAJUw1ODBgSD97cLpCcIVrlKWzVJB1eyAOM0gdQ1Y4Z6y4F4aGJ7FB8tsz0A7Q+N/rxbgb2THqPfNe5MgunSg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZVOLQ9DffTszsvKrCBCUjCXVyBnndmDj7H90JoKiQFtghjwbVBFN/gW8HaRL5TSGo/WH8nl7xh5B0bl6rT0YXQuXPXVT7TxS643sSTWbx5b8ROvv056gKgg0IlBtPFYJ0onw0tzE2km+mXeNCY6KanMz0A/cNIKIg+Mx6fhqIEBofFGqFmZx39rv5+w6Prl0W4wHmXt3UKbWxjbRDmzzqVZ6k1uGf1UdwrMsQQz62FlIgtkNY1umPbLBgNZMmbegjdgRo/pcb4tSzLhWAYk5C5IY5oQeiWFkp7YteTMJbcjE/+NkuVLM9oqCMzk7U9M8WcgwaoMX54NhiKAKC+88rMz/q+6vZ+kMndA7a3bgYo7wm98VC5ri5dKak9zwPFmo4N9ReeldUZlEMC3n+NEsxma66QhQ/bFqu7wDYDx7lciR8Z4wMa400FqlEU3BM+N7csEXmu+sR+zVGwqm/N67ePMQiYkmzfo0G9grV8aExyAkX9lKHZcO83x515Qq1f41Sa+uMn7LWlau9fegljr30Ax+sAHI7oWa/daXF372qbDm7hsQU3OJ0Z7GALfFihmuZIF4wHFxOUOqNVz8pmP9AoOIam/DD1+XbkHsY67OA9jewfUodsxyEOh5ebKoYdcQFgwLwZWmuLpv3GFxBOjUDW5iabAHtMzDRchb2A0dIsved/tXOZ7X7zY1hoAE9G21+U7jnPztwe8mAeXr//Q7wdxyet0/ImmCwBvlE4Bw2VHPkdUoVPhq/S5ph9t7WAA7oi0qeegY/evxM6P+HE4hFgb3QC91bAlZg/Ha0TpfdZZvnq7ZTGnFS5dpnf3r6JvQWT7GE4lmfEvn6lVtQDVEA1xRAf/AMXIGfEuZZS0Lp/wae2QSkRPs2ZQTGjEeZcNMP0oVehK6IU/uKgZeJs35bMrJNXsX8hH7nOE0C9c5X1ypbsALvZnTOscm0I/aA6Yzms8M7ijKQWLEN6o1xgkNR7Swhry3s42bm2ap0Fw8Uxhw1f32PDeb8hrgla/ZtURM3eDnO2Fu5iPP1ZJ13+2+nJLlsnFug4EU7BMVOdNXvctsJKkGDsl7VhYiNRLjAebGqTWUMETQL0DPQGmYCWawGjR/TIb2xbi43qlky4rGVIm0WHH5ue6T9ttjaRBVNTpG0QOD3bwaQ6RFu0vAeo25kLevOL13J1MtXnNj+dNpVa4+1QpiglErAnl+DRVd3KQwlV+aQEevJwsmLS3xWyJ3+duVqko6jUcS/OuGrrggohcOofpg+3+i8TBMBN+/ByZsnnTLULaQPhGH2JxChkFZ3Gk0zYaXQhEqUOT5icbx/s4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b535490d-6fd1-477c-d2fa-08da85719d31 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 01:40:24.3776 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR01MB8966 Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/(dca|tta|pcm-bluray|pcm-dvd|wavpack)enc: Set pts+dur generically 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: thAs5YCNTkWE Signed-off-by: Andreas Rheinhardt --- libavcodec/dcaenc.c | 2 -- libavcodec/pcm-blurayenc.c | 2 -- libavcodec/pcm-dvdenc.c | 2 -- libavcodec/ttaenc.c | 2 -- libavcodec/wavpackenc.c | 2 -- 5 files changed, 10 deletions(-) diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 2481c4d3ec..1ecfbb39e4 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -1215,8 +1215,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, flush_put_bits(&c->pb); memset(put_bits_ptr(&c->pb), 0, put_bytes_left(&c->pb, 0)); - avpkt->pts = frame->pts; - avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); *got_packet_ptr = 1; return 0; } diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index 6a5cdb2dcd..4591ba3322 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -266,8 +266,6 @@ static int pcm_bluray_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return AVERROR_BUG; } - avpkt->pts = frame->pts; - avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); *got_packet_ptr = 1; return 0; diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index a7023d148f..e3104d6e12 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -167,8 +167,6 @@ static int pcm_dvd_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, break; } - avpkt->pts = frame->pts; - avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); *got_packet_ptr = 1; return 0; diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index 25113d4a72..9cc86b558e 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -188,9 +188,7 @@ pkt_alloc: put_bits32(&pb, av_crc(s->crc_table, UINT32_MAX, avpkt->data, out_bytes) ^ UINT32_MAX); flush_put_bits(&pb); - avpkt->pts = frame->pts; avpkt->size = out_bytes + 4; - avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); *got_packet_ptr = 1; return 0; } diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index 7f7ed804ee..d980fdd430 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2905,9 +2905,7 @@ static int wavpack_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } s->sample_index += frame->nb_samples; - avpkt->pts = frame->pts; avpkt->size = buf - avpkt->data; - avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); *got_packet_ptr = 1; return 0; }