From patchwork Thu Nov 17 05:41:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1451 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp580982vsb; Wed, 16 Nov 2016 21:42:15 -0800 (PST) X-Received: by 10.194.25.130 with SMTP id c2mr748626wjg.124.1479361335802; Wed, 16 Nov 2016 21:42:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kv9si1213518wjb.50.2016.11.16.21.42.15; Wed, 16 Nov 2016 21:42:15 -0800 (PST) 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; 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 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 4AD3A689D62; Thu, 17 Nov 2016 07:42:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E886689924 for ; Thu, 17 Nov 2016 07:42:04 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id 124so24606389qkh.1 for ; Wed, 16 Nov 2016 21:42:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=fQ9Y5s7Vhq2+SWA2daegPh5Squ7uHpLAAgEYnmdGe8U=; b=uwcDsZ3BxigzyoxYdgMDzigDFv3988wyIp7035t1PpZp80ke864Lssd+FDeaKoCMjS oPRLiyk3+oDsioiiXxHJ7rYjHefVSs75JMMgDZehnPY66zWytXsOUiHGYRiIX/GKuo0N WGTuav4qgGHcJnkiYrDE+kF2ADrQc4vBZ4uHQEArKdwLgq0c8ir3oEhT21aK0JqlJy53 qnWZ7+iL9U+15wn1LVAegUIaPRs3/x2BKZtVIVc8tCSScMEOEEayTYyfxXvHDQRspmrZ elpPzdICFFIs+fajeGcIK81LZcExKYDinuoZqctuYMxMHMAOgLS8Ck/IbhV1Uj0XqkCC oUmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=fQ9Y5s7Vhq2+SWA2daegPh5Squ7uHpLAAgEYnmdGe8U=; b=YIR9QJA9V1Q8IpXF0gmEZUbMMwcukDKkrV/+xe0fcDnbPJWjRPcOclpdDa2qOfouFM gnrKvOPuKSLs4qLcJDcwBhFaUAvaNgquSTujjZcaDQCkPpD3Cv03jhtePlR1DK8CPptG 7nDhahGVUzJWQ7FJaT6MGLPfsKAb5sdFHaPLVPB2RFr4kWWaWfXdN52xsqvsAUn+10Dh qSl4fFk0V7KfyOq8P58j/CWSf9IRpQ5xXTA/UUDC7rVaarGYGiaPGlm3Io5QEoRZa5Vl hLATk5p3VNDuwTbS+kuUry6IcyoE4/JDNFnOJhB6J012Fyj+ZY22OwlAlS5kDzUEIJ3q gCmQ== X-Gm-Message-State: AKaTC00COorSas91irIYdlKZjke9TDOjPVzXYrjjZNCJNKr/8M+rkHphYVYBm9TQEuBkWw== X-Received: by 10.55.200.149 with SMTP id t21mr1367446qkl.214.1479361324056; Wed, 16 Nov 2016 21:42:04 -0800 (PST) Received: from localhost.localdomain ([181.22.0.199]) by smtp.gmail.com with ESMTPSA id f66sm730904qke.12.2016.11.16.21.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 21:42:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Nov 2016 02:41:13 -0300 Message-Id: <20161117054115.3732-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/utils: add av_stream_add_side_data() 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" Functionally similar to av_packet_add_side_data(). Allows the use of an already allocated buffer as stream side data. Signed-off-by: James Almer --- TODO: Version bump. doc/APIchanges | 3 +++ libavformat/avformat.h | 16 ++++++++++++++++ libavformat/utils.c | 32 +++++++++++++++++++++++--------- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 3089c82..fc47d20 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-11-xx - xxxxxxx - lavf 57.58.100 - avformat.h + Add av_stream_add_side_data(). + 2016-xx-xx - xxxxxxx - lavu 55.39.100 - hwcontext_vaapi.h Add AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f9f4d72..ce6d587 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2049,6 +2049,22 @@ const AVClass *avformat_get_class(void); AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c); /** + * Wrap an existing array as stream side data. + * + * @param st stream + * @param type side information type + * @param data the side data array. It must be allocated with the av_malloc() + * family of functions. The ownership of the data is transferred to + * st. + * @param size side information size + * @return a non-negative number on success, a negative AVERROR code on + * failure. On failure, the stream is unchanged and the data remains + * owned by the caller. + */ +int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, + uint8_t *data, size_t size); + +/** * Allocate new information from stream. * * @param stream stream diff --git a/libavformat/utils.c b/libavformat/utils.c index 5664646..19bb8bd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5104,15 +5104,11 @@ uint8_t *av_stream_get_side_data(const AVStream *st, return NULL; } -uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, - int size) +int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, + uint8_t *data, size_t size) { AVPacketSideData *sd, *tmp; int i; - uint8_t *data = av_malloc(size); - - if (!data) - return NULL; for (i = 0; i < st->nb_side_data; i++) { sd = &st->side_data[i]; @@ -5121,14 +5117,13 @@ uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, av_freep(&sd->data); sd->data = data; sd->size = size; - return sd->data; + return 0; } } tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp)); if (!tmp) { - av_freep(&data); - return NULL; + return AVERROR(ENOMEM); } st->side_data = tmp; @@ -5138,6 +5133,25 @@ uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, sd->type = type; sd->data = data; sd->size = size; + + return 0; +} + +uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, + int size) +{ + int ret; + uint8_t *data = av_malloc(size); + + if (!data) + return NULL; + + ret = av_stream_add_side_data(st, type, data, size); + if (ret < 0) { + av_freep(&data); + return NULL; + } + return data; }