From patchwork Tue Jul 9 08:44:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernardo Pilarz X-Patchwork-Id: 50432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp227534vqb; Tue, 9 Jul 2024 01:54:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSnrGgt7OaT2RHAuC5FEp+GaTJKP+knh7/V12AA7XKOh8Hrmj/zC80sUqUlRaxyWtlJJ0ECm60cEaWjup0k6OPYMZF0VEQ4UuYBg== X-Google-Smtp-Source: AGHT+IG2RuV0K2QUy5zoAMBWZWwRrLkqoxktuIXeA1PA9GzcZqJ0U8V2iTTX9cRrW5Fo6VNoWQJS X-Received: by 2002:a17:907:9692:b0:a77:eb34:3b45 with SMTP id a640c23a62f3a-a780b6fe39cmr143601966b.36.1720515245884; Tue, 09 Jul 2024 01:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720515245; cv=none; d=google.com; s=arc-20160816; b=ffHeM/TJHCSvAZxq7PKqQxiQue0KeUZLon9R8p1QjxbAWi/lzt37FoekpXLV4L7X5N 7ealGI5nZJHmPA8/H/gfpAOTaKcxIgoGtnu4+0PJmzLPrCJOLw5qYPPRnHczKaDyIYpD Epehhqe1HY6D8ae++K6f2GN8zp2RPUgGAq2fXKzQmBm9VXtriMfH8NaE4JTBbzdPJos8 /UgDhZgvwtlky4U4AvB+/EFxreZ0IDBCBtmkMENwqNL7zYVCeSCbpQnyDc3JWlFEwCjd YlCknCqREwhQNEXli9qRLRNRXgYyj9OJ8WeKJgA7werJi0CmYEKeeFGOahPqwl6JC94z EEaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:content-language:to:mime-version:date :message-id:dkim-filter:delivered-to; bh=AvECXinSlzDDYBHHPGzCG5lTSOCKdt/rLIR/M4uIeno=; fh=BLn51q7SjHgGIj+gC34mWa6upHCOzzwSChD7Q8MutZ0=; b=gHxcLAirtVQJAJS3RCQOxLBVX2/TGAmurhlV/JqhwURQV8XhRquHRxgv0snxm1nIWu honNgA/EwSE28T/AwstZP8Ev/1drOa6Or5ZzNHglmXes4ZHHER2c5UHJBT58Y7dGoAMv Pz8MeLUnz2l7y+GiqNMjetB+VK6RjDCoDj772ZLZEAL8tWnHzUMbByeqOHVk6APtIzBd B/nRfwxAC+jqMvpkQNnT3htPp7IMmLuCmSc1KVZk2owi8uEXkClrAzXUej3nYvzK/b4P qaWLsgPO0cRl3uS2x/1ml7JLwir6ncpPzMZZEXAoddmOKSbfjrQjPNND0bXXDDjrYcko k2Cg==; dara=google.com 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a780aae160bsi78033666b.372.2024.07.09.01.54.05; Tue, 09 Jul 2024 01:54:05 -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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AA8768DC53; Tue, 9 Jul 2024 11:44:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay.aitek.it (dns1.aitek.it [194.244.35.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20A6468DB0D for ; Tue, 9 Jul 2024 11:44:51 +0300 (EEST) Received: from mail-server.aitek.it (mail-server.aitek.it [172.30.0.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay.aitek.it (Postfix) with ESMTPS id 289D41800333 for ; Tue, 9 Jul 2024 10:44:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.aitek.it 289D41800333 Message-ID: Date: Tue, 9 Jul 2024 10:44:42 +0200 MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Content-Language: en-US, it X-Aitek-Mail-Server-MailScanner-Information: Please contact the ISP for more information X-Aitek-Mail-Server-MailScanner-ID: 5A776858861.A403C X-Aitek-Mail-Server-MailScanner: Found to be clean X-Aitek-Mail-Server-MailScanner-From: bernardo.pilarz@aitek.it X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH] avcodec/avformat: Store SDP attributes from RTSP stream into AVStream side data. 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: , X-Patchwork-Original-From: Bernardo Pilarz via ffmpeg-devel From: Bernardo Pilarz Reply-To: FFmpeg development discussions and patches Cc: Bernardo Pilarz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X6svY3QbGLZz Connecting to an RTSP stream will now cause the SDP attributes of each media stream to be stored in the codecpar of the relative AVStream. The SDP attributes are stored in the coded_side_data using the (new) type AV_PKT_DATA_SDP_ATTRIBUTES (AVPacketSideDataType enum). Signed-off-by: Bernardo Pilarz --- libavcodec/packet.h | 7 ++++ libavformat/rtsp.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) mode change 100644 => 100755 libavcodec/packet.h mode change 100644 => 100755 libavformat/rtsp.c diff --git a/libavcodec/packet.h b/libavcodec/packet.h old mode 100644 new mode 100755 index 13667ffa36..8cbb1c2a75 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -339,6 +339,13 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_FRAME_CROPPING, + /** + * Attributes found in the SDP, associated with the stream. This is a + * list of zero terminated key/value strings. There is no end marker for + * the list, so it is required to rely on the side data size to stop. + */ + AV_PKT_DATA_SDP_ATTRIBUTES, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c old mode 100644 new mode 100755 index 19b93df839..10594e501a --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -283,6 +283,91 @@ static int init_satip_stream(AVFormatContext *s) } #endif +static int sdp_add_attribute_to_stream_side_data(AVFormatContext *s, + AVStream *st, + const char *p) +{ + AVPacketSideData *side_data = NULL; + AVDictionary* attributes_dict = NULL; + char *key = NULL, *value = NULL; + int ret = 0; + + /* Get the stream's attributes dictionary. + * If the stream has no attributes dictionary, it will be automatically + * created by av_dict_set. */ + side_data = av_packet_side_data_get(st->codecpar->coded_side_data, + st->codecpar->nb_coded_side_data, + AV_PKT_DATA_SDP_ATTRIBUTES); + if (side_data) { + ret = av_packet_unpack_dictionary(side_data->data, side_data->size, + &attributes_dict); + if (ret) { + av_log(s, AV_LOG_WARNING, + "Unable to unpack SDP attributes dictionary.\n"); + return -1; + } + } + + /* The attribute can either be a value attribute (key:value) or + * property attribute (just the key). + * Look for the ':' separator, and create the 'key' and 'value' + * appropriately. */ + const char *separator = strchr(p, ':'); + if (separator) { + /* Make a copy of the key and value. */ + key = av_strndup(p, separator - p); + value = av_strdup(separator + 1); + } else { + /* Copy the key and create an empty value. */ + key = av_strdup(p); + value = av_mallocz(1); + } + if (!key || !value) { + av_dict_free(&attributes_dict); + av_free(value); + av_free(key); + return -1; + } + + /* Add the attribute, then pack the dictionary again. */ + ret = av_dict_set(&attributes_dict, key, value, + AV_DICT_DONT_STRDUP_KEY | + AV_DICT_DONT_STRDUP_VAL | + AV_DICT_MULTIKEY); + if (ret) { + av_log(s, AV_LOG_WARNING, + "Unable to add SDL attribute to dictionary.\n"); + av_dict_free(&attributes_dict); + return -1; + } + size_t packed_dict_size = 0u; + uint8_t *packed_dict = av_packet_pack_dictionary(attributes_dict, + &packed_dict_size); + + /* Free the dictionary, which is not needed any longer. */ + av_dict_free(&attributes_dict); + + /* Make sure the dictionary was packet successfully, then add it + * back to the stream's side data. */ + if (!packed_dict) { + av_log(s, AV_LOG_WARNING, + "Unable to pack SDP attributes dictionary.\n"); + return -1; + } + side_data = av_packet_side_data_add(&st->codecpar->coded_side_data, + &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_SDP_ATTRIBUTES, + packed_dict, packed_dict_size, + 0); + if (!side_data) { + av_log(s, AV_LOG_WARNING, + "Unable to add SDP attributes side data to stream.\n"); + return -1; + } + + return 0; +} + /* parse the rtpmap description: /[/] */ static int sdp_parse_rtpmap(AVFormatContext *s, AVStream *st, RTSPStream *rtsp_st, @@ -570,6 +655,18 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, sizeof(rtsp_st->control_url)); break; case 'a': + /* add all SDP attributes to the stream's side data */ + if (rt->nb_rtsp_streams > 0) { + rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1]; + if (rtsp_st->stream_index >= 0) { + st = s->streams[rtsp_st->stream_index]; + if (sdp_add_attribute_to_stream_side_data(s, st, p)) { + av_log(s, AV_LOG_WARNING, + "Failed to add SDP attribute to stream"); + } + } + } + /* now parse the SDP attribute line */ if (av_strstart(p, "control:", &p)) { if (rt->nb_rtsp_streams == 0) { if (!strncmp(p, "rtsp://", 7))