From patchwork Mon Mar 27 20:09:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp1612314pzh; Mon, 27 Mar 2023 13:11:27 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpK5BJA+VMsQfDlwc/Qyz1dxZtH0zeLTYLopxo1pPsMYGRxc8ScyoEZ/ASEXs/aegCQD8A X-Received: by 2002:a17:907:8a8e:b0:944:49ee:aea2 with SMTP id sf14-20020a1709078a8e00b0094449eeaea2mr7053905ejc.71.1679947886799; Mon, 27 Mar 2023 13:11:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679947886; cv=none; d=google.com; s=arc-20160816; b=Wd4FmIl1mnQ2YzRISWqz5cir7LwspWffT1ymM3yjq1dzpW4V6acgzTJQLJ0aRm/3++ 4vUXFcUAtsg1FqD9jONYJP0ep5Wgzq2KwBGkfEMwPeHCHZtOpeTezo/2oCa5cSzgHO/Q rMDbrKfudKeDhYpQt9erhPs323nmszBIM2JdgC7pmY4E50BbFlmHKCKAlAVU2QaA0wog QaNyp6bZpQU6mbS5UM4fJNVqaIAcazrbtXAFQBkx9lZ+DVsz2riemgf+6CgScCDC3hJs wQocUuU7vghbTXKjKHEj22bJ7u4a0YGaj0vKVQi/E7i3w+4J4E7OktwdWiRJx+IHqvgq s7Pg== 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=3XDJrvv1u14aPRWAkya0vqOUSdeEy/xSC601xgs03rY=; b=FbATEXapoc0LsxgEAaGknb4a6u7DTTa8Qh8gXvZPr6BY9CAM2tawVGw69/fx3zY2Cc taOJOJHr1t5n4Wi7NPPaznCRVPFQk4TGMOis/Fu4xA+Rzrip7HJJYforeMObPj/aq8Bb /5ufu+qRNTCCV+jM25xAEOjyAhoLyDHo7Gii+goSQseJ+w3Jhz+GSY4DQzNwOekSDXLG RHDK5WkB722luWMM0W8mzuNc2ecGmZjahfgB8jv+4s5lp+TcgyGWR1440PSq8aANb7/R nxX/aPK0CoHNBI5+dj/X8xxw3YaKa6HYcnYfJukEpM6Jf5/REKpWigr+Gy8ZKBTtkq43 ZWdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Fv9txqrF; 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 i15-20020a170906114f00b0093144fbd1ecsi24711845eja.336.2023.03.27.13.11.26; Mon, 27 Mar 2023 13:11:26 -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=20210112 header.b=Fv9txqrF; 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 5665368CB08; Mon, 27 Mar 2023 23:11:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AEDB68CB0C for ; Mon, 27 Mar 2023 23:11:16 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id bk5so7324245oib.6 for ; Mon, 27 Mar 2023 13:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679947874; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ectNLppOD1QKMNp+VpZDfyA9J/eIOEfOuoQFhytZCSk=; b=Fv9txqrFvUdB9YIaH0BIUhoM37xIJrfM6pqqnOT7swQYiglIF4qBixq6HS8IubpB/P G3qKb0Z1Qr/5FXbM2AHJq2yk8ADjWBhSbYa8uFwZ7g3Ctg1fDkMm3YBvA0/gE10cMMtg 2t0vzgQO1m+WOFbtmdX1vkFZl6LbNl9B1M54O+8Z1pKQhlvIw3jjVkmMLk/HBrH7z0mY jFweT4+69NYcKwfsid/8zYGmuNJBYZFCSsENqxqr+flOpON5M1wwP7OjVM9PVCIISu5N efOfHNup3GXcSeFsKXyLRopmH7RKbGhNXVHKty1upKPAIBvYh9d84jtcU0QmulWsaVl4 F2/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679947874; 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=ectNLppOD1QKMNp+VpZDfyA9J/eIOEfOuoQFhytZCSk=; b=GrkUPkijdmFQLouRH1ZKMP2XoHVw6Vkd6+XBQJLa3tpEMX7WOomZDfmlYv1AKkl+PH cy0zK3MmxWgghLUA7H8UmlBaLIie8roxOkVLiuOma3kReYNtDJaeoberXj9A0TOQMuuV a+y4gqucndna7svAu2md8I1JsO+nMMrwwVeynjU/55wWIEMuOjy/jmeIdYARm9C5mH6F F967V0rdfV8wIPr92k+KqAWVVZD5+BWZEt0toEkDDhBqoGDfgdS1C9lPJzIqFshtyE17 nXkoOmFZtd6GuqXl62Un7dXGOjziM0qzgyjkE1UzKQoUyuBHmc+hAameFRs2KXavGAXU O3ig== X-Gm-Message-State: AO0yUKWE3ECGV2ptwOU608a+K+g/bMu2IqtTif43oF4qa1KgreSgneC1 g1TGf/tY+KJq+aVdu/iTakv6KVUSYUg= X-Received: by 2002:a05:6808:1981:b0:378:a144:f7ad with SMTP id bj1-20020a056808198100b00378a144f7admr8892233oib.17.1679947873732; Mon, 27 Mar 2023 13:11:13 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o15-20020a05680803cf00b003875e29808esm5031900oie.0.2023.03.27.13.11.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 13:11:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2023 17:09:55 -0300 Message-Id: <20230327200956.2138-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx264: add a flush callback 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: Zcab3rPwmbUc Signed-off-by: James Almer --- libavcodec/libx264.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 92828fabc3..72c3b6cedc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -178,8 +178,8 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, memcpy(p, x4->sei, x4->sei_size); p += x4->sei_size; size -= x4->sei_size; - x4->sei_size = 0; - av_freep(&x4->sei); + /* Keep the value around in case of flush */ + x4->sei_size = -x4->sei_size; } /* x264 guarantees the payloads of the NALs @@ -648,6 +648,24 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } +static void X264_flush(AVCodecContext *avctx) +{ + X264Context *x4 = avctx->priv_data; + x264_nal_t *nal; + int nnal, ret; + x264_picture_t pic_out = {0}; + + do { + ret = x264_encoder_encode(x4->enc, &nal, &nnal, NULL, &pic_out); + } while (ret > 0 && x264_encoder_delayed_frames(x4->enc)); + + for (int i = 0; i < x4->nb_reordered_opaque; i++) + opaque_uninit(&x4->reordered_opaque[i]); + + if (x4->sei_size < 0) + x4->sei_size = -x4->sei_size; +} + static av_cold int X264_close(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; @@ -1335,12 +1353,14 @@ FFCodec ff_libx264_encoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE | + AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_ENCODER_RECON_FRAME, .p.priv_class = &x264_class, .p.wrapper_name = "libx264", .priv_data_size = sizeof(X264Context), .init = X264_init, FF_CODEC_ENCODE_CB(X264_frame), + .flush = X264_flush, .close = X264_close, .defaults = x264_defaults, #if X264_BUILD < 153 From patchwork Mon Mar 27 20:09:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp1612421pzh; Mon, 27 Mar 2023 13:11:36 -0700 (PDT) X-Google-Smtp-Source: AKy350a+qgaYucNdBO+q+5VfuXZeBHowaXsa7N0x/lfP57SZ0QHsj3XJzG3HTfeNH+YYF95uCFZK X-Received: by 2002:a05:6402:1012:b0:4fb:7ccf:3b33 with SMTP id c18-20020a056402101200b004fb7ccf3b33mr12687646edu.31.1679947896611; Mon, 27 Mar 2023 13:11:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679947896; cv=none; d=google.com; s=arc-20160816; b=hV/Iux9NCxUtjO/Q/mytuAPykLQJlDiVjm7zvdd6Xk3JtXe/A9l2DdedqzFouq6vP9 +g2zWfjuCMBl4Kassydn8glGE6t39NmUbNRHoiT2Dl/CiegDkjMGy1s4PARShFRP24PW MEcl78O/hCLLBwtwZzi66QD3SHhMxz3UcBdEyOD9mHyuYxTzIfJLhfN8eVAIDYHmMza7 U+UI2HHKm+vM4sagBhM9+C3ZYbE4BrCxs1JdAa886wugqlVZm5W+fcTg8o9Y+K545wVV +fvTHraFfrqSRgoyQSUbuTj5WmuJm3qQLMqsxpmbkViu7lgQyQRfI4wLbatlfSqB7rrg lC9g== 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=wP6RUB+boNtE774XQ7UJxi9f0izWGMiYdXO7sttTf1U=; b=FEQGbWRVPj7sUxWoEH/dgPGNpnhePckFXAs9y669XiHDPm2ME3Uq1EMFh8NQ6QLsrb slkeYiybZiKdgpstn2oG/0jcvQmdfGQs74/4xIrrJHX4oRzLsW90vHL22VLUkz3RbLvD ZZSDzJLxKwEN3nA/6IyPpoxbNMSWs+xGRfWkk7FQRBJfYDo4E0qfyc16NWyWRY0XKZOi aFUAu8HahyOHeB2T20OinZeQo2ZVoZ9HT9qBTf4A7OP6tmNy+4J4JIHvIm7wIEygC7b7 /KegWUrj8hhYqouQzUlX6I0brDWTv/WnyB+vUcU/4JhJMRfLBMOxrm2ZeWOWHGk95Jgr VAJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aTiYOJmV; 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 u14-20020aa7d98e000000b005021f0d576dsi9566709eds.692.2023.03.27.13.11.34; Mon, 27 Mar 2023 13:11:36 -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=20210112 header.b=aTiYOJmV; 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 45B7E68CBAB; Mon, 27 Mar 2023 23:11:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5E1368CB0C for ; Mon, 27 Mar 2023 23:11:16 +0300 (EEST) Received: by mail-oi1-f179.google.com with SMTP id s8so7342017ois.2 for ; Mon, 27 Mar 2023 13:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679947875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RtmAw24bB89FrmZdSL1LmaOeKISce7+/veWkFhM0mEw=; b=aTiYOJmVcwjHbrjnm3smHjEo/YGsc+RE0Ye+HGd0HBxdi2OcxuSbLEU0tVb17Po1fz cpxRG5SY71mVzSLJ1sNsU0jo1pjXz+MxAzt4AMp0CJImIhXGTT8OFZBfUqVS5E0qGizN G/sSRtVSxy/P90Ycrrt2S1gREKORbd3MRd8B2vhMUK/P4oHtqiQC1Raarq1DYMYu1v4g 8B2fi6Bq+g/Y6+uU8avXXA/ufBvaYclvQqNVPDijmPEi7tiPj7ZZOymwYq2oqKl9PEEu NVbpyqhn9wEmmwfO19R8c2lNMN70PW+QyNySj6lkMLHeQt9alOK3upCrBXrVumcshhth H2rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679947875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RtmAw24bB89FrmZdSL1LmaOeKISce7+/veWkFhM0mEw=; b=KFSODsapxMWxWXi8cvIgtn5oz6VM0+hC9pg7fbDS4uMfpEfDbbv0UOLo/iOE0xezh5 s0baTLDotDuBoR4h32GwX91mapZPAi9TnWIKrvNm9Su8aZhvdCsQa0+TL1oRxWQ1vyn3 8uqIzVV2ubxrGbqyFLk5IqY5kl5q05e21ti+62uFaUgQIh0I37IvR/SsZGwYvRKC5gb3 2iRnJq9Zoz7s6Uu+G5gTrwDeNu51VTQtmapaCvA6Or+DddBX+WXilboeTbZAUzu2z42Q ZrvVQ6yQiA3wfVbtL7OGIt4ZqUhIzXm7FitU2ZRU1h0biQ1rviW30rUHu3R8ePGY+QY5 wjpw== X-Gm-Message-State: AO0yUKVOtlbMBTY/8niZtzb6x7L7DuokzQ/FsObX91obDDQqzYN+wlbg o5eu1uiIT6lt6dhX7vgyEBE7/osaacw= X-Received: by 2002:aca:1713:0:b0:386:ee44:e47 with SMTP id j19-20020aca1713000000b00386ee440e47mr6575570oii.43.1679947875311; Mon, 27 Mar 2023 13:11:15 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o15-20020a05680803cf00b003875e29808esm5031900oie.0.2023.03.27.13.11.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 13:11:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Mar 2023 17:09:56 -0300 Message-Id: <20230327200956.2138-2-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230327200956.2138-1-jamrial@gmail.com> References: <20230327200956.2138-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libfdk-aaceenc: add a flush callback 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: t/3A14zcn5ML Signed-off-by: James Almer --- libavcodec/libfdk-aacenc.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index eb97e0fb41..6d6462d951 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -132,6 +132,44 @@ static int aac_encode_close(AVCodecContext *avctx) return 0; } +static void aac_encode_flush(AVCodecContext *avctx) +{ + AACContext *s = avctx->priv_data; + AACENC_BufDesc in_buf = { 0 }, out_buf = { 0 }; + AACENC_InArgs in_args = { 0 }; + AACENC_OutArgs out_args; + int64_t pts, duration; + uint8_t dummy_in[1], dummy_out[1]; + int in_buffer_identifiers[] = { IN_AUDIO_DATA, IN_METADATA_SETUP }; + int in_buffer_element_sizes[] = { 2, sizeof(AACENC_MetaData) }; + int in_buffer_sizes[] = { 0, sizeof(s->metaDataSetup) }; + int out_buffer_identifier = OUT_BITSTREAM_DATA; + int out_buffer_size = sizeof(dummy_out), out_buffer_element_size = 1; + void* inBuffer[] = { dummy_in, &s->metaDataSetup }; + void *out_ptr = dummy_out; + AACENC_ERROR err; + + ff_af_queue_remove(&s->afq, s->afq.frame_count, &pts, &duration); + + in_buf.bufs = (void **)inBuffer; + in_buf.numBufs = s->metadata_mode == 0 ? 1 : 2; + in_buf.bufferIdentifiers = in_buffer_identifiers; + in_buf.bufSizes = in_buffer_sizes; + in_buf.bufElSizes = in_buffer_element_sizes; + + out_buf.numBufs = 1; + out_buf.bufs = &out_ptr; + out_buf.bufferIdentifiers = &out_buffer_identifier; + out_buf.bufSizes = &out_buffer_size; + out_buf.bufElSizes = &out_buffer_element_size; + + err = aacEncEncode(s->handle, &in_buf, &out_buf, &in_args, &out_args); + if (err != AACENC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unexpected error while flushing: %s\n", + aac_get_error(err)); + } +} + static av_cold int aac_encode_init(AVCodecContext *avctx) { AACContext *s = avctx->priv_data; @@ -561,11 +599,13 @@ const FFCodec ff_libfdk_aac_encoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_SMALL_LAST_FRAME, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AACContext), .init = aac_encode_init, FF_CODEC_ENCODE_CB(aac_encode_frame), + .flush = aac_encode_flush, .close = aac_encode_close, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },