From patchwork Mon May 20 23:02:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 13211 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 B8A44447422 for ; Tue, 21 May 2019 02:09:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0DDA68A70E; Tue, 21 May 2019 02:09:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F040689DEA for ; Tue, 21 May 2019 02:09:31 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id g12so16088404wro.8 for ; Mon, 20 May 2019 16:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=d50W3PbAHROXfsZnAoyfhpUW3pd/RuRTRzyS1eyPGOc=; b=cnWkqbxV0GPOu2NT5pOrTxoaiDzYCR6z+Nkvhp6/F2xnEbl+ZsBbB26fNPeUlgZR1o rFw0p78LU549kqYQc99RqwHVmW9y4gbvtWTPzZkjqy6+fyzMXb6TWwoWAv/9PdgSNlRj 9LARovqxnmY/XT+ye91Lq9l92RUvrLUYqXaN6PuwTc9auNgV3g40UgqJBlAnMpZenBom 69NP9YBRD4i2M82Yd4PZxm/6Dl9c8jLUnnCejuX/mhn4ap46oK/FIii5A1FPJEFRunG6 wA3KWECmj3V3CVZCVE71Mjv17vRbA4mRq5EXxtKFhv+h516wxqdYvoo5hHuaZlAkQ4Ed EP+g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=d50W3PbAHROXfsZnAoyfhpUW3pd/RuRTRzyS1eyPGOc=; b=BtQ2v2oaVjyPkX8fdvxZDyEg7W2mWFGkF5ONmmc+Uo/etJjK82iG/42k6CzArYNCuz 4N2McFCjnNSIU6kdG4PIbXOLNhFvh4mOBzra9JMjSHGyIIQaOKRxG0oUnqpld0BDqcOn FrhKcBRSyQtQPhTKXqyAYzUJEalS+uyK52ZY4s00Y91xKmcOpDi+jKoIDZNiPcvLGVrJ BWNFq5rvsztASiXH3MljdKE3ZBeQ4i9fd4/7a38zYZUxxW1FhU1AniRVsAUHxj2tjWa8 Png3969LOQ0aI/yKQFZ6maYDLy+MY+WIrmtZm5AA7bprfWO4dAqqF5TCpL0r+2wWoiw/ hEOg== X-Gm-Message-State: APjAAAVNeM3sv9PPsULLXtdgh4prkNbuQQ8/4tFqgjxVwBYsSGxyKmPu Bm7cA33557IckoxdsXRaLYv23+HSW8w= X-Google-Smtp-Source: APXvYqxpksV0RJJmMxwzLGM4tN3kmu+EeacLEiEnEkrI8yoBqjtmoqeFTulF3JxHew6S+gVgAQEizw== X-Received: by 2002:a5d:5501:: with SMTP id b1mr28043879wrv.222.1558393358882; Mon, 20 May 2019 16:02:38 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id z14sm13858538wrq.22.2019.05.20.16.02.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 16:02:38 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2019 00:02:24 +0100 Message-Id: <20190520230224.19221-11-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190520230224.19221-1-sw@jkqxz.net> References: <20190520230224.19221-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/11] cbs_av1: Use table-based alloc/free 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/cbs_av1.c | 85 ++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 46 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index eb2d03ef43..c497ddc352 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -811,50 +811,6 @@ fail: return err; } -static void cbs_av1_free_tile_data(AV1RawTileData *td) -{ - av_buffer_unref(&td->data_ref); -} - -static void cbs_av1_free_padding(AV1RawPadding *pd) -{ - av_buffer_unref(&pd->payload_ref); -} - -static void cbs_av1_free_metadata(AV1RawMetadata *md) -{ - switch (md->metadata_type) { - case AV1_METADATA_TYPE_ITUT_T35: - av_buffer_unref(&md->metadata.itut_t35.payload_ref); - break; - } -} - -static void cbs_av1_free_obu(void *unit, uint8_t *content) -{ - AV1RawOBU *obu = (AV1RawOBU*)content; - - switch (obu->header.obu_type) { - case AV1_OBU_TILE_GROUP: - cbs_av1_free_tile_data(&obu->obu.tile_group.tile_data); - break; - case AV1_OBU_FRAME: - cbs_av1_free_tile_data(&obu->obu.frame.tile_group.tile_data); - break; - case AV1_OBU_TILE_LIST: - cbs_av1_free_tile_data(&obu->obu.tile_list.tile_data); - break; - case AV1_OBU_METADATA: - cbs_av1_free_metadata(&obu->obu.metadata); - break; - case AV1_OBU_PADDING: - cbs_av1_free_padding(&obu->obu.padding); - break; - } - - av_freep(&obu); -} - static int cbs_av1_ref_tile_data(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit, GetBitContext *gbc, @@ -889,8 +845,7 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, GetBitContext gbc; int err, start_pos, end_pos; - err = ff_cbs_alloc_unit_content(ctx, unit, sizeof(*obu), - &cbs_av1_free_obu); + err = ff_cbs_alloc_unit_content2(ctx, unit); if (err < 0) return err; obu = unit->content; @@ -1303,11 +1258,49 @@ static void cbs_av1_close(CodedBitstreamContext *ctx) av_freep(&priv->write_buffer); } +static void cbs_av1_free_metadata(void *unit, uint8_t *content) +{ + AV1RawOBU *obu = (AV1RawOBU*)content; + AV1RawMetadata *md; + + av_assert0(obu->header.obu_type == AV1_OBU_METADATA); + md = &obu->obu.metadata; + + switch (md->metadata_type) { + case AV1_METADATA_TYPE_ITUT_T35: + av_buffer_unref(&md->metadata.itut_t35.payload_ref); + break; + } +} + +static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = { + CBS_UNIT_TYPE_POD(AV1_OBU_SEQUENCE_HEADER, AV1RawOBU), + CBS_UNIT_TYPE_POD(AV1_OBU_TEMPORAL_DELIMITER, AV1RawOBU), + CBS_UNIT_TYPE_POD(AV1_OBU_FRAME_HEADER, AV1RawOBU), + CBS_UNIT_TYPE_POD(AV1_OBU_REDUNDANT_FRAME_HEADER, AV1RawOBU), + + CBS_UNIT_TYPE_INTERNAL_REFS(AV1_OBU_TILE_GROUP, AV1RawOBU, 1, + { offsetof(AV1RawOBU, obu.tile_group.tile_data.data) }), + CBS_UNIT_TYPE_INTERNAL_REFS(AV1_OBU_FRAME, AV1RawOBU, 1, + { offsetof(AV1RawOBU, obu.frame.tile_group.tile_data.data) }), + CBS_UNIT_TYPE_INTERNAL_REFS(AV1_OBU_TILE_LIST, AV1RawOBU, 1, + { offsetof(AV1RawOBU, obu.tile_list.tile_data.data) }), + CBS_UNIT_TYPE_INTERNAL_REFS(AV1_OBU_PADDING, AV1RawOBU, 1, + { offsetof(AV1RawOBU, obu.padding.payload) }), + + CBS_UNIT_TYPE_COMPLEX(AV1_OBU_METADATA, AV1RawOBU, + &cbs_av1_free_metadata), + + CBS_UNIT_TYPE_END_OF_LIST +}; + const CodedBitstreamType ff_cbs_type_av1 = { .codec_id = AV_CODEC_ID_AV1, .priv_data_size = sizeof(CodedBitstreamAV1Context), + .unit_types = cbs_av1_unit_types, + .split_fragment = &cbs_av1_split_fragment, .read_unit = &cbs_av1_read_unit, .write_unit = &cbs_av1_write_unit,