From patchwork Wed Nov 21 18:34:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 11110 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3AA3744C4B6 for ; Wed, 21 Nov 2018 20:35:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB9FD689EE3; Wed, 21 Nov 2018 20:35:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDED9680CC0 for ; Wed, 21 Nov 2018 20:35:31 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id v6so6734458wrr.12 for ; Wed, 21 Nov 2018 10:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1CNOhOdjV0dT2dF7UOqho/4bo56Hpu8cQEZCuoOO26E=; b=jcTnxxtWwp3HMmqOuIZFqVt6OT4D403ASrc5uYwsfU+BUw/D+THz4fTduZNybf3AiT v88835Ehe3++as5KqaIBSkA/ClaH2VZu48Xtx2S6YEJD68PfZ/xu63tnESYoCYEfiD4S SC7vDmVzutAH1nLC2A0uj1xaAFJpUjdTaO1j+frZkPym6yRGuvb+37FDEv8LX+sD1PJE NzHtNNhElPR5bWWCKMblnKXHu5IrQmKsAOzURUWeEnC7P4nE+ab30PU6dCU7sksVUrKg q86SGtWxrzVziWS3KHt0Q9JrfWXI7FYm8tdLhSHNOn2pMUS4wTPWLCcO54z2YPM3LTrt U8DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1CNOhOdjV0dT2dF7UOqho/4bo56Hpu8cQEZCuoOO26E=; b=XI0H6SVmlOggARqkDGC7zXwhJ7fNkcmQlAUHdTDHFtVS3qLh0mwo293WE3N2DTgtdP cxBsFUdN6DibnkhbCYVOfx23uof1Zs6uoX+gsX+gtQfGX4cLUCuA3rvRtsXxWujEb5tO 8o5lBA86cGVc5zTQm2CvVI7QiMVpD3Hrt1agANsFwK8Xj+7tqD+Crrsw6lM09ZKKnuz4 6OO1F2dHRbvMCWMDCSpWrow++nB9xk509DQ0BkZzKI7l+ccVyjRIq8/AlHU1YbwxxCzL zu5C5LjbwmcfHpDyUEVPdUr/DVZ1/AuzuQHo9NmKlMp/o7CCB8iCIwhw9dZon3FCVWMk U9fg== X-Gm-Message-State: AA+aEWYnr8JRHdJ2J28UN8Vn5J4qKIjI8RoJQZAU6vf2xNE2CN6H/UBa m1mPusYTiylhe1dDmHUqfifTxIpR X-Google-Smtp-Source: AFSGD/XCkFyq01ScU8YZS6wnMq+kSs9lwiOT6C8LtCzXq75b1O43AU9+U85qTX6SRspMSA85+nIL1w== X-Received: by 2002:adf:e983:: with SMTP id h3mr3353112wrm.232.1542825333886; Wed, 21 Nov 2018 10:35:33 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id e66-v6sm2585115wmf.40.2018.11.21.10.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 10:35:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Nov 2018 19:34:29 +0100 Message-Id: <20181121183431.6404-2-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121183431.6404-1-andreas.rheinhardt@googlemail.com> References: <20181121183431.6404-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] cbs_h2645: Avoid memcpy when splitting fragment X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Now memcpy is avoided for NAL units that don't contain 0x03 escape characters. Improves performance of cbs_h2645_fragment_add_nals from 36940 decicycles to 6364 decicycles based on 8 runs with a 5.1 Mb/s H.264 sample (262144 runs each). Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h2645.c | 29 +++++++++++++++++------------ libavcodec/h2645_parse.h | 5 +++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index a2d0170e97..6846cad0bb 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -532,24 +532,29 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx, for (i = 0; i < packet->nb_nals; i++) { const H2645NAL *nal = &packet->nals[i]; size_t size = nal->size; - uint8_t *data; - // Remove trailing zeroes. while (size > 0 && nal->data[size - 1] == 0) --size; av_assert0(size > 0); - data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!data) - return AVERROR(ENOMEM); - memcpy(data, nal->data, size); - memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + if (nal->data == nal->raw_data) { + err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type, + (uint8_t*)nal->data, size, frag->data_ref); + if (err < 0) + return err; + } else { + uint8_t *data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!data) + return AVERROR(ENOMEM); + memcpy(data, nal->data, size); + memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type, - data, size, NULL); - if (err < 0) { - av_freep(&data); - return err; + err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type, + data, size, NULL); + if (err < 0) { + av_freep(&data); + return err; + } } } diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 2e29ad26cb..a0a5ca5868 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -86,6 +86,11 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, H2645RBSP *rbsp, /** * Split an input packet into NAL units. + * If data == raw_data holds true for a NAL unit of the returned pkt, then + * said NAL unit does not contain any emulation_prevention_three_byte and + * the data is contained in the input buffer pointed to by buf. + * Otherwise, the unescaped data is part of the rbsp_buffer described by the + * packet's H2645RBSP. */ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, void *logctx, int is_nalff, int nal_length_size,