From patchwork Mon May 20 23:02:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 13213 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 2205F447422 for ; Tue, 21 May 2019 02:10:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AE6F68A52D; Tue, 21 May 2019 02:10:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEF25689DEA for ; Tue, 21 May 2019 02:10:41 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r7so16324042wrr.13 for ; Mon, 20 May 2019 16:10:41 -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=L+VR9cXZJ4FnqQ4XSvZs1wuSsbqa8WA1fDcGUecYKWQ=; b=eTfBVBagmFqaYPv5EcwMploP5W0Kbtg8kttAk8LUR8k0nDld5VjucIDGZKt0kNZRSl LWk40Ut4ZMNjG15Ptf8CS7rwKWgikyMlhEGEJc3MzGolROJMtNP+FiC1dPDaNYfIlp9O 3MTOQCcg8ZOBYQofdxXfXiBWWV51zCe4qMw37rqwlKThCoRD1IpthDFpPQqf5ojd5nDX M7ugQMJ+UR5ssjtbxBQqkN/HXWLnRYoI3wUhibNCoZ+EK79ykK1pwzUW1l0Gyg8wIXHS ONU119Mc0Pcu9W1XD+Sn3aw/dNBFDz8Vx/ct5E50YVs6fRN7pgDliQ0uhxZPPghGN46b E0oQ== 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=L+VR9cXZJ4FnqQ4XSvZs1wuSsbqa8WA1fDcGUecYKWQ=; b=idyxVZinJsSJhZpj0hI3XrTiXmbNwMKLuvbkd9+bwozDp6NCeeumUI3B2GwCL4Yw9O YZ4GlCQtD4Def49UylPZZjrDlebdhvFuJfyKdzDI4m//o71nxuVvSW1DsYlEsodKQp1c CBvJrvHl49DehIjlHaUnULSuy6De4P+1DzSbhUOe/XVH+eW3xgjZjG2dStfDqZwAmHmv 6JreVJOLUYV8yalQvxjXvdxtyU2FN0WEk2XB8XIt07eGFFqzN/IIR3J2rCSr2vQBqCkl ihSgrziTcMiJBNG2asgYYxup4TSpXorCu8yq7KGpu14jOosFqN5wBVpdueDauKzT1x2Z foJg== X-Gm-Message-State: APjAAAUSV9/o0Ouge4KApXxjGX/Jwy7PPEOso01V4oTX0koCF40No41v IzJupVAAX4sYeJV4tkFK/cYayj0AIGE= X-Google-Smtp-Source: APXvYqxIW1KdB+B79bvVL4bQsjzpGEtjvaOib8GgwmyEfA9UOBGDZ4+v89o2FO+wcxTVzs4gQTFXiw== X-Received: by 2002:a5d:688a:: with SMTP id h10mr47102637wru.211.1558393351240; Mon, 20 May 2019 16:02:31 -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.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 16:02:30 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2019 00:02:16 +0100 Message-Id: <20190520230224.19221-3-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 03/11] cbs: Describe allocate/free methods in tabular form 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" Unit types are split into three categories, depending on how their content is managed: * POD structure - these require no special treatment. * Structure containing references to refcounted buffers - these can use a common free function when the offsets of all the internal references are known. * More complex structures - these still require ad-hoc treatment. For each codec we can then maintain a table of descriptors for each unit type, defining the mechanism needed to allocate/free that unit content. This is not required to be used immediately - a new alloc function supports this, but does not replace the old one which works without referring to these tables. --- libavcodec/cbs.c | 62 +++++++++++++++++++++++++++++++++++++++ libavcodec/cbs.h | 16 ++++++++++ libavcodec/cbs_internal.h | 36 +++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 0260ba6f67..1963d86133 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -754,3 +754,65 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, return 0; } + +static void cbs_default_free_unit_content(void *opaque, uint8_t *data) +{ + const CodedBitstreamUnitTypeDescriptor *desc = opaque; + if (desc->content_type == CBS_CONTENT_TYPE_INTERNAL_REFS) { + int i; + for (i = 0; i < desc->nb_ref_offsets; i++) { + void **ptr = (void**)(data + desc->ref_offsets[i]); + av_buffer_unref((AVBufferRef**)(ptr + 1)); + *ptr = NULL; + } + } + av_free(data); +} + +static const CodedBitstreamUnitTypeDescriptor + *cbs_find_unit_type_desc(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + const CodedBitstreamUnitTypeDescriptor *desc; + int i; + + if (!ctx->codec->unit_types) + return NULL; + + for (i = 0;; i++) { + desc = &ctx->codec->unit_types[i]; + if (desc->unit_type == CBS_INVALID_UNIT_TYPE) + break; + if (desc->unit_type == unit->type) + return desc; + } + return NULL; +} + +int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + const CodedBitstreamUnitTypeDescriptor *desc; + + av_assert0(!unit->content && !unit->content_ref); + + desc = cbs_find_unit_type_desc(ctx, unit); + if (!desc) + return AVERROR(ENOSYS); + + unit->content = av_mallocz(desc->content_size); + if (!unit->content) + return AVERROR(ENOMEM); + + unit->content_ref = + av_buffer_create(unit->content, desc->content_size, + desc->content_free ? desc->content_free + : cbs_default_free_unit_content, + (void*)desc, 0); + if (!unit->content_ref) { + av_freep(&unit->content); + return AVERROR(ENOMEM); + } + + return 0; +} diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index e8b2d41ecb..8f764905bd 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -54,6 +54,13 @@ struct CodedBitstreamType; */ typedef uint32_t CodedBitstreamUnitType; +/** + * Value which is never valid as a unit type. + * + * This can be used as a sentinel. + */ +#define CBS_INVALID_UNIT_TYPE (UINT32_MAX) + /** * Coded bitstream unit structure. * @@ -337,6 +344,15 @@ int ff_cbs_alloc_unit_content(CodedBitstreamContext *ctx, size_t size, void (*free)(void *unit, uint8_t *content)); +/** + * Allocate a new internal content buffer matching the type of the unit. + * + * The content will be zeroed. + */ +int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit); + + /** * Allocate a new internal data buffer of the given size in the unit. * diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index dd4babf092..06a8f9b979 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -25,11 +25,47 @@ #include "put_bits.h" +enum { + // Unit content is a simple structure. + CBS_CONTENT_TYPE_POD, + // Unit content contains some references to other structures, but all + // managed via buffer reference counting. The descriptor defines the + // structure offsets of every buffer reference. + CBS_CONTENT_TYPE_INTERNAL_REFS, + // Unit content is something more complex. The descriptor defines + // special functions to manage the content. + CBS_CONTENT_TYPE_COMPLEX, +}; + +// Maximum number of reference buffer offsets in any one unit. +#define CBS_MAX_REF_OFFSETS 1 + +typedef struct CodedBitstreamUnitTypeDescriptor { + CodedBitstreamUnitType unit_type; + + int content_type; + size_t content_size; + + int nb_ref_offsets; + // The structure must contain two adjacent elements: + // type *field; + // AVBufferRef *field_ref; + // where field points to something in the buffer referred to by + // field_ref. This offset is then set to offsetof(struct, field). + size_t ref_offsets[CBS_MAX_REF_OFFSETS]; + + void (*content_free)(void *opaque, uint8_t *data); +} CodedBitstreamUnitTypeDescriptor; + typedef struct CodedBitstreamType { enum AVCodecID codec_id; size_t priv_data_size; + // List of unit type descriptors for this codec. + // Terminated by a descriptor with type CBS_INVALID_UNIT_TYPE. + const CodedBitstreamUnitTypeDescriptor *unit_types; + // Split frag->data into coded bitstream units, creating the // frag->units array. Fill data but not content on each unit. // The header argument should be set if the fragment came from