From patchwork Thu Mar 7 19:55:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 12237 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 99DF3448BB2 for ; Thu, 7 Mar 2019 21:55:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 762A7689DB2; Thu, 7 Mar 2019 21:55:57 +0200 (EET) 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 D2288687EE5 for ; Thu, 7 Mar 2019 21:55:50 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id j3so12085226pgm.11 for ; Thu, 07 Mar 2019 11:55:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wV+JaJ7GuShF5Hn9oo/beu4eqA8YaaeN9ufiJHAJvuk=; b=uVeAqM9WnVjF0ipn85k5AWhdqwvvqvfbRaDNRBCft+Dg4BeoRJa9vWCeUIcYXa1++7 VmODHTeh4FLwo5UCcCXvsexYcNnKMEkx9+4YtM3T0VsQZ7D/P6CmF3K4lDVaz2JVaLpf 0If1OfjGP87ZEznIfTUiH5lb7IUCpOlaYHLSKhCUi/Qm2TWvyFA/b/ftPNHDZ828069R nln/8iVV3tn4lg7QJ0Sgi22XME0EGkGYUpNzNMtWifk/07NqpaNJjahPRtag7o7KnepZ A/ZH3c4JhI0CJdfkbyqW1d9RRW8gPQEW1M+upj24sI3xfi0D17DRYSZ+M31vXc1fQNBw cejg== 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; bh=wV+JaJ7GuShF5Hn9oo/beu4eqA8YaaeN9ufiJHAJvuk=; b=W9ozYNj6s7Jgg4QqE4aUpqeBrp1f0Fk/Etdvo1gy0KmAtlwthhrOnBMxXlYHoplK8L hKkOhVbSiPrAdt8oGPlORpKFfrAPzQNxbH4Bk6pC92G56PgZPhUHPs6WNgMZyrbWrOSz acOVYGZY19k2s6vyfXmq/vNY03Sqtc8Z2PmRP4pC+3jYu/Afdz+TP3c054toede5RM5G 2SrS2JH5Q8J5ZJipezsXT6TFciM5oYcc3Uz/66W37bdC5SRvCU7jccd3ruqBtDBnajrg KSQYtJmURTRCyhr0lzeiTdSTnDRlfLAyp4yU4anyoOVRqGIDUUz+G/XwiKRStqMw7JXG tEdw== X-Gm-Message-State: APjAAAVNnXDGN9ZTuHkgpF6REyPaqWE3bVQFuq911Nce6uqPjwHrk7PT qvNHvv/6tCoOlQJghtD3jN3yZ7Hj X-Google-Smtp-Source: APXvYqx1YWxQP8jcSvM614A4q3D5zi2CdCCgRzdKGkRrFVE6YiqagC1OBY7CSLhkDQeC2MV5Ebr84Q== X-Received: by 2002:a65:60c7:: with SMTP id r7mr13348100pgv.37.1551988547969; Thu, 07 Mar 2019 11:55:47 -0800 (PST) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:0:c55a:d38d:80b7:c831]) by smtp.googlemail.com with ESMTPSA id e14sm18139865pga.61.2019.03.07.11.55.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 11:55:47 -0800 (PST) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2019 11:55:40 -0800 Message-Id: <20190307195540.29436-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] avformat/smoothstreamingenc:add bitrate calculate 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: jun MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: jun Calculate bitrate based on fragment size, only applied when bitrate is not set, for example rtsp source. Signed-off-by: Jun Li --- libavformat/smoothstreamingenc.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 094712af27..75a47a9668 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -320,11 +320,12 @@ static int ism_write_header(AVFormatContext *s) AVDictionary *opts = NULL; if (!s->streams[i]->codecpar->bit_rate) { - av_log(s, AV_LOG_ERROR, "No bit rate set for stream %d\n", i); - ret = AVERROR(EINVAL); - goto fail; + av_log(s, AV_LOG_WARNING, "No bit rate set for stream %d\n", i); + snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(Tmp_%"PRId64")", s->url, i); + } else { + snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->url, s->streams[i]->codecpar->bit_rate); } - snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->url, s->streams[i]->codecpar->bit_rate); + if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { ret = AVERROR(errno); av_log(s, AV_LOG_ERROR, "mkdir failed\n"); @@ -519,7 +520,7 @@ static int ism_flush(AVFormatContext *s, int final) for (i = 0; i < s->nb_streams; i++) { OutputStream *os = &c->streams[i]; - char filename[1024], target_filename[1024], header_filename[1024]; + char filename[1024], target_filename[1024], header_filename[1024], curr_dirname[1024]; int64_t size; int64_t start_ts, duration, moof_size; if (!os->packets_written) @@ -541,6 +542,25 @@ static int ism_flush(AVFormatContext *s, int final) size = os->tail_pos - os->cur_start_pos; if ((ret = parse_fragment(s, filename, &start_ts, &duration, &moof_size, size)) < 0) break; + + if (!s->streams[i]->codecpar->bit_rate) { + int64_t bitrate = (int64_t) size * 8 * AV_TIME_BASE / av_rescale_q(duration, s->streams[i]->time_base, AV_TIME_BASE_Q); + if (!bitrate) { + av_log(s, AV_LOG_ERROR, "calculating bitrate get zero."); + ret = AVERROR(EINVAL); + return ret; + } + + av_log(s, AV_LOG_WARNING, "calculated bitrate: %ld\n", bitrate); + s->streams[i]->codecpar->bit_rate = bitrate; + memcpy(curr_dirname, os->dirname, sizeof(os->dirname)); + snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%"PRId64")", s->url, s->streams[i]->codecpar->bit_rate); + snprintf(filename, sizeof(filename), "%s/temp", os->dirname); + + if ((ret = ff_rename((const char*)curr_dirname, os->dirname, s)) < 0) + return ret; + } + snprintf(header_filename, sizeof(header_filename), "%s/FragmentInfo(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts); snprintf(target_filename, sizeof(target_filename), "%s/Fragments(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts); copy_moof(s, filename, header_filename, moof_size);