From patchwork Tue Dec 10 21:59:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16715 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 8664044A835 for ; Wed, 11 Dec 2019 00:00:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73AC868B6FB; Wed, 11 Dec 2019 00:00:44 +0200 (EET) 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 AE8B968B095 for ; Wed, 11 Dec 2019 00:00:32 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id g17so21852514wro.2 for ; Tue, 10 Dec 2019 14:00:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OEjITQF3BcyoFNWD+Q2cbj8Fi3VDThrswN1DXmiB9tc=; b=lusQ0Fmou72XpECvyjmthNvEam1k0PzhRg+ZhG8ju72j07Rz1XQf23A1Svn4fzqCjt DfXQq3Wz3RDri0aymeipyF5NocSJZD1yCwLXhRLx+Px3/JeP0CJmmRhn+9I/X8WuVNAG HWROTxylsHAkPMe8ySN5Dpv+8l2fod2BWMb4BPHjxlpLRUxl4XYVd/CyBHSsUOWWEDnU mq9QbFvRoX5hU/kO2KT2biHoDUgJVP1w2/HfCM1J/3q7vIDjCzEdiEIcSwvGZbBs0AzI Dbo9AyD5r+KE428IVo6luAJMjMV0w+LrEcu1qZAUsc+HR874m3U/m3JJ4zfu7tHfETav TKUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OEjITQF3BcyoFNWD+Q2cbj8Fi3VDThrswN1DXmiB9tc=; b=XXWdYY5De6yu9xs0qRRvvsZNJdrPXSn6skGxu286rpz9dGaR/3799d7N2zqnVmOWyS JsnYfY4CCQwiZZXq4XyyA8AodD0KhehSEi4MhnsW1HSa2uIg/k0erUblNDlqWzERSV60 Kxhoeo8wOQib7l0/4PzxwVbnc5qpZpI9FuKoDXrqmsl2K6uxFUqSM6zi5PvvZz1Xgtr3 GES0xQC+8AA3k6IGCkZTK3uqYnnIWnHS1CEXNjtVrhfe4opY8Z9aJ1uIMRCDIIj5sgMm 5kjjPfQnR6GQSmORtcp8Kn9Vxao0hZWtOLCF9YT5smVUZkiYJ34RLi0CGn2euuAK1r6G nJkQ== X-Gm-Message-State: APjAAAUMFv6qipV2swvoZ+oHYaB8pD/FeHoFDMm+oAnM3/GBSXGWlTiv m3I7eU8ka38z4wOkTiTZrvCs/cLf X-Google-Smtp-Source: APXvYqz/9UM9BR9k25HiQ940RSfGwO/Pw83FlUfZ1CurIK7FS9e9Q+mMLJDJAfGifCQTwYnHaVNZrw== X-Received: by 2002:adf:e40f:: with SMTP id g15mr5968372wrm.223.1576015232030; Tue, 10 Dec 2019 14:00:32 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n129sm3876381wmb.1.2019.12.10.14.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 14:00:31 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:59:52 +0100 Message-Id: <20191210215955.11178-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> References: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] avformat/rtpdec_hevc: Don't reimplement ff_alloc_extradata 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/rtpdec_hevc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 5a06b2362c..f467104ca5 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -25,6 +25,7 @@ #include "libavcodec/get_bits.h" #include "avformat.h" +#include "internal.h" #include "rtpdec.h" #include "rtpdec_formats.h" @@ -147,15 +148,9 @@ static av_cold int hevc_parse_sdp_line(AVFormatContext *ctx, int st_index, hevc_sdp_parse_fmtp_config); if (hevc_data->vps_size || hevc_data->sps_size || hevc_data->pps_size || hevc_data->sei_size) { - av_freep(&par->extradata); par->extradata_size = hevc_data->vps_size + hevc_data->sps_size + hevc_data->pps_size + hevc_data->sei_size; - par->extradata = av_malloc(par->extradata_size + - AV_INPUT_BUFFER_PADDING_SIZE); - if (!par->extradata) { - ret = AVERROR(ENOMEM); - par->extradata_size = 0; - } else { + if ((ret = ff_alloc_extradata(par, par->extradata_size)) >= 0) { int pos = 0; memcpy(par->extradata + pos, hevc_data->vps, hevc_data->vps_size); pos += hevc_data->vps_size; @@ -164,8 +159,6 @@ static av_cold int hevc_parse_sdp_line(AVFormatContext *ctx, int st_index, memcpy(par->extradata + pos, hevc_data->pps, hevc_data->pps_size); pos += hevc_data->pps_size; memcpy(par->extradata + pos, hevc_data->sei, hevc_data->sei_size); - pos += hevc_data->sei_size; - memset(par->extradata + pos, 0, AV_INPUT_BUFFER_PADDING_SIZE); } av_freep(&hevc_data->vps);