From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7150E45920 for ; Mon, 27 Mar 2023 20:11:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8A068CBA0; Mon, 27 Mar 2023 23:11:23 +0300 (EEST) 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-Google-Smtp-Source: AK7set/BCrQHKtaiaZtfF8qshQlqSHbv5qxTmmuXlph08J65I5Tk5bW4wNUsH2CT2/w1pWFRANq5EA== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 -- 2.40.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".