From patchwork Tue May 8 20:48:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8885 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4453993jad; Tue, 8 May 2018 13:55:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpMSPJgcCSrhGDw1/ejvrvLHlzEgR/VV/1GA5EfDxhqCmJXiKZSFWmlsHUhvTsDlcia7f0+ X-Received: by 2002:a1c:6d97:: with SMTP id b23-v6mr4249602wmi.86.1525812910929; Tue, 08 May 2018 13:55:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525812910; cv=none; d=google.com; s=arc-20160816; b=WltLMYf+vooHmKYFWnjfrnDniO/OQ2uec6ZPJiakTg27GIA2Q2l4sBUVvsKnyM1gWa A7dCDSOESM83q09vs/am6XW2AB58UWalUtD01AOpTWJyb76Rw+xJewmpJ3+vvLCux/Ic etKkkVWtDynnZARBTVU0NoXexMEFfcvCGp3t3TCA8xLJi0mEz1xkNUujjHvvsd8AeAvm ik+sAZ/WykrQ3489t5eGiD41Ufs/eGLijw2EJ4gKBMY8NqY1+4eDJ0Bp8aa/7G6Q6234 lue0wudouEJjxfXVzcdGKKJVJGJIC6/7h3jm+b7zYHgQjtXYIc8Fvr3ImG/aclasQTdq OEpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=DzikGhuioo56xOrsyxpHjMi9sOCGdVUBQi9dgVRlLug=; b=XaseJn+RrGMTicGela0uWSreZrEJRCSq1/95JEWNhdRFkfBVac77m60nTpVZU4Zw/E 3/ZVoz5QZdI4dQpESd/pFNrqyM19QUHe69zTpAGgYx5nvGDGvgrj9iYCSpaZQiTGWM2j grrwfxOu1hjRChKvJ2o3qPDk7RzgT4//Lx9LLE64Jfz8Nx9wCyAYlNzjaKwCaZojf7FX JzyLbL4ycjPNU2oy+sFKViCPaxPo33+66i3Mo2zehN2ncbdAm+JFDO9kQr68LymUvfew u6haTdxJ2R+Rm0LPVAEj8sTUssXpPypxG9OVMxvkdgUiDwAtVXlK/npKpVhE2OZXOTZ2 Ym7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OfOuTZ0n; 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 x66si7232451wme.21.2018.05.08.13.55.10; Tue, 08 May 2018 13:55:10 -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=20161025 header.b=OfOuTZ0n; 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 82F7C68975F; Tue, 8 May 2018 23:54:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65144689723 for ; Tue, 8 May 2018 23:54:25 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id l132so3136610qke.3 for ; Tue, 08 May 2018 13:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=9xEO0+yV8H6tMIjte1h8FfUW3LDYK3f0Ue/her0RrqU=; b=OfOuTZ0nWv79grRU/QIyw77ASlytNwZim0j2bNRAevcs/AfX4sbYPF9uRGq+NQs36K 0pNcpA81suLR7Rv3nodiht8y9sgKM0eAjN1yGx46/04uRq5pNMNaV5dIDGUi3Yru910c SCjUCbAM9ierIG96MjCNn/0XWpeF18NCgfulTmN1MnmrZmgYd+CGBNiAVU58yvauIKXu EguOo79sovNkrARwjhzZ4PLH1LWs7o9Jaw4vizPf4olTm84zcoIVqNviAkeSlwH4WFlz 8+EA2KLv2fMbDfnhWjRJKqdTk3GVw59Y+AOTvlB9Pj27biGKcAzt1mrFwqKwSoC3+734 uvOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=9xEO0+yV8H6tMIjte1h8FfUW3LDYK3f0Ue/her0RrqU=; b=lXGLTKni8dDz40YQaK7mAIOMb+8Og4z4D9YrFB4arGYiehmUceNpWf2CEi0VQjErU+ QcZIJdW8dYyH9/R/qwYjuIkg1TS02tjkdq3hJDnDv77TEkKb0eHphaaP5r033bCZTSsn aHPefZpwqmRk4yJ91UEvMrK+qqG/XaX5ecSIS29XmNWUE+XvLiAah1cuVhh4MdsVVqAA AzFQJbT9knsGIa+xK3sJIFAJqFFU6ayxvdvq6O9qcviVMzP7nLaNyoMsNqeMl5eYCE2j F8Om0oWpF4zUjNzpxgS1evKDb9Me8ZfM3RqJdSyTUC24fbH8wzYPcGrYpJ8bqu4Q7O+v zogA== X-Gm-Message-State: ALQs6tAt8ljnYlTyxMPiC4oVyCISXYXt93jvX9jQpmhHpn01uS178u7q LtJCGa63Duinfz56ipL7tNJp/g== X-Received: by 10.233.221.5 with SMTP id r5mr25290089qkf.70.1525812556490; Tue, 08 May 2018 13:49:16 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id q15sm6456568qkj.2.2018.05.08.13.49.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 13:49:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 May 2018 17:48:55 -0300 Message-Id: <20180508204856.10796-1-jamrial@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_h2645: use simple data buffers for some parameter set extensions 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There's no gain from using AVBufferRef for these, as no copies or references are ever made. Signed-off-by: James Almer --- There is however a raw copy of the struct storing these buffers, which is dangerous and fragile. This patch is in preparation to change how the above is handled. libavcodec/cbs_h264.h | 1 - libavcodec/cbs_h2645.c | 13 ++++++------- libavcodec/cbs_h265.h | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index 2219d9da8d..becea3adfe 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -197,7 +197,6 @@ typedef struct H264RawPPS { uint16_t pic_size_in_map_units_minus1; uint8_t *slice_group_id; - AVBufferRef *slice_group_id_ref; uint8_t num_ref_idx_l0_default_active_minus1; uint8_t num_ref_idx_l1_default_active_minus1; diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 64a1a2d1ee..580ca09f63 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -318,10 +318,9 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #define byte_alignment(rw) (get_bits_count(rw) % 8) #define allocate(name, size) do { \ - name ## _ref = av_buffer_allocz(size); \ - if (!name ## _ref) \ + name = av_mallocz(size); \ + if (!name) \ return AVERROR(ENOMEM); \ - name = name ## _ref->data; \ } while (0) #define FUNC(name) FUNC_H264(READWRITE, name) @@ -415,7 +414,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) static void cbs_h264_free_pps(void *unit, uint8_t *content) { H264RawPPS *pps = (H264RawPPS*)content; - av_buffer_unref(&pps->slice_group_id_ref); + av_free(pps->slice_group_id); av_freep(&content); } @@ -458,21 +457,21 @@ static void cbs_h264_free_slice(void *unit, uint8_t *content) static void cbs_h265_free_vps(void *unit, uint8_t *content) { H265RawVPS *vps = (H265RawVPS*)content; - av_buffer_unref(&vps->extension_data.data_ref); + av_free(vps->extension_data.data); av_freep(&content); } static void cbs_h265_free_sps(void *unit, uint8_t *content) { H265RawSPS *sps = (H265RawSPS*)content; - av_buffer_unref(&sps->extension_data.data_ref); + av_free(sps->extension_data.data); av_freep(&content); } static void cbs_h265_free_pps(void *unit, uint8_t *content) { H265RawPPS *pps = (H265RawPPS*)content; - av_buffer_unref(&pps->extension_data.data_ref); + av_free(pps->extension_data.data); av_freep(&content); } diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index 33e71fc234..1b357293ab 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -154,7 +154,6 @@ typedef struct H265RawVUI { typedef struct H265RawPSExtensionData { uint8_t *data; size_t bit_length; - AVBufferRef *data_ref; } H265RawPSExtensionData; typedef struct H265RawVPS {