From patchwork Mon Sep 16 11:25:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15099 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 77E57448FB1 for ; Mon, 16 Sep 2019 14:25:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 617AD68815D; Mon, 16 Sep 2019 14:25:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 993E268811B for ; Mon, 16 Sep 2019 14:25:38 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id 4so19637960pgm.12 for ; Mon, 16 Sep 2019 04:25: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; bh=l8XaBVK1UsNMegnpT+c2Rk/+YVZ6or16IHVDAwPLTkU=; b=Ul5mHbE6nA4MMVfHntcvrLaayjsN/SK067WFlrBIsOSVS4jrpLRyG2BbkOXWMhxRKE pM5+agdt10b0z//nF3xeCMYjpYfgNBH9bb9Fw9jMAdHBVjnbxea6Cmda7dMzlU3P3Fhs xu61K9HAa+fxe7gBsUCt/xVvQnsKUBcPmjy5WsU48z7mXFATYIhgQa9ItggjN+gko4aA JYuWY960f7Q5ZDjTpRvqaJ/Z9TvwaX+Wb8up8GLjarUklXL8xQQ9mieroamgVzDD1QKZ mZaBMXo9tXc9J1srwTTzSf26jD4kLGRqVwaXB2Z6vvGG6AuN2ZVuDMXbxC2vEpFoTywy qhzg== 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; bh=l8XaBVK1UsNMegnpT+c2Rk/+YVZ6or16IHVDAwPLTkU=; b=pC6/kjdcfsG3lzy4JhfEPX4wQkzPumsR9TwGbHDjC/TPllc0xEAibgP+0Cj26exEHb akRKUuNdcwJQc7lvi5aTsoT/YG4yN7tJMJhumLEmTERdrFrILNquYN7E7ibXyRY+gvPt tQK4Akoo1ypwoEEiQYxTNrxRprKiDcytC3DoC2pw3DxWYzByE9htGtSc4iXJBwqTqFjF k8PRe8LxAYrUWiiY5uSvWtW/SX2PpnqwcIhb6/RiUuHoq3jDPkYlyNioVKa/c/++nPV7 xUbpeeK7ocCyPZVFbcZiDw6WkZIYeJAfiz9TKifuaLfr5Oss2zwKReoxBw7JYhRuciI5 G9yQ== X-Gm-Message-State: APjAAAW+REIKjp3Kw87yiCz6lytf0wrJDK+dy6HHAkKBqUm6ZvP5GFHp mw5aK5p+QbzrwAZLmZxJznE3PczA X-Google-Smtp-Source: APXvYqwfegwW+g5Ir6X8cbI1SrkUmKfFHKSlLDM+2Fpeg+3e0vMCBujW2+UEHnLBSsULFPak1s4iQw== X-Received: by 2002:a17:90a:cf0c:: with SMTP id h12mr12265013pju.110.1568633136852; Mon, 16 Sep 2019 04:25:36 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id d14sm9985039pjx.8.2019.09.16.04.25.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 04:25:36 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2019 19:25:16 +0800 Message-Id: <20190916112516.14285-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190916112516.14285-1-lance.lmwang@gmail.com> References: <1568595818-7943-1-git-send-email-lance.lmwang@gmail.com> <20190916112516.14285-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/4] avformat/hlsenc: replace with av_freep for all av_free 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 753addcbde..784a2b5ec0 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -590,7 +590,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, if ((ret = vs->vtt_avf->io_open(vs->vtt_avf, &out, sub_path, AVIO_FLAG_WRITE, &options)) < 0) { if (hls->ignore_io_errors) ret = 0; - av_free(sub_path); + av_freep(&sub_path); goto fail; } ff_format_io_close(vs->vtt_avf, &out); @@ -598,18 +598,18 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n", sub_path, strerror(errno)); } - av_free(sub_path); + av_freep(&sub_path); } av_freep(&path); previous_segment = segment; segment = previous_segment->next; - av_free(previous_segment); + av_freep(&previous_segment); } fail: - av_free(path); - av_free(dirname); - av_free(vtt_dirname); + av_freep(&path); + av_freep(&dirname); + av_freep(&vtt_dirname); return ret; } @@ -887,7 +887,7 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls strlen(vs->current_segment_final_filename_fmt)) { char * new_url = av_strdup(vs->current_segment_final_filename_fmt); if (!new_url) { - av_free(en); + av_freep(&en); return AVERROR(ENOMEM); } ff_format_set_url(vs->avf, new_url); @@ -898,8 +898,8 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_size flag\n", vs->avf->url); - av_free(filename); - av_free(en); + av_freep(&filename); + av_freep(&en); return AVERROR(EINVAL); } ff_format_set_url(vs->avf, filename); @@ -912,8 +912,8 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_time flag\n", vs->avf->url); - av_free(filename); - av_free(en); + av_freep(&filename); + av_freep(&en); return AVERROR(EINVAL); } ff_format_set_url(vs->avf, filename); @@ -985,7 +985,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_index flag\n", oc->url); - av_free(filename); + av_freep(&filename); return AVERROR(EINVAL); } ff_format_set_url(oc, filename); @@ -999,7 +999,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_size flag\n", oc->url); - av_free(filename); + av_freep(&filename); return AVERROR(EINVAL); } ff_format_set_url(oc, filename); @@ -1010,7 +1010,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_time flag\n", oc->url); - av_free(filename); + av_freep(&filename); return AVERROR(EINVAL); } ff_format_set_url(oc, filename); @@ -1098,7 +1098,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, if ((ret = hls_delete_old_segments(s, hls, vs)) < 0) return ret; } else - av_free(en); + av_freep(&en); } else vs->nb_entries++; @@ -1207,7 +1207,7 @@ static void hls_free_segments(HLSSegment *p) while (p) { en = p; p = p->next; - av_free(en); + av_freep(&en); } } @@ -1574,7 +1574,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) #else vs->basename, 'd', vs->sequence) < 1) { #endif - av_free(filename); + av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); } @@ -1619,7 +1619,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) #else vs->basename, 'd', vs->sequence) < 1) { #endif - av_free(filename); + av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); } @@ -1633,7 +1633,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) #else vs->vtt_basename, 'd', vs->sequence) < 1) { #endif - av_free(filename); + av_freep(&filename); av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", vs->vtt_basename); return AVERROR(EINVAL); } @@ -2101,7 +2101,7 @@ static int update_variant_stream_info(AVFormatContext *s) hls->var_streams[0].streams = av_mallocz(sizeof(AVStream *) * hls->var_streams[0].nb_streams); if (!hls->var_streams[0].streams) { - av_free(hls->var_streams); + av_freep(&hls->var_streams); return AVERROR(ENOMEM); } @@ -2109,7 +2109,7 @@ static int update_variant_stream_info(AVFormatContext *s) if (hls->nb_ccstreams) { hls->var_streams[0].ccgroup = av_strdup(hls->cc_streams[0].ccgroup); if (!hls->var_streams[0].ccgroup) { - av_free(hls->var_streams); + av_freep(&hls->var_streams); return AVERROR(ENOMEM); } } @@ -2306,7 +2306,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (!vs->init_range_length) { range_length = avio_close_dyn_buf(oc->pb, &buffer); avio_write(vs->out, buffer, range_length); - av_free(buffer); + av_freep(&buffer); vs->init_range_length = range_length; avio_open_dyn_buf(&oc->pb); vs->packets_written = 0; @@ -2375,8 +2375,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) reflush_dynbuf(vs, &range_length); ret = hlsenc_io_close(s, &vs->out, filename); } - av_free(vs->temp_buffer); - av_free(filename); + av_freep(&vs->temp_buffer); + av_freep(&filename); } } @@ -2394,7 +2394,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) vs->end_pts = pkt->pts; vs->duration = 0; if (ret < 0) { - av_free(old_filename); + av_freep(&old_filename); return ret; } } @@ -2406,7 +2406,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) ff_format_io_close(s, &vs->out); vs->out = NULL; if ((ret = hls_window(s, 0, vs)) < 0) { - av_free(old_filename); + av_freep(&old_filename); return ret; } } @@ -2432,7 +2432,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) sls_flag_file_rename(hls, vs, old_filename); ret = hls_start(s, vs); } - av_free(old_filename); + av_freep(&old_filename); if (ret < 0) { return ret; @@ -2519,7 +2519,7 @@ static int hls_write_trailer(struct AVFormatContext *s) filename = av_asprintf("%s", oc->url); } if (!filename) { - av_free(old_filename); + av_freep(&old_filename); return AVERROR(ENOMEM); } @@ -2532,7 +2532,7 @@ static int hls_write_trailer(struct AVFormatContext *s) range_length = avio_close_dyn_buf(oc->pb, &buffer); avio_write(vs->out, buffer, range_length); - av_free(buffer); + av_freep(&buffer); vs->init_range_length = range_length; avio_open_dyn_buf(&oc->pb); vs->packets_written = 0; @@ -2574,10 +2574,10 @@ static int hls_write_trailer(struct AVFormatContext *s) if (ret < 0) av_log(s, AV_LOG_WARNING, "Failed to upload file '%s' at the end.\n", oc->url); } - av_free(vs->temp_buffer); + av_freep(&vs->temp_buffer); failed: - av_free(filename); + av_freep(&filename); av_write_trailer(oc); if (oc->url[0]) { proto = avio_find_protocol_name(oc->url); @@ -2587,7 +2587,7 @@ failed: // rename that segment from .tmp to the real one if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) { hls_rename_temp_file(s, oc); - av_free(old_filename); + av_freep(&old_filename); old_filename = av_strdup(oc->url); if (!old_filename) {