From patchwork Fri Aug 20 01:11:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Hwan X-Patchwork-Id: 29624 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp794576iov; Thu, 19 Aug 2021 18:11:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmgbyzG+fstmJbwjJ5BuVwww4cuex8wUQWvWmuVXsyBcYjrrpupBhaiZsiPjvu7bEqFC7D X-Received: by 2002:a17:906:3adb:: with SMTP id z27mr2082109ejd.291.1629421902865; Thu, 19 Aug 2021 18:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629421902; cv=none; d=google.com; s=arc-20160816; b=FNUE6zCBcKOfEr9ofDhS+QoICHXbZE61K/bavEp6v6wi79rLLYQ4I/FOTDCdknxifx Ct5Y4yswyb/MVHddse0qtd8nUF+GAjjbPE/ruf4A5I90g4/pzX4i13EQEgxFpfThnfj2 TNsdP4StcZJvt8lvtwv6uV7o3LbOTKgoXuWGrE0OQ7FlTnb73B+AD6xF25d3CkkeMBkM kDQU6KzKJQj8B8eyXhEsiDoV33cjGP7UrqBgnzO+B9RYsWy+yYXaNTskmOW3WDlTqIjb vGmY895Ci4KjZhbm/tbPHUdSvJPB9HBavXsL0k2ZXoqf4RItkT7usKxcAe0NLheo34Tr ky+A== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=BhlBAMNKf0Bnl7t0VcMzyvxvYuKjJTpuEXxHxA2m24A=; b=iYqqPb1QDWInVl0xO///mr1JOJ2RLr9qpfrtDdsirhgztT7H4EN7wqA/vBkMqOCTfa ksRdIkW3Qxt9H5uAlIEewKbDIN5IIH6HiMQwRxrqV8RDnpExFQqV1gmJjXsWCbMx7SiV UkWk/jQRW4yYZL4Cvr0mm439rjCWV0LKLrTN0M+K3DyerfWgBMrcMderiiZ1YwI4Dkdi EQ/aT0uYYsCeMn0C87+4rOh5Qi2ovaYgconJmyjBEHrGLXqprKEPH94UFS+7Uwo1wSjE uitHuB7G8w6v37RikiO6fFnBmcEK4hxSo2F/Q7cA3uuPfAh4LyiuJtDkHdTC2nDdzCzQ mxkQ== 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=NONE sp=NONE dis=NONE) header.from=naver.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v11si4847845edy.525.2021.08.19.18.11.41; Thu, 19 Aug 2021 18:11:42 -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=NONE sp=NONE dis=NONE) header.from=naver.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB42268A0E9; Fri, 20 Aug 2021 04:11:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kimhwan.kimhwan.kr (unknown [121.172.19.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8585689900 for ; Fri, 20 Aug 2021 04:11:29 +0300 (EEST) Received: from kimhwan.kr (localhost [127.0.0.1]) by kimhwan.kimhwan.kr (8.15.2/8.15.2/Debian-18) with ESMTP id 17K1BNOe2955756; Fri, 20 Aug 2021 10:11:23 +0900 Received: (from kimhwan@localhost) by kimhwan.kr (8.15.2/8.15.2/Submit) id 17K1BMI12955754; Fri, 20 Aug 2021 10:11:22 +0900 From: Kim Hwan To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Aug 2021 10:11:11 +0900 Message-Id: <20210820011111.2955568-1-akon47@naver.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dashenc: changed all filename lengths to MAX_URL_SIZE declared in internal.h. 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 Cc: Kim Hwan Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZMrAHiQTxVnv --- libavformat/dashenc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 679e30611c..2f1275b1ec 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -71,7 +71,7 @@ enum { #define MPD_PROFILE_DVB 2 typedef struct Segment { - char file[1024]; + char file[MAX_URL_SIZE]; int64_t start_pos; int range_length, index_length; int64_t time; @@ -104,7 +104,7 @@ typedef struct OutputStream { AVCodecParserContext *parser; AVCodecContext *parser_avctx; int packets_written; - char initfile[1024]; + char initfile[MAX_URL_SIZE]; int64_t init_start_pos, pos; int init_range_length; int nb_segments, segments_size, segment_index; @@ -126,9 +126,9 @@ typedef struct OutputStream { char codec_str[100]; int written_len; - char filename[1024]; - char full_path[1024]; - char temp_path[1024]; + char filename[MAX_URL_SIZE]; + char full_path[MAX_URL_SIZE]; + char temp_path[MAX_URL_SIZE]; double availability_time_offset; AVProducerReferenceTime producer_reference_time; char producer_reference_time_str[100]; @@ -161,7 +161,7 @@ typedef struct DASHContext { char availability_start_time[100]; time_t start_time_s; int64_t presentation_time_offset; - char dirname[1024]; + char dirname[MAX_URL_SIZE]; const char *single_file_name; /* file names as specified in options */ const char *init_seg_name; const char *media_seg_name; @@ -507,8 +507,8 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s, char *prefetch_url) { DASHContext *c = s->priv_data; int timescale = os->ctx->streams[0]->time_base.den; - char temp_filename_hls[1024]; - char filename_hls[1024]; + char temp_filename_hls[MAX_URL_SIZE]; + char filename_hls[MAX_URL_SIZE]; AVDictionary *http_opts = NULL; int target_duration = 0; int ret = 0; @@ -592,7 +592,7 @@ static int flush_init_segment(AVFormatContext *s, OutputStream *os) os->pos = os->init_range_length = range_length; if (!c->single_file) { - char filename[1024]; + char filename[MAX_URL_SIZE]; snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->initfile); dashenc_io_close(s, &os->out, filename); } @@ -1133,7 +1133,7 @@ static int write_manifest(AVFormatContext *s, int final) { DASHContext *c = s->priv_data; AVIOContext *out; - char temp_filename[1024]; + char temp_filename[MAX_URL_SIZE]; int ret, i; const char *proto = avio_find_protocol_name(s->url); int use_rename = proto && !strcmp(proto, "file"); @@ -1246,7 +1246,7 @@ static int write_manifest(AVFormatContext *s, int final) } if (c->hls_playlist) { - char filename_hls[1024]; + char filename_hls[MAX_URL_SIZE]; // Publish master playlist only the configured rate if (c->master_playlist_created && (!c->master_publish_rate || @@ -1377,7 +1377,7 @@ static int dash_init(AVFormatContext *s) DASHContext *c = s->priv_data; int ret = 0, i; char *ptr; - char basename[1024]; + char basename[MAX_URL_SIZE]; c->nr_of_streams_to_flush = 0; if (c->single_file_name) @@ -1489,7 +1489,7 @@ static int dash_init(AVFormatContext *s) AVFormatContext *ctx; AVStream *st; AVDictionary *opts = NULL; - char filename[1024]; + char filename[MAX_URL_SIZE]; os->bit_rate = s->streams[i]->codecpar->bit_rate; if (!os->bit_rate) { @@ -2316,7 +2316,7 @@ static int dash_write_trailer(AVFormatContext *s) dashenc_delete_media_segments(s, os, os->nb_segments); dashenc_delete_segment_file(s, os->initfile); if (c->hls_playlist && os->segment_type == SEGMENT_TYPE_MP4) { - char filename[1024]; + char filename[MAX_URL_SIZE]; get_hls_playlist_name(filename, sizeof(filename), c->dirname, i); dashenc_delete_file(s, filename); } @@ -2324,7 +2324,7 @@ static int dash_write_trailer(AVFormatContext *s) dashenc_delete_file(s, s->url); if (c->hls_playlist && c->master_playlist_created) { - char filename[1024]; + char filename[MAX_URL_SIZE]; snprintf(filename, sizeof(filename), "%s%s", c->dirname, c->hls_master_name); dashenc_delete_file(s, filename); }