From patchwork Tue Mar 5 19:25:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 12201 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 E1E6C447848 for ; Tue, 5 Mar 2019 21:25:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF98668A4D9; Tue, 5 Mar 2019 21:25:33 +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 CC5F0680801 for ; Tue, 5 Mar 2019 21:25:26 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id j3so6290123pgm.11 for ; Tue, 05 Mar 2019 11:25:26 -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=0ZvO5/JqmhyVnSjAkUXZFEip+xRP7ktUsLaT1hdREJo=; b=T8T4jPQ8H5DQ98MGVJIw3L8r6PhAV4XE6G99JM7JOwUpkgEle75YbjXcoyCZ2l7D6I nUzd5bZmgxEnVB/lX9G6U/1Urb1IRCy49WoB0z1yXdi6DOVZvpbCIR7O78EEJnSV5/2E Jz2wpoFylMZfob/hi2U8Sg3+Dz3LUbaNVYF/nI9t/YiyV1LzMv98eybZHo6wx/WmdG2g wHG5cVnzoDU9WGuPHbhDfxi8UqcBcwwpu/5f0i7ZSiMmpa1HLuIgBFJcooyZG53yP4cv X8xSckBxuBQWoNTfyNuKdwy7gpHb6J6XZILF3YbVnZZsjWKvTnKbIOnrlDu2YuSycNFV WjLw== 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=0ZvO5/JqmhyVnSjAkUXZFEip+xRP7ktUsLaT1hdREJo=; b=s1NcKnBoHfwi8EOKM57BURT93OuTt9S6KFQtFX9lB+O3c4dNdrz+8H8x0pg0jM9Zl9 6Q1TqFzuImsfnWZNABQGMKBwYIOs+tlDVhHooj3pFq8Axfun/moqopOpkHU3iU83If5L lL5CexGqnUdcruhl775NES9IbkjVnnXnChFLFT+BajoTnn+fvG60K7+EDqiRJ7I6ik1a K5Z1bNwWT5YatFGbO8+T7FUubZNp07dwwFPLG4ImsS0nrib8+1Gv8v55aUUsCmHWkusr 2U2v5JyHOl5FIRQjEWLL3ebunfkm8ZUiHyIwOR0Izt4nbZ8XuSjbLumDfTd2FqaHbYMP hxRw== X-Gm-Message-State: APjAAAVItlRaCR8fCIcNTcSdr12UusQyZlH1cenC261v+rRJYxcDnQw4 UsRO/9UrIaXJt5Q51+e+6wjbhtbg X-Google-Smtp-Source: APXvYqznfEk4caDIyV7bikr48aSjLsFNS272MHOjbbp6cBIB1e5jP0CSCSQifL4UFh+Pj1MVUUSOJQ== X-Received: by 2002:a17:902:5066:: with SMTP id f35mr2960915plh.184.1551813924417; Tue, 05 Mar 2019 11:25:24 -0800 (PST) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:7:ac56:a32e:8fb8:35c]) by smtp.googlemail.com with ESMTPSA id 20sm12410036pgr.80.2019.03.05.11.25.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 11:25:23 -0800 (PST) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2019 11:25:11 -0800 Message-Id: <20190305192511.5423-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v1] 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..1d969ab037 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_INFO, "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);