From patchwork Tue Aug 9 12:00:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 128 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp605235vsd; Tue, 9 Aug 2016 05:02:22 -0700 (PDT) X-Received: by 10.28.191.14 with SMTP id p14mr20161453wmf.39.1470744142803; Tue, 09 Aug 2016 05:02:22 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u1si34512927wju.85.2016.08.09.05.02.22; Tue, 09 Aug 2016 05:02:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70C3E68A269; Tue, 9 Aug 2016 15:02:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC62368A242 for ; Tue, 9 Aug 2016 15:01:55 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o80so2658609wme.0 for ; Tue, 09 Aug 2016 05:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=f4YbCk2NTmD7cG6RbsX/7mBMUTh3852eFgbtYxLyH1Y=; b=YAdp01PvTMjNGZgQeZ+ZMUac2QYtERp9euocUwHIllu+PWPmVgKZUOMX+T8FRlmgJk 3UL6rcIp+USQbHy/hb0+rFOVBFh7lOFsvWur6z3OHAm0QgIUteQ9ihWv0hHlCNQD2GMm IOnFCA2aBxBhb1MqGmorr+FoOQQabz1pgfBxj/Iie+A/c/nmee0fay2FDpLHUpr79Pdd 9sj4zG8RuAgyQnRD3tJpcvRwCiPsC+Sf98hWXn6RL23rLqYgGmAcX5Olwa8TpQbpzyVD nzQB5uy2t0GE2hOjx/BIDd3S0ZTQwZ40pk+7d3FyNneDTKPp3c98iuwe98mcbstyj8sm 4XCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f4YbCk2NTmD7cG6RbsX/7mBMUTh3852eFgbtYxLyH1Y=; b=j6FWW3xD3KmZCr/3gGRfnrwB0cI6JZzZ79yeSB3MpYLPKOzQp13YGfWxaYunerdjb0 Hu8wSj3LWQegfrx1VokPGzBCrdjiMs6xUBvYuMYQUP8XFQkc7rNYNLruIzbAuuE0sMAb m7dnZNbNXLLt4TcGDDvVyO+5yohqd59ep/zQ2HhjXIWSw4hp5oROWmEl7s5sUgKie5OR Ju6qfTIyKKXNq3VquRPVxoPIy+0WifpsvNljyWe0xkQpTd1YLh0Na4RxpBeM+W+TVc3u 6tkM2CNxTnq1WEuu3hY3qSVRafxXeFpF11UKh6++TQoZm5aae+S2yAUzoeISjO3cD6kz wwQg== X-Gm-Message-State: AEkoous3XvvauN+aUvPjNezN0nW13t1oGfxX5NqlJBFDvNaj76+tser7zyT9QyzDpRsOpg== X-Received: by 10.28.139.144 with SMTP id n138mr21754996wmd.71.1470744123753; Tue, 09 Aug 2016 05:02:03 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id p4sm37616873wjq.27.2016.08.09.05.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 05:02:02 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2016 14:00:24 +0200 Message-Id: <1470744024-19256-1-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH v3 5/5] avformat/tee: Use BSF list API 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: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky Signed-off-by: Jan Sebechlebsky --- Changes since the last version of patch: - removed parse_bsfs() function I accidentaly left out (it's replaced by av_bsf_list_parse_str()) libavformat/tee.c | 120 ++++++++++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 5689ca3..7218b02 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -37,7 +37,7 @@ typedef enum { typedef struct { AVFormatContext *avf; - AVBitStreamFilterContext **bsfs; ///< bitstream filters per stream + AVBSFContext **bsfs; ///< bitstream filters per stream SlaveFailurePolicy on_fail; @@ -64,46 +64,6 @@ static const AVClass tee_muxer_class = { .version = LIBAVUTIL_VERSION_INT, }; -/** - * Parse list of bitstream filters and add them to the list of filters - * pointed to by bsfs. - * - * The list must be specified in the form: - * BSFS ::= BSF[,BSFS] - */ -static int parse_bsfs(void *log_ctx, const char *bsfs_spec, - AVBitStreamFilterContext **bsfs) -{ - char *bsf_name, *buf, *dup, *saveptr; - int ret = 0; - - if (!(dup = buf = av_strdup(bsfs_spec))) - return AVERROR(ENOMEM); - - while (bsf_name = av_strtok(buf, ",", &saveptr)) { - AVBitStreamFilterContext *bsf = av_bitstream_filter_init(bsf_name); - - if (!bsf) { - av_log(log_ctx, AV_LOG_ERROR, - "Cannot initialize bitstream filter with name '%s', " - "unknown filter or internal error happened\n", - bsf_name); - ret = AVERROR_UNKNOWN; - goto end; - } - - /* append bsf context to the list of bsf contexts */ - *bsfs = bsf; - bsfs = &bsf->next; - - buf = NULL; - } - -end: - av_free(dup); - return ret; -} - static inline int parse_slave_failure_policy_option(const char *opt, TeeSlave *tee_slave) { if (!opt) { @@ -135,14 +95,8 @@ static int close_slave(TeeSlave *tee_slave) ret = av_write_trailer(avf); if (tee_slave->bsfs) { - for (i = 0; i < avf->nb_streams; ++i) { - AVBitStreamFilterContext *bsf_next, *bsf = tee_slave->bsfs[i]; - while (bsf) { - bsf_next = bsf->next; - av_bitstream_filter_close(bsf); - bsf = bsf_next; - } - } + for (i = 0; i < avf->nb_streams; ++i) + av_bsf_free(&tee_slave->bsfs[i]); } av_freep(&tee_slave->stream_map); av_freep(&tee_slave->bsfs); @@ -312,7 +266,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) "output '%s', filters will be ignored\n", i, filename); continue; } - ret = parse_bsfs(avf, entry->value, &tee_slave->bsfs[i]); + ret = av_bsf_list_parse_str(entry->value, &tee_slave->bsfs[i]); if (ret < 0) { av_log(avf, AV_LOG_ERROR, "Error parsing bitstream filter sequence '%s' associated to " @@ -325,6 +279,31 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) av_dict_set(&options, entry->key, NULL, 0); } + for (i = 0; i < avf2->nb_streams; i++){ + if (!tee_slave->bsfs[i]) { + /* Add pass-through bitstream filter */ + ret = av_bsf_get_null_filter(&tee_slave->bsfs[i]); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, + "Failed to create pass-through bitstream filter: %s\n", + av_err2str(ret)); + goto end; + } + } + + tee_slave->bsfs[i]->time_base_in = avf2->streams[i]->time_base; + ret = avcodec_parameters_copy(tee_slave->bsfs[i]->par_in, + avf2->streams[i]->codecpar); + + ret = av_bsf_init(tee_slave->bsfs[i]); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, + "Failed to initialize bitstream filter(s): %s\n", + av_err2str(ret)); + goto end; + } + } + if (options) { entry = NULL; while ((entry = av_dict_get(options, "", entry, AV_DICT_IGNORE_SUFFIX))) @@ -349,20 +328,16 @@ static void log_slave(TeeSlave *slave, void *log_ctx, int log_level) slave->avf->filename, slave->avf->oformat->name); for (i = 0; i < slave->avf->nb_streams; i++) { AVStream *st = slave->avf->streams[i]; - AVBitStreamFilterContext *bsf = slave->bsfs[i]; + AVBSFContext *bsf = slave->bsfs[i]; + const char * bsf_name; av_log(log_ctx, log_level, " stream:%d codec:%s type:%s", i, avcodec_get_name(st->codecpar->codec_id), av_get_media_type_string(st->codecpar->codec_type)); - if (bsf) { - av_log(log_ctx, log_level, " bsfs:"); - while (bsf) { - av_log(log_ctx, log_level, "%s%s", - bsf->filter->name, bsf->next ? "," : ""); - bsf = bsf->next; - } - } - av_log(log_ctx, log_level, "\n"); + + bsf_name = bsf->filter->priv_class ? + bsf->filter->priv_class->item_name(bsf) : bsf->filter->name; + av_log(log_ctx, log_level, " bsfs: %s\n", bsf_name); } } @@ -506,13 +481,32 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) av_packet_rescale_ts(&pkt2, tb, tb2); pkt2.stream_index = s2; - if ((ret = av_apply_bitstream_filters(avf2->streams[s2]->codec, &pkt2, - tee->slaves[i].bsfs[s2])) < 0 || - (ret = av_interleaved_write_frame(avf2, &pkt2)) < 0) { + ret = av_bsf_send_packet(tee->slaves[i].bsfs[s2], &pkt2); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, "Error while sending packet to bitstream filter: %s\n", + av_err2str(ret)); ret = tee_process_slave_failure(avf, i, ret); if (!ret_all && ret < 0) ret_all = ret; } + + do { + ret = av_bsf_receive_packet(tee->slaves[i].bsfs[s2], &pkt2); + if (ret < 0) + break; + + av_packet_rescale_ts(&pkt2, tb, tb2); + ret = av_interleaved_write_frame(avf2, &pkt2); + } while (!ret); + + if (ret == AVERROR(EAGAIN)) { + ret = 0; + } else if (ret < 0) { + ret = tee_process_slave_failure(avf, i, ret); + if (!ret_all && ret < 0) + ret_all = ret; + } + } return ret_all; }