From patchwork Sun Dec 4 21:52:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2818269pzb; Sun, 4 Dec 2022 13:53:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf60Sg2PwwvtwQRcUoKrCN0jm5vi3baaiaRPqLcHAb1/wRdcXnMvP+k8JmGyNUm4q92B9dTP X-Received: by 2002:a17:906:b012:b0:7c0:9060:1580 with SMTP id v18-20020a170906b01200b007c090601580mr21528949ejy.655.1670190796755; Sun, 04 Dec 2022 13:53:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670190796; cv=none; d=google.com; s=arc-20160816; b=vLLvBBQaPgJDgPhdV42FeYMIu3FGoOYc39YT5QeBcWU3ux6/A9xHhbJuiweIefPGkR Qco9Ev+NT71IDhXwRTSEa3SaTpOobhEt8AYrLdVrcLDLDxQVPsO3UR71CDM5zvAS2RpZ yGRp61k5PD7FZ+2+Ql4b4oGCQqCY9oWxIVs8N6/SwY2U3JzlYDikBJHZswMy9kJfDrOn fu8k7McEtKGv3zvlr7p8SMvm7OGDVz85Jn7JhtmWhQ5tszKjgssDxjrR3xeEhls2XvQe DQ5dx8CzEamaKQ3dVHt0ChQ5FCEdvT7lWoPbMwj1+/mqGp+Bk5OBm5K1LFgNWEGm0dTV AYRg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=okqS2px6qfFbez7xoVnXOqQxusSGyeaH9IJnGpvnvY4=; b=QUo4GzimX+cj6vy4UeTfqvJRtM9QIjXgH6gbOxq+1InhWzIzxYhwHsDlzQ1qU1+Rj1 bVlbskb3I/E0JM063QWJRKUKhZT6LTexS68zWRrbjYMroRJny5hRqHkpVfSMFBbXcfV6 /VypzIy3LAzzgcVFpWWv02k4A9Qxk3soXIEoyICUyRLK3hNlMR18WSN+IuA4APGOl2be smZ3w390FXo/UxiAUQLHGVVq/qd79qZxF6pZygXyH8avI9QAQNLO8a6bGutCAHf0XCqY Hdai457WmMYY4ICyX4IqAS3asXRYlkOoUdCkS6DFnznS4squQQkgheEQFl7DNGxVxp38 El0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jelXgzpV; 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 cr13-20020a170906d54d00b0078d4962a32asi10759022ejc.961.2022.12.04.13.53.15; Sun, 04 Dec 2022 13:53:16 -0800 (PST) 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=20210112 header.b=jelXgzpV; 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 21FAD68BBA3; Sun, 4 Dec 2022 23:53:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9449168B315 for ; Sun, 4 Dec 2022 23:53:06 +0200 (EET) Received: by mail-oo1-f50.google.com with SMTP id j1-20020a4ad181000000b0049e6e8c13b4so1472045oor.1 for ; Sun, 04 Dec 2022 13:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=LJqYQ5q13SAEenbSGRJj1vSWvSJ/XbPzS5gaEIIfpb0=; b=jelXgzpVHMUwba5M0KynzbfZEQjwOYzmSETT3YrXyzFD5ApMSKWS9A/DKGXVtlT2ch odzkzR9UNQScNs65Rvr1kak8pYA4Zkg+WOBVfs6N1BoZnzEsY9yjKP/F4VjBXzGW8UnE bWW6LaOpcVbvrQxbWhznkA36GWkWG5MacZsdLkiyXIeq6Vxpi3U+xuoQ4nC7AD/Sx1GE AJB9Oxdd1yRVUIIQPFmkygYEPznBvJqoJG6W8+qyZejBqRhGPmarxjrNCm871mSVt5Uy m/fsnWGODpa5pEmvmdRRG9HPxjQiMyNg86B/Oa5c00CozVaO5ycc4bzCCaxZujouVTrb InBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LJqYQ5q13SAEenbSGRJj1vSWvSJ/XbPzS5gaEIIfpb0=; b=1Tt0deDBttn6EuPAqdGRS49/OXIfrpxKHvp1zaPitHO1cVU5tVk3sn0ig3tUn0qQ4X ONJeTqB3WT98O/L/NADGpuwh9r2y+Ve0hTJs8Pbhyz4ZBRxKrxLpnEg1YvsvluuDaom0 NvEDX20x4LmL8/ni1xViSU+8CsOw32TSELm1Y87sjkdC8LLM4hO0PzgkSrmtCRd6ravx tbckGRA2Z6PR4NkDtgiDgL7WKwY2sHJremGI7kKCrBV3Gk5tMrPbooZa2SmuUbmvAFU1 Sg7X4kzAgWqf5Jjz9P3ljOkep91+co6i3LxvOo1cKBiokwnE6dY84fngzPYp8phEp4D/ M/Tw== X-Gm-Message-State: ANoB5plZ3DydlyLLRGdNlgw0E6n64eAvetAKjqhCI+XTps3/GvAbVGYr /BsGtmLsa+pfZNNlZA4Kuv/yerK4dWI= X-Received: by 2002:a4a:378d:0:b0:4a0:9010:87a8 with SMTP id r135-20020a4a378d000000b004a0901087a8mr5430881oor.88.1670190784507; Sun, 04 Dec 2022 13:53:04 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id s16-20020a056830439000b0066c7733be43sm6823100otv.30.2022.12.04.13.53.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 13:53:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Dec 2022 18:52:23 -0300 Message-Id: <20221204215227.4186-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/binkaudio: clear pts when returning more than one frame per input packet 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: kWSjnV7FPZVa This will be needed for the following commit, after which ff_get_buffer() will stop setting frame->pts to AV_NOPTS_VALUE. Signed-off-by: James Almer --- libavcodec/binkaudio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 046bf93207..f28ecba760 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -296,9 +296,10 @@ static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame) { BinkAudioContext *s = avctx->priv_data; GetBitContext *gb = &s->gb; - int ret; + int new_pkt, ret; again: + new_pkt = !s->pkt->data; if (!s->pkt->data) { ret = ff_decode_get_packet(avctx, s->pkt); if (ret < 0) { @@ -325,6 +326,8 @@ again: frame->nb_samples = s->frame_len; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; + if (!new_pkt) + frame->pts = AV_NOPTS_VALUE; } if (decode_block(s, (float **)frame->extended_data,