From patchwork Wed Aug 24 22:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2784931pzh; Wed, 24 Aug 2022 15:52:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR4zitz2O289DVYtsuL3XwnPhqaObw4BZy9TnBSdG/vmDf4eVj97sH7KmOF5aisusEPguT3K X-Received: by 2002:a17:907:6297:b0:72f:9aad:fcb with SMTP id nd23-20020a170907629700b0072f9aad0fcbmr680650ejc.161.1661381556902; Wed, 24 Aug 2022 15:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661381556; cv=none; d=google.com; s=arc-20160816; b=VlZiomJGESB3G6uQsX4htk31z+G/qHhJHJCNQSimVw1ezwSaxyctLn8Fcysgi7dJs/ bTqB7UZEIO1ODPtNf6/YY424NCXaE6ycCjin8YFVj66tdytGtY8KP0jGkayg7JjBmaTw SCD6Od08TTMhBUFJbIyTMXaQDGRKxmb0iLVm2/TyyjL5aNQ+3CWyxtu+AxcODFpwcI5k VDkJVfbqvfj/fZJN6xJ5tWamb+Bf56H63Vv6Ch8PBjtkE0ufliqxcEAAqkdIlF22hedw v6QNsJuXoxx53zWjtjoBAfdG6GC7aDXhgQ4sR7Kf56qpXU1d4Evm5QGaOYrJNpFmL1tA VNTg== 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=gmTIYdMkPOXbNYlfBCFdLcAnwmeXP6XSXkzsBJoJvrM=; b=1BCA36498wUY6iCyhve6Y4SrdF1YYBzZMNA4KfBUA+cf+3FEAWqqb0peS6qrGs052s 7Z+jiQSkLKW2ouYKV7ZAESONs/6sUnzbfh6m2FMg2ucJsij8vVFOcb9qZ0DHjIfIaClE yjQg63rnB3xcthxlfE8Bkf0T8+C/pCUB/5rZpcFsbS8D7KdTXrn++6Xvccmw69oUo2pz 5aTTqtWHjMyXJt8FyZHKw7y6q3SGFafXXwfhqoI8Ee+3puVke+blzoKuZv43OJKDDJhZ hwPhD41k9qt7aFa52CSVw1LV+f9Ymn1LhsVXijO1i8OtehFUZ+UxXioXdi/Rh4FbVo3T LljQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MYoRCxl1; 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 yr19-20020a170907335300b0072b12db5f1csi2650424ejb.451.2022.08.24.15.52.34; Wed, 24 Aug 2022 15:52: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=MYoRCxl1; 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 7B33068B98B; Thu, 25 Aug 2022 01:52:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 066B968B3B2 for ; Thu, 25 Aug 2022 01:52:25 +0300 (EEST) Received: by mail-ot1-f44.google.com with SMTP id l5-20020a05683004a500b0063707ff8244so12749970otd.12 for ; Wed, 24 Aug 2022 15:52:24 -0700 (PDT) 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; bh=WCWetO3Lz+lnLksXKXlX6ite4aI4+wFsOE85m5Z1lUw=; b=MYoRCxl1u8OFvaATzG/nKGTfcPRlgB0sZUX3iH3ZeNsuim5OWhf/COPNPD137CYGMX uuLt3qBrXkARtYIGtA0C3sA0mSmnMFzciCsOSu/4nVxEVH3cAYEH8cTUU9WUO8T+U1qt FMRiUgiFq+uhYva+/cDCo7DiG4cKkmzF3Ep4CXstChglANegxCxOxT/pBd7zOeN38vwq Jekc5muTwQu6CTv4LXuzWjonxB0o6SrYfIxNppam3s0fQvTiFCw+WJzgTZyd7rm/fTq7 ZJmuv9c3XEQn8doVPXmsQd1GVxc7+U5uPuPCQRqYzawJJHtsii+bIZ4SZ/6moGAYZltC mfJg== 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; bh=WCWetO3Lz+lnLksXKXlX6ite4aI4+wFsOE85m5Z1lUw=; b=iLz94LV6jeZhj0LQe5oqZ3mPH8s5c/j85ek/Y1cxmDUyYeyvBbzhhhoIUZ5RhkVHd8 2q0o3OEG4kON+DOYDRq/cIjnAy88yKghf3q/1z74HwL0h7loyVM8Lde79cpwfrv8+QEW 5BrHg1yZNT9XlGjOkKRIP71YpxZysXcp3B/g0vLqUOeO3nT3rRZOOcy6yKb8iaGG1qYg +I8Ze8DbqDZBwhQTsmyM/Njs8K7pKVCZiObZ3CnAbsmfeJgOYh5fp++JIN2Hk5+hLog5 +QGIa3p/QiEEoo/JZy7jPV31tLSdYCrQM0yauK6ngfbLbexCZvfuzKtIk829zFfzPSvG oqxw== X-Gm-Message-State: ACgBeo31xahFqiEJjhe5oL6HGDZ1Kbm6mY3c79BC3kL61ZLS3h/N4rd4 2sY1GHNewjOkTQ0VXIoINc7iQF9ivo0= X-Received: by 2002:a9d:6314:0:b0:614:d56f:c7a with SMTP id q20-20020a9d6314000000b00614d56f0c7amr352962otk.281.1661381542688; Wed, 24 Aug 2022 15:52:22 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id 37-20020a9d0c28000000b00636c81d4109sm4876850otr.46.2022.08.24.15.52.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 15:52:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 19:52:09 -0300 Message-Id: <20220824225209.4076-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libaomenc: remove one memcpy when queueing packets 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: vIcXBGNBXd3T Don't use an intermediary buffer. Achieve this by replacing FrameListData with a PacketList, and by allocating and populating every packet's payload before inserting them into the list. Signed-off-by: James Almer --- libavcodec/libaomenc.c | 195 +++++++++++++++-------------------------- 1 file changed, 70 insertions(+), 125 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 485f554165..f9476b3ddf 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -38,6 +38,7 @@ #include "av1.h" #include "avcodec.h" +#include "bytestream.h" #include "bsf.h" #include "codec_internal.h" #include "encode.h" @@ -46,24 +47,6 @@ #include "packet_internal.h" #include "profiles.h" -/* - * Portion of struct aom_codec_cx_pkt from aom_encoder.h. - * One encoded frame returned from the library. - */ -struct FrameListData { - void *buf; /**< compressed data buffer */ - size_t sz; /**< length of compressed data */ - int64_t pts; /**< time stamp to show frame - (in timebase units) */ - unsigned long duration; /**< duration to show frame - (in timebase units) */ - uint32_t flags; /**< flags for this frame */ - uint64_t sse[4]; - int have_sse; /**< true if we have pending sse[] */ - uint64_t frame_number; - struct FrameListData *next; -}; - typedef struct AOMEncoderContext { AVClass *class; AVBSFContext *bsf; @@ -71,7 +54,8 @@ typedef struct AOMEncoderContext { struct aom_image rawimg; struct aom_fixed_buf twopass_stats; unsigned twopass_stats_size; - struct FrameListData *coded_frame_list; + PacketList coded_frame_list; + AVPacket *pkt; int cpu_used; int auto_alt_ref; int arnr_max_frames; @@ -283,33 +267,6 @@ static av_cold void dump_enc_cfg(AVCodecContext *avctx, av_log(avctx, level, "\n"); } -static void coded_frame_add(void *list, struct FrameListData *cx_frame) -{ - struct FrameListData **p = list; - - while (*p) - p = &(*p)->next; - *p = cx_frame; - cx_frame->next = NULL; -} - -static av_cold void free_coded_frame(struct FrameListData *cx_frame) -{ - av_freep(&cx_frame->buf); - av_freep(&cx_frame); -} - -static av_cold void free_frame_list(struct FrameListData *list) -{ - struct FrameListData *p = list; - - while (p) { - list = list->next; - free_coded_frame(p); - p = list; - } -} - static av_cold int codecctl_int(AVCodecContext *avctx, #ifdef UENUM1BYTE aome_enc_control_id id, @@ -432,7 +389,8 @@ static av_cold int aom_free(AVCodecContext *avctx) aom_codec_destroy(&ctx->encoder); av_freep(&ctx->twopass_stats.buf); av_freep(&avctx->stats_out); - free_frame_list(ctx->coded_frame_list); + avpriv_packet_list_free(&ctx->coded_frame_list); + av_packet_free(&ctx->pkt); av_bsf_free(&ctx->bsf); return 0; } @@ -1042,6 +1000,10 @@ static av_cold int aom_init(AVCodecContext *avctx, return ret; } + ctx->pkt = av_packet_alloc(); + if (!ctx->pkt) + return AVERROR(ENOMEM); + if (enccfg.rc_end_usage == AOM_CBR || enccfg.g_pass != AOM_RC_ONE_PASS) { cpb_props->max_bitrate = avctx->rc_max_rate; @@ -1053,25 +1015,40 @@ static av_cold int aom_init(AVCodecContext *avctx, return 0; } -static inline void cx_pktcpy(AOMContext *ctx, - struct FrameListData *dst, +static inline int cx_pktcpy(AVCodecContext *avctx, + AVPacket *dst, const struct aom_codec_cx_pkt *src) { - dst->pts = src->data.frame.pts; - dst->duration = src->data.frame.duration; - dst->flags = src->data.frame.flags; - dst->sz = src->data.frame.sz; - dst->buf = src->data.frame.buf; + AOMContext *ctx = avctx->priv_data; + int av_unused pict_type; + int ret; + + av_packet_unref(dst); + ret = ff_get_encode_buffer(avctx, dst, src->data.frame.sz, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, + "Error getting output packet of size %"SIZE_SPECIFIER".\n", src->data.frame.sz); + return ret; + } + memcpy(dst->data, src->data.frame.buf, src->data.frame.sz); + dst->pts = dst->dts = src->data.frame.pts; + + if (src->data.frame.flags & AOM_FRAME_IS_KEY) { + dst->flags |= AV_PKT_FLAG_KEY; #ifdef AOM_FRAME_IS_INTRAONLY - dst->frame_number = ++ctx->frame_number; - dst->have_sse = ctx->have_sse; + pict_type = AV_PICTURE_TYPE_I; + } else if (src->data.frame.flags & AOM_FRAME_IS_INTRAONLY) { + pict_type = AV_PICTURE_TYPE_I; + } else { + pict_type = AV_PICTURE_TYPE_P; + } + if (ctx->have_sse) { - /* associate last-seen SSE to the frame. */ - /* Transfers ownership from ctx to dst. */ - memcpy(dst->sse, ctx->sse, sizeof(dst->sse)); + ff_side_data_set_encoder_stats(dst, 0, ctx->sse + 1, 3, pict_type); ctx->have_sse = 0; - } #endif + } + return 0; } /** @@ -1081,50 +1058,32 @@ static inline void cx_pktcpy(AOMContext *ctx, * @return packet data size on success * @return a negative AVERROR on error */ -static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, - AVPacket *pkt) +static int storeframe(AVCodecContext *avctx, AVPacket *dst, AVPacket *src) { AOMContext *ctx = avctx->priv_data; - int av_unused pict_type; - int ret = ff_get_encode_buffer(avctx, pkt, cx_frame->sz, 0); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, - "Error getting output packet of size %"SIZE_SPECIFIER".\n", cx_frame->sz); - return ret; - } - memcpy(pkt->data, cx_frame->buf, pkt->size); - pkt->pts = pkt->dts = cx_frame->pts; + const uint8_t *sd; + size_t size; + int ret; - if (!!(cx_frame->flags & AOM_FRAME_IS_KEY)) { - pkt->flags |= AV_PKT_FLAG_KEY; -#ifdef AOM_FRAME_IS_INTRAONLY - pict_type = AV_PICTURE_TYPE_I; - } else if (cx_frame->flags & AOM_FRAME_IS_INTRAONLY) { - pict_type = AV_PICTURE_TYPE_I; - } else { - pict_type = AV_PICTURE_TYPE_P; - } - - ff_side_data_set_encoder_stats(pkt, 0, cx_frame->sse + 1, - cx_frame->have_sse ? 3 : 0, pict_type); + av_packet_move_ref(dst, src); - if (cx_frame->have_sse) { + sd = av_packet_get_side_data(dst, AV_PKT_DATA_QUALITY_STATS, &size); + if (sd && size >= 4 + 4 + 8 * 3) { int i; + sd += 4 + 4; for (i = 0; i < 3; ++i) { - avctx->error[i] += cx_frame->sse[i + 1]; + avctx->error[i] += bytestream_get_le64(&sd); } - cx_frame->have_sse = 0; -#endif } if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - ret = av_bsf_send_packet(ctx->bsf, pkt); + ret = av_bsf_send_packet(ctx->bsf, dst); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "extract_extradata filter " "failed to send input packet\n"); return ret; } - ret = av_bsf_receive_packet(ctx->bsf, pkt); + ret = av_bsf_receive_packet(ctx->bsf, dst); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "extract_extradata filter " @@ -1132,7 +1091,7 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, return ret; } } - return pkt->size; + return dst->size; } /** @@ -1148,16 +1107,14 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out) AOMContext *ctx = avctx->priv_data; const struct aom_codec_cx_pkt *pkt; const void *iter = NULL; - int size = 0; + int ret, size = 0; - if (ctx->coded_frame_list) { - struct FrameListData *cx_frame = ctx->coded_frame_list; + if (!avpriv_packet_list_get(&ctx->coded_frame_list, ctx->pkt)) { /* return the leading frame if we've already begun queueing */ - size = storeframe(avctx, cx_frame, pkt_out); - if (size < 0) - return size; - ctx->coded_frame_list = cx_frame->next; - free_coded_frame(cx_frame); + ret = storeframe(avctx, pkt_out, ctx->pkt); + if (ret < 0) + goto fail; + size = ret; } /* consume all available output from the encoder before returning. buffers @@ -1165,37 +1122,21 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out) while ((pkt = aom_codec_get_cx_data(&ctx->encoder, &iter))) { switch (pkt->kind) { case AOM_CODEC_CX_FRAME_PKT: + ret = cx_pktcpy(avctx, ctx->pkt, pkt); + if (ret < 0) + goto fail; if (!size) { - struct FrameListData cx_frame; - /* avoid storing the frame when the list is empty and we haven't yet * provided a frame for output */ - av_assert0(!ctx->coded_frame_list); - cx_pktcpy(ctx, &cx_frame, pkt); - size = storeframe(avctx, &cx_frame, pkt_out); - if (size < 0) - return size; + av_assert0(!ctx->coded_frame_list.head); + ret = storeframe(avctx, pkt_out, ctx->pkt); + if (ret < 0) + goto fail; + size = ret; } else { - struct FrameListData *cx_frame = - av_malloc(sizeof(struct FrameListData)); - - if (!cx_frame) { - av_log(avctx, AV_LOG_ERROR, - "Frame queue element alloc failed\n"); - return AVERROR(ENOMEM); - } - cx_pktcpy(ctx, cx_frame, pkt); - cx_frame->buf = av_malloc(cx_frame->sz); - - if (!cx_frame->buf) { - av_log(avctx, AV_LOG_ERROR, - "Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n", - cx_frame->sz); - av_freep(&cx_frame); - return AVERROR(ENOMEM); - } - memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz); - coded_frame_add(&ctx->coded_frame_list, cx_frame); + ret = avpriv_packet_list_put(&ctx->coded_frame_list, ctx->pkt, NULL, 0); + if (ret < 0) + goto fail; } break; case AOM_CODEC_STATS_PKT: @@ -1236,6 +1177,10 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out) } return size; +fail: + av_packet_unref(ctx->pkt); + av_packet_unref(pkt_out); + return ret; } static enum AVPixelFormat aomfmt_to_pixfmt(struct aom_image *img)