From patchwork Tue Sep 13 09:08:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 37883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp565052pzh; Tue, 13 Sep 2022 02:09:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR7mfT0H2/13dA4EOdt6IVKtciVnJI2k2zYK5dutgoav1qI0KeuL77iurayEkU5W3At8UdAe X-Received: by 2002:a17:907:8687:b0:77b:f46a:12e5 with SMTP id qa7-20020a170907868700b0077bf46a12e5mr8458690ejc.747.1663060175955; Tue, 13 Sep 2022 02:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663060175; cv=none; d=google.com; s=arc-20160816; b=TqhaeW9BqZl0g/HROu3DXh/7HQGdgIRTx6zrPYs61HQHGG9m2mD9OjfY0PATzj8lxO 5wZKp2B3W+VQ4z8zNSkOwGhcFb1U3l128d2atqprNeBR9S4eSK+LJuCZTFEKY9Iqe2hT coQfa4MoPtC1Jm8f7PSgy8O+Z0eoQ4td1o405ZATnxIWDVfY6SgYR8pZ5Miz+rlDbiEk x3A+ChbtJcXgqC/It9tYibSlh6PUXhSo6Q+fQYDgCsLrukih64xIcLcqnyjYj5Mmxhxq MjkWt2Mybw3xTHJTUmbUKeQjeZvMmW0lGdszmB5qPkDUJbzX3QSPDA+3J51hsUPBAAEP N4DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:content-language:accept-language :message-id:date:thread-index:thread-topic:to:from:delivered-to; bh=sFZsiNtPniw/GPAfzqLVYvT6ESZXYaSRzxjuU2UEGP8=; b=S+901rmpBFSJKpxVm2dcCLeKu1uEpedijffoLAs1hbY7FzKcZcuo0dFzGZe2lI75yT Om+F+rXV0tVTjZNcWmQ8ZpWVCOkyl+7iPnM5HXNzaI+BLKfpuLqMFxVdby57Q7GbhOvz 6pegzyyRd18K+56ESB/7hybd4E2Fdur+BoD2PeIAAzTiXX3TSw8FTrzpXS8vEWL41G9E 9FxSxQY5IYR2uYcxmZK5PMhia9j5VQgaQtErf2/sT9dsbxziFjxrWQq3f5vJkdYgJOh4 snzaE/Q5vER+eRKVG7EdbSRJ5UBgqUKH55kxQUz5rm9l9X6RB6jD3SqNRk8Sn4mfFEWY vMPg== ARC-Authentication-Results: i=1; mx.google.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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a14-20020a1709065f8e00b007307fd1b9bbsi7374541eju.589.2022.09.13.02.09.35; Tue, 13 Sep 2022 02:09:35 -0700 (PDT) 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; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F83968BACA; Tue, 13 Sep 2022 12:09:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0E8B688197 for ; Tue, 13 Sep 2022 12:09:24 +0300 (EEST) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MRcwv1LWFzNmGq for ; Tue, 13 Sep 2022 17:04:47 +0800 (CST) Received: from kwepemm600019.china.huawei.com (7.193.23.64) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 13 Sep 2022 17:08:54 +0800 Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemm600019.china.huawei.com (7.193.23.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 13 Sep 2022 17:08:53 +0800 Received: from kwepemi500014.china.huawei.com ([7.221.188.232]) by kwepemi500014.china.huawei.com ([7.221.188.232]) with mapi id 15.01.2375.024; Tue, 13 Sep 2022 17:08:53 +0800 From: "Wujian(Chin)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] RTP: get the buffer information of the RTP extension header. Thread-Index: AdjHTsXvzUvXIzPMRXWsInWTvssTRQ== Date: Tue, 13 Sep 2022 09:08:53 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.136.102.143] MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [FFmpeg-devel] [PATCH] RTP: get the buffer information of the RTP extension header. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Ijyyr1xvaQ9t Signed-off-by: wujian_nanjing --- libavcodec/avpacket.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/packet.h | 17 +++++++++++++++++ libavformat/demux.c | 7 +++++++ libavformat/rtpdec.c | 37 ++++++++++++++++++++++++++++--------- 4 files changed, 96 insertions(+), 9 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index bcbc416..45c131a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -46,6 +46,8 @@ void av_init_packet(AVPacket *pkt) pkt->opaque = NULL; pkt->opaque_ref = NULL; pkt->time_base = av_make_q(0, 1); + pkt->ext = NULL; + pkt->extlen = 0; } #endif @@ -109,6 +111,46 @@ int av_new_packet(AVPacket *pkt, int size) return 0; } +static void av_packet_free_ext(AVPacket *pkt) +{ + if (!pkt) + return; + + if (pkt->ext) { + av_free(pkt->ext); + pkt->ext = NULL; + } + + pkt->extlen = 0; +} + +int av_set_packet_ext(AVPacket *pkt, uint8_t *buf, int len) +{ + if (!buf || (len <= 0)) + return 0; + + if (pkt->ext == buf) { + pkt->extlen = len; + return 0; + } + + pkt->ext = av_malloc(len); + pkt->extlen = len; + (void)memcpy(pkt->ext, buf, len); + + return 0; +} + +static int av_copy_packet_ext(AVPacket *pkt, const AVPacket *src) +{ + pkt->ext = NULL; + pkt->extlen = 0; + + av_set_packet_ext(pkt, src->ext, src->extlen); + + return 0; +} + void av_shrink_packet(AVPacket *pkt, int size) { if (pkt->size <= size) @@ -422,6 +464,7 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src) void av_packet_unref(AVPacket *pkt) { av_packet_free_side_data(pkt); + av_packet_free_ext(pkt); av_buffer_unref(&pkt->opaque_ref); av_buffer_unref(&pkt->buf); get_packet_defaults(pkt); @@ -456,6 +499,7 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src) } dst->size = src->size; + av_copy_packet_ext(dst, src); return 0; fail: diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 404d520..137d1fa 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -374,6 +374,13 @@ typedef struct AVPacket { uint8_t *data; int size; int stream_index; + + /** + * Extension header data and size + */ + uint8_t *ext; + uint32_t extlen; + /** * A combination of AV_PKT_FLAG values */ @@ -523,6 +530,16 @@ void av_init_packet(AVPacket *pkt); int av_new_packet(AVPacket *pkt, int size); /** + * Allocate the ext data from buf with len lenght. + * Make sure pkt->ext is null, otherwise cause memory leak. + * + * @param pkt packet + * @param buf buffer with ext data + * @param len buffer size + */ +int av_set_packet_ext(AVPacket *pkt, uint8_t *buf, int len); + +/** * Reduce packet size, correctly zeroing padding * * @param pkt packet diff --git a/libavformat/demux.c b/libavformat/demux.c index 1620716..2a8b201 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1175,6 +1175,13 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, pkt->side_data_elems = 0; } + if (pkt->extlen > 0) { + out_pkt->extlen = pkt->extlen; + out_pkt->ext = pkt->ext; + pkt->extlen = 0; + pkt->ext = NULL; + } + /* set the duration */ out_pkt->duration = (sti->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) ? pkt->duration : 0; if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index fa7544c..2a539e0 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -699,13 +699,14 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, { unsigned int ssrc; int payload_type, seq, flags = 0; - int ext, csrc; + int has_ext, csrc, extlen; + uint8_t *extbuf; AVStream *st; uint32_t timestamp; int rv = 0; csrc = buf[0] & 0x0f; - ext = buf[0] & 0x10; + has_ext = buf[0] & 0x10; payload_type = buf[1] & 0x7f; if (buf[1] & 0x80) flags |= RTP_FLAG_MARKER; @@ -744,18 +745,25 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, return AVERROR_INVALIDDATA; /* RFC 3550 Section 5.3.1 RTP Header Extension handling */ - if (ext) { + if (has_ext) { if (len < 4) return -1; /* calculate the header extension length (stored as number * of 32-bit words) */ - ext = (AV_RB16(buf + 2) + 1) << 2; + extlen = (AV_RB16(buf + 2) + 1) << 2; - if (len < ext) + if (len < extlen) return -1; - // skip past RTP header extension - len -= ext; - buf += ext; + + // Save RTP header extension data + if (extlen > 0) { + extbuf = av_malloc(extlen); + if (extbuf) + (void)memcpy(extbuf, buf, extlen); + } + + len -= extlen; + buf += extlen; } if (s->handler && s->handler->parse_packet) { @@ -763,14 +771,25 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, s->st, pkt, ×tamp, buf, len, seq, flags); } else if (st) { - if ((rv = av_new_packet(pkt, len)) < 0) + if ((rv = av_new_packet(pkt, len)) < 0) { + if ((extlen > 0) && extbuf) + av_free(extbuf); return rv; + } memcpy(pkt->data, buf, len); pkt->stream_index = st->index; } else { + if ((extlen > 0) && extbuf) + av_free(extbuf); return AVERROR(EINVAL); } + // attach ext data + if ((extlen > 0) && extbuf) { + av_set_packet_ext(pkt, extbuf, extlen); + av_free(extbuf); + } + // now perform timestamp things.... finalize_packet(s, pkt, timestamp);