From patchwork Fri Feb 24 23:14:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JonHGee X-Patchwork-Id: 40519 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1662784pzk; Fri, 24 Feb 2023 15:15:13 -0800 (PST) X-Google-Smtp-Source: AK7set9Y8l2jpIdDkXAjue0IKxw1Xd9Zg079uxbXVuaLnkSYjpr44/mXBOHqdKbFjba8KQ784SWl X-Received: by 2002:a17:906:2413:b0:86c:a3ed:1442 with SMTP id z19-20020a170906241300b0086ca3ed1442mr24594901eja.4.1677280513400; Fri, 24 Feb 2023 15:15:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677280513; cv=none; d=google.com; s=arc-20160816; b=K0+ogizs2nY3olgkaKK8Lyb0wQR2biW2PhYBJu6UP6uQcvzbezfRy13/NaB3GjyuWX hS/YiEBWM1NigDMBbXzYqw8oeXy2lIE4rHsHUzkk4YIaJVwmZGcpwYhSNZwDLC9+ey28 CbX7tzSnDXecyVEPnzkSSujSnQUFR5UfjuZL0oxaY5YFoAKAtU9UWmoL19JYLJzsPmsX WnxefoMWFqBmztvxhdResZrJvqeLGrlQjI3RC4NRsHfY21Lsy6MFRu3EAdRvKFrfvFo7 i3WC0BILCu5Y0M8lVQxn2wj/QzoeXDTsKtpbOJYEP2Xrb2+FIcDP1Q0PD2GsGBq/0rA6 jaNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=pX6XjRIE5GT565JXG9vTkjRXyZbX1KNLlBXHPOV05+k=; b=BeuTlaowuz3UlC7oq9VPDRHpoXfmMbWIlIkas4b5vbu2OItIAK40aWASNnQhlR/HUr 9wPQSdw5luNrzr9ruIB9Cefj9x+VBAcRuSFKFA1SJBvzLtMuXNpxN1JFDf7VuqHY/wao /b4fFwUBmLHNK5Zhr39kJoTxfVA290qNKu1EHV/d05hUyy7g56XCmSdsTMq7tBcvg8ub +0XIv/LU5NbRL5QRtIKRdFMuPrLR8CJgP8ZX8FBchIXiNEGH3bgesjXRYh14GD3I8SbX ojOe9oWv8qibdKHW7brLag9F7OGg/jACraGw+8EhaaKJJEJ0KxzW66bCbpQZ/5WpDxqV SAWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=A4fhzOc0; 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 t6-20020aa7d4c6000000b004ad0affbc61si682376edr.135.2023.02.24.15.15.12; Fri, 24 Feb 2023 15:15:13 -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=A4fhzOc0; 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 2412168BE8A; Sat, 25 Feb 2023 01:15:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3476068C060 for ; Sat, 25 Feb 2023 01:15:02 +0200 (EET) Received: by mail-pj1-f50.google.com with SMTP id q31-20020a17090a17a200b0023750b69614so776981pja.5 for ; Fri, 24 Feb 2023 15:15:02 -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:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ADvl1EHNKVO+m+kVkxbv7eR9MptZ+gprcGKePifR+oA=; b=A4fhzOc0ebXnGaVvUAOrVj5I9g/9jzaIAfwgA/GifnzjRjIXXqpq8C/LpKOzzIaN4O Nw3RXtaXD+Jj/j3VTOjhYLL/yyEgP0r7UAKgr2CXq0Rz8QuaRBjtt/b/Pug4zDy3xRr3 nUYvmRHG0UVrLej9RQFuzaMuD8kcjVbJvnx0qKcfJylSL1tyuCsbe30zl4GaStRXr3pW HZSVI/fk5T/1rnhJwl5mU091o6iq0RLlhqIZ1JzV1DuItgejja5lk3sbtnft04H7XGsU VSeSoVmy9mjSaURGfcYER8VTAvAU0QlwJrKVn/gcGaCZWNscTFK6mcJkZq9364lj0NCk kRTg== 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:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ADvl1EHNKVO+m+kVkxbv7eR9MptZ+gprcGKePifR+oA=; b=foIA1MxgRjPDvvqY1Fc/5g1x8stpsJGPwW0I6ZA43qDzsldEB7dbfXm0nAtY2/jnLq IBMV6CeTOEvcdOBuq/gqwi/yiT3xhoMMpLGtO/a5VNLVhIXF1W9H1RONSqNatjyWjb2b /gLCMo4VJIu4AiWD+dQBtmplE/UM7t7pZIJXbADFD++qxXUEWojaRs8KdbzdP23CzDer sGojPgi5MzVlDV4ZBa6On6AkScVb7GlI1p2QPhUU2WdKsA+W8qFS2IrYpcSv2iEPmgHR E6UtBO5bJNahvPBhs9eiKW8BLJkC8GoGa/spsPLx2mGXwvhwpImAhNFL6Iojn/FWl+km vdUA== X-Gm-Message-State: AO0yUKV2HtvMvD2E1lDFhBljFGzTaevUWOoqaDHaurknqw/2nRaj4ZgZ HGQINd0qvHtSY1KKABqxLLMdWxFui54= X-Received: by 2002:a05:6a20:3d24:b0:c1:2037:554f with SMTP id y36-20020a056a203d2400b000c12037554fmr20634413pzi.62.1677280499671; Fri, 24 Feb 2023 15:14:59 -0800 (PST) Received: from jongeegti.c.googlers.com.com (170.102.105.34.bc.googleusercontent.com. [34.105.102.170]) by smtp.gmail.com with ESMTPSA id n2-20020a62e502000000b005a8c92f7c27sm61742pff.212.2023.02.24.15.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 15:14:58 -0800 (PST) From: JonHGee X-Google-Original-From: JonHGee To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:14:40 +0000 Message-Id: <20230224231440.3107063-1-JonHGee@gmail.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/libfdk-aacnc: send encoder delay/padding in packet side data 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: JonHGee Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fHlL9pebOTSO --- libavcodec/libfdk-aacenc.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 54549de473..55d10990e4 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -21,6 +21,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avcodec.h" #include "audio_frame_queue.h" @@ -46,6 +47,7 @@ typedef struct AACContext { int latm; int header_period; int vbr; + int delay_sent; AudioFrameQueue afq; } AACContext; @@ -368,7 +370,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, int out_buffer_identifier = OUT_BITSTREAM_DATA; int out_buffer_size, out_buffer_element_size; void *in_ptr, *out_ptr; - int ret; + int ret, discard_padding; uint8_t dummy_buf[1]; AACENC_ERROR err; @@ -428,6 +430,29 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, &avpkt->duration); + discard_padding = avctx->frame_size - avpkt->duration; + // Check if subtraction resulted in an overflow + if ((discard_padding < avctx->frame_size) != (avpkt->duration > 0)) { + av_log(avctx, AV_LOG_ERROR, "discard padding overflow\n"); + av_packet_unref(avpkt); + av_free(avpkt); + return AVERROR(EINVAL); + } + if ((!s->delay_sent && avctx->initial_padding > 0) || discard_padding > 0) { + uint8_t *side_data = + av_packet_new_side_data(avpkt, AV_PKT_DATA_SKIP_SAMPLES, 10); + if (!side_data) { + av_packet_unref(avpkt); + av_free(avpkt); + return AVERROR(ENOMEM); + } + if (!s->delay_sent) { + AV_WL32(side_data, avctx->initial_padding); + s->delay_sent = 1; + } + AV_WL32(side_data + 4, discard_padding); + } + avpkt->size = out_args.numOutBytes; *got_packet_ptr = 1; return 0;