From patchwork Tue Sep 8 22:35:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22204 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 E7C9B4491AC for ; Wed, 9 Sep 2020 01:35:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC9EC68B6D2; Wed, 9 Sep 2020 01:35:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61A3C68B63A for ; Wed, 9 Sep 2020 01:35:52 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id e7so508375qtj.11 for ; Tue, 08 Sep 2020 15:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=u49oaOfu3D28uvpaCojZC+xNjUFWs0z8cnm0qmoZ730=; b=S+ImhLeKd3qX6QVDu6jebOGO/TC2unDrqSpal45RpDkFhOiecHndtG4TWAlXQZGUMb 1O94MM6LlK8G5f3LNeLjp4EuZcPIVIuBj2QD3jdqIGxAUjDmVi6T6oBj37SH19wbF9UQ TYAvWbnf6HOlTyv32+osK5BgcaPu7IPx+r3hW/FOGs4ORgIzbU8Ww5rwiGxx7hp+141i fQpZuxAD3cQskEgocli71UOHvLzteXxm523cYguelLBxjyCcH7LN8M1+Y2gu2HoU1CJb C49WZeu5600uOTDVG2J35WQ0dY1qehwN901gxnGTYYusEQrTMLn/Dpew3JZGcJNSOfP6 VACQ== 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:mime-version :content-transfer-encoding; bh=u49oaOfu3D28uvpaCojZC+xNjUFWs0z8cnm0qmoZ730=; b=n8whuKWIT9lcRNYPKNGtKE84gtKN7MebfPUQZzDeEEHGH7eU4CwSvAYczI8RKRHy6X Zl2qFJTssX4sF8IU44D120c4MEIKUBRkMWd0d9Ry11kMrG+J6AVkzF/8ONIV7b/nKpnZ InUkKBEEj/nVYf5davnBWLJOTOQd4hpB9+FUiUIn6ptU2AIyYXHjgdQ2Pj4VQRjjpgNr sdFwRz7YHzcdJ205y073LRL40/zurifXXaG3uBOrBHxQgOsvdiPukTs3bvziUnDOaGk+ hBDaom7MkxmD6JSYktyI7RpLEzTZpF4EpB3PrK2Zy59Oh2yXOW3HeNQplfi6pUCCmfu4 hB/g== X-Gm-Message-State: AOAM532B1XkgJOWnGAeRTQy35rh0f2jR6MwGEI9xV5DNkxgynhyOMWVQ +D/0iJqKidBzY6SXq8wGzH5zcybVHA0= X-Google-Smtp-Source: ABdhPJz8jJJSgwYsXBfocckUJURvrfxxaWrEQOOydwiICC6tybr3CfE2iQcKW5eDaiYPQibev1Pz9w== X-Received: by 2002:ac8:474a:: with SMTP id k10mr642275qtp.115.1599604550347; Tue, 08 Sep 2020 15:35:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.2]) by smtp.gmail.com with ESMTPSA id k63sm681437qkf.33.2020.09.08.15.35.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 15:35:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Sep 2020 19:35:10 -0300 Message-Id: <20200908223510.7839-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/avpacket: add av_packet_remove_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This helper removes a side data entry from the packet, maintaining the integrity and order of the remaining entries, if any. Signed-off-by: James Almer --- Missing APIChanges entry and version bump. Couldn't find a place in the tree where it could be used right now, but it makes the API be more in line with the AVFrame one, so i decided to write it. libavcodec/avpacket.c | 24 ++++++++++++++++++++++++ libavcodec/packet.h | 8 ++++++++ 2 files changed, 32 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 4801163227..61ea81698c 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -367,6 +367,30 @@ uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType return NULL; } +void av_packet_remove_side_data(AVPacket *pkt, enum AVPacketSideDataType type) +{ + int i, elems; + + for (i = 0; i < pkt->side_data_elems; i++) { + if (pkt->side_data[i].type != type) + continue; + + elems = pkt->side_data_elems - 1; + av_freep(&pkt->side_data[i].data); + pkt->side_data[i].size = 0; + + if (i < elems) { + memmove(&pkt->side_data[i], &pkt->side_data[i + 1], + (elems - i) * sizeof(*pkt->side_data)); + } + if (!elems) + av_freep(&pkt->side_data); + pkt->side_data_elems = elems; + + break; + } +} + const char *av_packet_side_data_name(enum AVPacketSideDataType type) { switch(type) { diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 0a19a0eff3..6ce3c91c07 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -595,6 +595,14 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type, int *size); +/** + * Remove and free a side data entry of the given type. + * + * @param pkt packet + * @param type side data type to be removed + */ +void av_packet_remove_side_data(AVPacket *pkt, enum AVPacketSideDataType type); + #if FF_API_MERGE_SD_API attribute_deprecated int av_packet_merge_side_data(AVPacket *pkt);