From patchwork Sat May 9 19:15:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19582 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 E49394499FD for ; Sat, 9 May 2020 22:15:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7143689B04; Sat, 9 May 2020 22:15:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D082768810F for ; Sat, 9 May 2020 22:15:19 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id k12so13576677wmj.3 for ; Sat, 09 May 2020 12:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9O18EfuBRioPPBGQddzRjZGfUHPHLPgqBTE6aUjSV0M=; b=Xv1Wgd4yDs056jbjICoeLc6Trkq6+xdInLRAMg4fG2SGx8U2AMc2U7jwzKaiD6Kf34 v0WHl8102ccqFppUwEQS4RKRgq74md386LozDU7JngIChByYngfNw9AlnC2esVyC7ZkR Ykh5lmXaMW9Xspd+Yop1YhO85psWGaySkqjZTcO1bTOnHhdcIt1IkAXeo+aiOVs8k+hq yy9NQ/iyLm3hXRmuwIap0/wpGrH4NTZxYoOt0E/WvbBRfqId4gaS1d9vVhy0w/RTvIYR XPemHZle43WtJtvoY5eMfzdauGpidLaMNE00o96u2yoAyzNRhBuIZRbqEfRWEGmgw+0K bxRw== 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:mime-version :content-transfer-encoding; bh=9O18EfuBRioPPBGQddzRjZGfUHPHLPgqBTE6aUjSV0M=; b=J5Hpz3bFCEP8d8ida/SgezUR+rIoTHtaV5nYIVlJvxokH5J9o6T+RdfjQ77U9rtXQX uDSLodd0+dFnrPLMDJUBDFlmGgvaIPDMsBfUpK3jYwhi/+u0k/GAa+naeqvhJ3UwVbVV Zpfio+aAHwPPSVnAkLbx8NH5MsyG/YkX5p+yVeVBoCT220pqBclfejV20dbp8Q4Up2gj 9yPYkdx65Ha5jIt46jSm7gN2GUAtUuy4yt6G5RclZWpwdU7nXwXo3I6sfv11t0rKNJL/ 3lXiSwd8pEnZirx5iDV6NIx9vyGizzu7tRwQK++3NoZTTpHBCgAZluG6YJK9Rdyw0ci5 8YEQ== X-Gm-Message-State: AGi0PuZFaYd2Q+y0ZhnCtjPcO8fxYg6kEGu6xrqppRde4PyfPznpZtpw iFQuIn5ybFpWr45JcNCEH7Og9Lif X-Google-Smtp-Source: APiQypJLod6MyjSJ/gtTXbPQTHtsaRe9WtLyoEORN6IuGFeeODOjXmH3i51kIkC/XJYkV5MP51au9w== X-Received: by 2002:a1c:f609:: with SMTP id w9mr22268132wmc.123.1589051718774; Sat, 09 May 2020 12:15:18 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:04 +0200 Message-Id: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/hlsenc: Don't reset AVIOContext pointer manually a second time 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" ff_format_io_close() already does it for us. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7b289c060f..a796c124dd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2497,7 +2497,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if ((ret = hls_window(s, 0, vs)) < 0) { av_log(s, AV_LOG_WARNING, "upload playlist failed, will retry with a new http session.\n"); ff_format_io_close(s, &vs->out); - vs->out = NULL; if ((ret = hls_window(s, 0, vs)) < 0) { av_freep(&old_filename); return ret; From patchwork Sat May 9 19:15:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19583 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 212ED4499FD for ; Sat, 9 May 2020 22:15:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C2E4689C58; Sat, 9 May 2020 22:15:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66189688399 for ; Sat, 9 May 2020 22:15:37 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id u127so14266229wmg.1 for ; Sat, 09 May 2020 12:15:37 -0700 (PDT) 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=5yO9McnKttFKlgOeUTa4Sm7WxmZxrkLfWJGXiCI89bs=; b=rYe32m96c1r/xS0IJq/cge8CirvVg6EFZoMUTeBBBCXHUexo5FUAt79VBkqU058gMG sDgeFvKLTcQPAJjdkzcUsOlbhs9cng90Zj7aFPpvjzEgcS4ADi4iMjNN3YCa9PI116jF yYKTAXkIvts+j2XkXr0izq+4b6Y4YWfl4QlCmaveqE4BK/bGf7AfPMt/1E3aYK6MesFM PFqiX992g+FRMft5ormQ4nAjVmEdi9oErx/RkjTNMrbjM/fupGS1xPPLrskzFYXzIzqp 8kwtaAkQ5G3NQDce+sHKG2Ps8dFynSgK6YYab2aY6Rxz8qwnQNACYs3Kg4AMXm6B2Fk6 TDqA== 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=5yO9McnKttFKlgOeUTa4Sm7WxmZxrkLfWJGXiCI89bs=; b=gOXMLIJU5NL+6bevTrELIutOAKEDANA6d2p6L22Pt096PdWjDSWLQYYVwg+Gzr+260 aV4ptn9QF4lEwo8rrQjvpvQyDypKU75F4s/h4s+CkPTkoufI9N+Zqh+OH03eunUrG9yU 2ybjyuDYUUQFyq+NV4RDAo/zOVtkKHWilX0IWiTdCQzd8wDyP6wRJ2dQ67X/EfGQBlJB /BKerVqAiv7v+gbwP2kKoJiO3ZMzEWIDc33QKrTPuQc7lZxvjOksFH+sX2X+06dg2/9U czE7ntRimpYVYsqWi06B6F6N5ylGio3AVcyN8UTXZy4o3ZZnKfqI3YoDAnLxz2v1cwyp qaTA== X-Gm-Message-State: AGi0PubajbBslmBFKAQf12mw7zPN9mNMe386giDtZvsicK6iKxfca7dC 4fttvOCHC+E89rGOCru3bLslLlrd X-Google-Smtp-Source: APiQypJlMStzI+i0Eo/uB1f+AGxvJz56cutQ2m8lxJX1/FwtfdmEWCYNIpbwNjNtNJkqlXsEzkET/w== X-Received: by 2002:a1c:305:: with SMTP id 5mr7734959wmd.60.1589051736590; Sat, 09 May 2020 12:15:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:05 +0200 Message-Id: <20200509191509.9812-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/hlsenc: Remove redundant initializations 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" For every variantstream vs, vs->packets_written is set to one, only to be set to zero a few lines below. Given that the relevant structure has been zeroed during the allocation, this commit removes both assignments. A redundant initialization for vs->init_range_length has been removed as well a few lines below. Given that the relevant structure has been zeroed during the allocation, this commit removes both assignments. A redundant initialization for vs->init_range_length has been removed as well. Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a796c124dd..afb4d2a0c0 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -833,7 +833,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) av_dict_copy(&st->metadata, vs->streams[i]->metadata, 0); } - vs->packets_written = 1; vs->start_pos = 0; vs->new_start = 1; @@ -848,9 +847,6 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) } } - vs->packets_written = 0; - vs->init_range_length = 0; - if ((ret = avio_open_dyn_buf(&oc->pb)) < 0) return ret; From patchwork Sat May 9 19:15:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19584 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 0E58B4499FD for ; Sat, 9 May 2020 22:15:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E333B689E53; Sat, 9 May 2020 22:15:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F6D0689DBD for ; Sat, 9 May 2020 22:15:38 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f134so1428356wmf.1 for ; Sat, 09 May 2020 12:15:38 -0700 (PDT) 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=0WSx8O1L2mMw1+HGV0REzcHhmaghgq8hU1oLI3vces8=; b=vMpdpwIerA8+n7XcqM6dIEy7oLZ5OLoaUjwVTDpFE3GhN8MtnnM+ohew51bnU55Gyr AxmP0Win+CT1AaGHZqXf1JDx1B4xOw1uisdj10c5pbd842/PjsS61cqoihhaoNNGSzLG lv9gmeYqGNvbQ5ieumYwhkdhMTU/IlhpfnVHhlbRY9mJMySRnAsJ4kxk8j7RlXlcyOPl tJ+K1fEWV8Mkz0rcY9/zhNeMxWbIcm4RFlrGFxe8QJKQkvOS3EmkvfwRFSBf7uTR7ChU CWgmOYafnet3eYvdQUmXavi8dYf58cXpck6M7AWsTWo2uRZRZoFVrSgmH0Bndk0QYGWk 2B3A== 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=0WSx8O1L2mMw1+HGV0REzcHhmaghgq8hU1oLI3vces8=; b=EXGcbDNUyGX/v5noajQhr/rmw4G55tYPIDeh/futnycG5+deEcq9HmdL5W5+3sRlRT 9aAxmJBGpy8Rg4GT810stvGIj+Z9Gr9oXceCiexmdgctcql85vF6xHy/kdAze5ZRpDkn 5L69mciPthoVnZdFdxywp1x6iIISULImNyYCiIVU+6FQCfx4pNkHM6WlqJLZutwIJmEY OUw4ZfSNuRUHgeU+hV86ChWUxag2Jc3lgQl1qB0gXHWw11cnYNzmhScIzjCZ/UuMt7gO PEnxYyDodo8Ob7Di/sUFag4NN9B8/UxidbkKUyBHVQKSBxuBP1Nx6kCixOvyZGDabXUA KZFw== X-Gm-Message-State: AGi0PuZeGgHQQGdVto+l0YR1pRVz7tmS3zTrbGo/IH/8iDqFSWdKY/gY PTRHZoAT06hgXSoSlMrHQNArDkJk X-Google-Smtp-Source: APiQypLa+GyPkM2tPulvwVvBHPHhSfV24wtQtYfaz3R3R5DkTBXA8s6cEvxcCl8M6d3hccqWWY/xjg== X-Received: by 2002:a7b:ce13:: with SMTP id m19mr21460087wmc.76.1589051737597; Sat, 09 May 2020 12:15:37 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:06 +0200 Message-Id: <20200509191509.9812-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/hlsenc: Don't cast const away 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/hlsenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index afb4d2a0c0..2a0d17baea 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -525,10 +525,10 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, int ret = 0; int segment_cnt = 0; AVBPrint path; - char *dirname = NULL; + const char *dirname = NULL; char *dirname_r = NULL; char *dirname_repl = NULL; - char *vtt_dirname = NULL; + const char *vtt_dirname = NULL; char *vtt_dirname_r = NULL; const char *proto = NULL; @@ -559,7 +559,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, if (segment && !hls->use_localtime_mkdir) { dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url); - dirname = (char*)av_dirname(dirname_r); + dirname = av_dirname(dirname_r); } /* if %v is present in the file's directory @@ -598,7 +598,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, if ((segment->sub_filename[0] != '\0')) { vtt_dirname_r = av_strdup(vs->vtt_avf->url); - vtt_dirname = (char*)av_dirname(vtt_dirname_r); + vtt_dirname = av_dirname(vtt_dirname_r); av_bprint_clear(&path); av_bprintf(&path, "%s%c%s", vtt_dirname, SEPARATOR, From patchwork Sat May 9 19:15:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19585 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 1762E4499FD for ; Sat, 9 May 2020 22:15:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F11E2689EBE; Sat, 9 May 2020 22:15:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A18C2689B76 for ; Sat, 9 May 2020 22:15:39 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id g12so14282146wmh.3 for ; Sat, 09 May 2020 12:15:39 -0700 (PDT) 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=PZ/a/SrTyooyYUey/sFVCW3kw5f7356U3ccsqFYM7+8=; b=WCgs1fMSy3TIPHQtbffszqitUJKsvnRFaiLF+4AcXsqhM57xwhxHR0Xnl2aDIK+7GK tr32X4O44SVa8CgVp2HJOjQy0rem9VZn7aGrPSXyDYYgA1XYnW5BO7iHJgRBJvSsyCQe hv36ZZBlE40zrY2TiNUUVSH+hkxYisPYdZdEoLFD9giDEqx/Rz32APL/oWIqiPPZapGS gQF89HsYElfvg4GeEujwnXGRzFvFI9p8sc69ySmJBycXlblFTuZj61kIC+YteDfX/vLo pc+GLAkG8cqqluTrOWB2a5YEkha45RKFodr/kdnP34Qw12gpYkAzraRteNWTHUrq+g8N jUoQ== 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=PZ/a/SrTyooyYUey/sFVCW3kw5f7356U3ccsqFYM7+8=; b=bm8k4bPj7FHkzFfZonazyjnkaByDa8WB6zjocdPDpuFYfdDiNrocmktT7wh8yZzO/d Wkgwa+DwC97ZnjFobIy4OohNWo9iCEGRWb1aG1TdVRJ75CVeaenppZiRYzyf5eSVpQNi DP3ueTSjSmpHdJAVMlyyhLa4547AbUXYk/qEylPZEh78keeRPf11IgD2NSgynbX/3PJN p4JJc1nfHdgJdQ+Y31A6DRnFmAq4M40ujCjr08zaeCu15Rjp04+421BL2m3CqF8FzIfz PPUQ0M0pnmmvuVfI0MWP+O8k1n9vSQ73C7keS7aQbEkGR0CEXJOO72WrRV6PryMkGStL 6DMg== X-Gm-Message-State: AGi0PuY0Ea/KbLdsMqLYMWn5yF/eFqaVXZKOxaWBBms/Q2oaCfQYkc6p nwmT39JkeJZq11Nm791IjnSR99zZ X-Google-Smtp-Source: APiQypIkFmd50bUMe2td1ue6KIq+2WTP+nPJnA7RYoCF79LdDMjsm+OeY0r5SFoxulNL+vTemLF1MA== X-Received: by 2002:a7b:c38b:: with SMTP id s11mr22583293wmj.55.1589051738567; Sat, 09 May 2020 12:15:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:07 +0200 Message-Id: <20200509191509.9812-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avformat/hlsenc: Simplify setting subtitle basename with av_asprintf 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 --- This patch is designed not to change the output at all. Yet I wonder if instead of p = strrchr(vs->m3u8_name, '.') it should not better be p = strrchr(av_basename(vs->m3u8_name), '.'). Otherwise in a path like "./hlsstream/master" everything after '.' will be treated as extension which does not seem to be intended. The same remark also applies to e.g. the next patch. libavformat/hlsenc.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2a0d17baea..5517cb4354 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2743,9 +2743,8 @@ static int hls_init(AVFormatContext *s) VariantStream *vs = NULL; int basename_size = 0; const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); - const char *vtt_pattern = "%d.vtt"; + const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt"; char *p = NULL; - int vtt_basename_size = 0; int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; @@ -2954,28 +2953,25 @@ static int hls_init(AVFormatContext *s) if (!vs->vtt_oformat) return AVERROR_MUXER_NOT_FOUND; - if (hls->flags & HLS_SINGLE_FILE) - vtt_pattern = ".vtt"; - vtt_basename_size = strlen(vs->m3u8_name) + strlen(vtt_pattern) + 1; + p = strrchr(vs->m3u8_name, '.'); + if (p) + *p = '\0'; - vs->vtt_basename = av_malloc(vtt_basename_size); + vs->vtt_basename = av_asprintf("%s%s", vs->m3u8_name, vtt_pattern); if (!vs->vtt_basename) return AVERROR(ENOMEM); - av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size); - p = strrchr(vs->vtt_basename, '.'); - if (p) - *p = '\0'; if (hls->subtitle_filename) { ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname); if (ret < 0) return ret; } else { - vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename); + vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->m3u8_name); if (!vs->vtt_m3u8_name) return AVERROR(ENOMEM); } - av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size); + if (p) + *p = '.'; } if (hls->baseurl) { From patchwork Sat May 9 19:15:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19586 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 2BC8A4499FD for ; Sat, 9 May 2020 22:15:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1101C68A0C7; Sat, 9 May 2020 22:15:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B954E689E40 for ; Sat, 9 May 2020 22:15:40 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id l18so5864318wrn.6 for ; Sat, 09 May 2020 12:15:40 -0700 (PDT) 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=8pIXV2w5tTtdyCxamIHytVvk/rRewi/YrUFv840lsZA=; b=OImLcZVgW52oy8j1VBpVGW77mMVIRg8+8NV+I8D6NivZhcWoBN+tT4j9xjr6hvVjwD uDTAvjaQxpiv2ZVB7WWPk0LwLYiKOzPXC66D2YU/XGbDBn7+lUau1sKerFwLWMWqtpbb MvX9xirvuEZmqQO+5h3ig8WKzkdl1qn0vxKkFd/wjFGKQYOLkp4vqKo3OwR1GQQjXvDv GnZESkmcOppOsvkyGcgiEk2MZfUY3E2dWp1VN5SwN/cyU4RJsRXdINraN7p5A7OMzQ0o QHLondfKSylk+rH+qBmbkMTUDiGNGP/n/mZFVT6fM5GH3Xef/hHm8nOby0yVmFrUzjt7 OnTg== 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=8pIXV2w5tTtdyCxamIHytVvk/rRewi/YrUFv840lsZA=; b=fdDfK88EvHXcAqKDngHx4wvA2xtYtuv29+gSJZrrq5f8hCDGrGkFzb31RT15+zdydI qJIoKXBkw187dPN9mshqRUoWCSHV3D3BmwOHwFLjFqE256UhaSss/JzqabmW4hfOGQSL WL1PKmdjFrQYdrgKor24h66LNfAM/6ZpfJsLUJic/a1w5hz74seMvIG+f6rkIRhMZeO+ GSFnkrrFXi2cshHJ++/+VZd2LhflTg+1uSKFvNJ5FHVDQaXjSWycSZ7g7bvMoPpwhFXc COZxUECuZXovmkJ8aPfkwkOElhSWj6y0nD9LvnUl2PXrCGExfLHnNZvUM1SWr1CrTlXm dWvQ== X-Gm-Message-State: AGi0PuY/1lggy+DZDcO1OmU2hE7luz2MWkVRRlepAsV0MgKQE5AAJJRV dbYbB19GWsfSC64ytzRCgGlk6wez X-Google-Smtp-Source: APiQypLEvXnAw0yrU9ZmxZuH8b2t9EgbdlscVImFB6he6iKJNxvJ+1O3rdl68pgqhqMqEWlZRjM90g== X-Received: by 2002:adf:f205:: with SMTP id p5mr1846346wro.49.1589051739883; Sat, 09 May 2020 12:15:39 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:38 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:08 +0200 Message-Id: <20200509191509.9812-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/hlsenc: Simplify setting basename with av_asprintf() 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/hlsenc.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5517cb4354..d80852739e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2739,15 +2739,21 @@ static int hls_init(AVFormatContext *s) int i = 0; int j = 0; HLSContext *hls = s->priv_data; - const char *pattern = "%d.ts"; + const char *pattern; VariantStream *vs = NULL; - int basename_size = 0; - const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt"; char *p = NULL; int http_base_proto = ff_is_http_proto(s->url); int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; + if (hls->use_localtime) { + pattern = get_default_pattern_localtime_fmt(s); + } else { + pattern = hls->segment_type == SEGMENT_TYPE_FMP4 ? "%d.m4s" : "%d.ts"; + if (hls->flags & HLS_SINGLE_FILE) + pattern += 2; + } + hls->has_default_key = 0; hls->has_video_m3u8 = 0; ret = update_variant_stream_info(s); @@ -2792,9 +2798,6 @@ static int hls_init(AVFormatContext *s) } } - if (hls->segment_type == SEGMENT_TYPE_FMP4) { - pattern = "%d.m4s"; - } if ((hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) || (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_MICROSECONDS_SINCE_EPOCH) || (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME)) { @@ -2868,34 +2871,16 @@ static int hls_init(AVFormatContext *s) if (ret < 0) return ret; } else { - if (hls->flags & HLS_SINGLE_FILE) { - if (hls->segment_type == SEGMENT_TYPE_FMP4) { - pattern = ".m4s"; - } else { - pattern = ".ts"; - } - } - - if (hls->use_localtime) { - basename_size = strlen(vs->m3u8_name) + strlen(pattern_localtime_fmt) + 1; - } else { - basename_size = strlen(vs->m3u8_name) + strlen(pattern) + 1; - } + p = strrchr(vs->m3u8_name, '.'); + if (p) + *p = '\0'; - vs->basename = av_malloc(basename_size); + vs->basename = av_asprintf("%s%s", vs->m3u8_name, pattern); if (!vs->basename) return AVERROR(ENOMEM); - av_strlcpy(vs->basename, vs->m3u8_name, basename_size); - - p = strrchr(vs->basename, '.'); if (p) - *p = '\0'; - if (hls->use_localtime) { - av_strlcat(vs->basename, pattern_localtime_fmt, basename_size); - } else { - av_strlcat(vs->basename, pattern, basename_size); - } + *p = '.'; } if (hls->segment_type == SEGMENT_TYPE_FMP4) { From patchwork Sat May 9 19:15:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19587 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 03F894499FD for ; Sat, 9 May 2020 22:15:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E09E268A14B; Sat, 9 May 2020 22:15:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB2C9689E39 for ; Sat, 9 May 2020 22:15:41 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id 50so5337899wrc.11 for ; Sat, 09 May 2020 12:15:41 -0700 (PDT) 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=jk62F+XV+ceM2op2a1534XiltqsIbgr8EizWjW32zPI=; b=Yu184gJ4O/ot2qZLVOefFmBfcAbL0bArz+HFYtZWZH49eiNP5uqZ9YnIOUlXcXGXo7 bvYJHLMgMxQeOr5w4ACzf5Ok6OIk/CF1TxcnCNzWRagxN/xZOHuxZkpKU3i7oUnpuz6t rPyZLc1E8L7IjuXrl+xOHWQtgV6rhwzR6V1rY1sgC3RGn2x4E+CzXWa7tWpYygqwQTnH CKVOYF9sbbzum0qliLU2KhDjRL9HnjUjLbKmptU7PZNs1AAGvcnTGRLJcpMyKcZYFEfV ajjC9ztLJ7RO2S5yxOQ2h9Z6LurtrOiE3nCzB8dragk32duWBnDDU+2XmmO6N3wX6qBd L9UA== 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=jk62F+XV+ceM2op2a1534XiltqsIbgr8EizWjW32zPI=; b=g0M5vk6dGX/BXRCEFsJ2HW9s53LsQXRJ+UwBu2TbusOFsdkgH/hRz/O2UtjKkg96Mp GTl3Sa6mMlavVD2zbk0Q2RdinyuiR6XhPbjbuYgbCrCWWlsu9opkvmE2/aNSHDS3FtKe Mhz6vFe8hiMAKjTcSDgIuiyzByuszasuvaU/Kmnr2BmDW668GKMUekHRsdJ1QbFjCxv7 WJD8PCrmh66lO7BjtXdyvaSGaaX7WYLjZwnHoDMRJ/aFObucQQAhEu9LYknG7O8pZG/B JA1tYWmW9Ssyht8jnTizPEwhZcpRSsPv8m0oc8C2PW6s8nv4WlQU69tGVrUtRhZhY1eb LNJQ== X-Gm-Message-State: AGi0PuaHACjLNf6Ryw8XgzLUBIY71EPMvLq2TNYYSv4Rux2RYdB2lQg4 dZSSagwMVGmeaanakfIsiTCOV6jk X-Google-Smtp-Source: APiQypJwCKKe/OTO6m9kMUH4O10THdJVRxyCHJaX0hQoKYfevFH8d2sKcatiJ1DiVgppTfPcT2VA7A== X-Received: by 2002:adf:e4cf:: with SMTP id v15mr9436883wrm.43.1589051740936; Sat, 09 May 2020 12:15:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w9sm10055217wrc.27.2020.05.09.12.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:15:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 May 2020 21:15:09 +0200 Message-Id: <20200509191509.9812-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> References: <20200509191509.9812-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/hlsenc: Simplify setting base_output_dirname 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 --- The usage of fmp4_init_filename_len is weird: It is basically used for two different purposes: The length of vs->fmp4_init_filename_len and the length of vs->base_output_dirname (this name is btw misleading because it is not a dirname at all). And given that it's scope is the whole function, the second time vs->fmp4_init_filename was allocated it also contained enough space to contain the whole of vs->m3u8_name. Furthermore, there seems to be a misconception in the way the fmp4_init_filename_len is calculated in case of more than one varstreams: It is incremented by strlen("_%d"), yet the string is not built by inserting "_%d" into the other string; instead if no %v is present in the string and if there is more than varstream, then it is created by inserting "_%d", where %d is replace by the actual index of the varstream. And this can take more than three bytes. But it is not dangerous: fmp4_init_filename_len is incremented by strlen("_%d") on every iteration of the loop. I also pondered using av_append_path_component() in the case that p is not NULL below; yet this might swallow a "/" and I don't know if it would make a difference. (Is it actually allowed to use an absolute path for hls->fmp4_init_filename? If one does so, said path will still be treated as relative to the directory of vs->m3u8_name.) I can also give vs->fmp4_init_filename a similar treatment; yet before doing so I'd like to know if it is intentional that a "%v" in hls->fmp4_init_filename only gets replaced if there is more than one varstream (in other cases a %v also gets replaced when one only has one varstream). libavformat/hlsenc.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d80852739e..be54957e9d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2908,24 +2908,18 @@ static int hls_init(AVFormatContext *s) return ret; } - fmp4_init_filename_len = strlen(vs->m3u8_name) + - strlen(vs->fmp4_init_filename) + 1; - - vs->base_output_dirname = av_malloc(fmp4_init_filename_len); - if (!vs->base_output_dirname) - return AVERROR(ENOMEM); - - av_strlcpy(vs->base_output_dirname, vs->m3u8_name, - fmp4_init_filename_len); - p = strrchr(vs->base_output_dirname, '/'); + p = strrchr(vs->m3u8_name, '/'); if (p) { - *(p + 1) = '\0'; - av_strlcat(vs->base_output_dirname, vs->fmp4_init_filename, - fmp4_init_filename_len); + char tmp = *(++p); + *p = '\0'; + vs->base_output_dirname = av_asprintf("%s%s", vs->m3u8_name, + vs->fmp4_init_filename); + *p = tmp; } else { - av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, - fmp4_init_filename_len); + vs->base_output_dirname = av_strdup(vs->fmp4_init_filename); } + if (!vs->base_output_dirname) + return AVERROR(ENOMEM); } }