From patchwork Thu Mar 14 18:21:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 12307 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 A7AF9447BA7 for ; Thu, 14 Mar 2019 20:27:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7632A68A8F8; Thu, 14 Mar 2019 20:27:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02DA5689D7B for ; Thu, 14 Mar 2019 20:27:44 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id b2so4538682pgl.9 for ; Thu, 14 Mar 2019 11:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=B+tBh8PCDkoMfcbRQsuaELPLXg+BnzRctEuweBYzU18=; b=ly+AeB8tRaZhSuI+9gDGNKd3AA1j6jPMutH/qJFkvTuhJv/zns5TXybeYdNrJto0Ui gp4r/8cWpBiqj7JGbObZHPsM5YbbbVl2yns9QgP1roY0zs4+E8gmVgTpncsmtFezkCCD 993bQuJyvCvvz0/aIgFfNf0xNBZds3O/BsT/64/TXx1vwJmhP+CW5mFeb98DGak9TqGr Z+qIjOUVN97i8Ax+r+/mATeBr2e59D+t7J+iwFwLFmK1XIbE6b7+H6D1gY/SMHY/WST+ yV9N1W0eLpicaqB80yWW/iGZNKH60A/UjAuzVvKju/IAMCQt0ARQAkII8UGk1O3NHEDu 3NbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=B+tBh8PCDkoMfcbRQsuaELPLXg+BnzRctEuweBYzU18=; b=muuoGQfKDjWP3iBYUrymf3r4fIbnkLk+NRbFMrS54L+G9spoY3jCj90fSF+KfOr3Yv 9Q5QES3tElDE/leFEtSgikEXbY1oXnJhirN7H4vPf8fnpTqr3zOxEDQcKql5GHzz8Bd5 jX3YocCyFZvinYxJfv8HoYjIhYYkhm/y+MYWFIE4LaUsPeUI9n6p5nJSAxk4OfijFLXS wl5Vxg5yTlnOKzm1AUsR7GvjQ4RyadkBU+gRsH352dz5kx0Y67l6aH5jCYMlWvkSSjK6 fvb6zFltoE98tWeMJdKFQpJEAIKMmbcDtFzj1CWapkKxWCqNs62wE6xuSycZXruDR3GD oIpQ== X-Gm-Message-State: APjAAAW4i9yy3Ha2no55/9qSQPCU3AURElN3iQ9bh7D0uFlRCgAz9Ffp HcOxfUhe4qTdn8N7xGJDisIv8sNL X-Google-Smtp-Source: APXvYqxHF7+XoBnW8vAWztKuyUm8BRN7ldN0gWXeEeZPQrdaBvFVB6QbXRqaqkBUrxfRv4j6MiTrNQ== X-Received: by 2002:a17:902:7289:: with SMTP id d9mr5995152pll.314.1552587726170; Thu, 14 Mar 2019 11:22:06 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:8:d93:db9c:9387:f9be]) by smtp.googlemail.com with ESMTPSA id q207sm21419175pgq.88.2019.03.14.11.22.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 11:22:05 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2019 11:21:58 -0700 Message-Id: <20190314182158.16464-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 094712af27..30bb188aa2 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -320,11 +320,13 @@ 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); + // create a tmp name for the directory of fragments + 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 +521,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 +543,26 @@ 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); + + // rename the tmp folder back to the correct name since we now have the bitrate + 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);