From patchwork Thu Jul 28 16:18:16 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: 18 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp886257vsd; Thu, 28 Jul 2016 09:31:52 -0700 (PDT) X-Received: by 10.194.87.101 with SMTP id w5mr37031919wjz.94.1469723512594; Thu, 28 Jul 2016 09:31:52 -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 pu8si13905975wjb.242.2016.07.28.09.31.52; Thu, 28 Jul 2016 09:31:52 -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 7DEF068A3DC; Thu, 28 Jul 2016 19:31:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F340668A3DC for ; Thu, 28 Jul 2016 19:31:37 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id x83so11927557wma.3 for ; Thu, 28 Jul 2016 09:31:42 -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:in-reply-to:references; bh=rVweo33KLYbnOHE/+U26cSfd4GYMaOvts9eLgnV+KRI=; b=M5mudk+uYRAl8m/s9y21rHsO++86Nm8jBiXTqJwA3nPA4hLI9gnuUYk01Bkd2N/ZGg nFP35Tey2JcXCGjCKVuB1XNddhGxkleMNelULsfV4Y6KmfP3RvO1rHrMnQPS8gt/T3EC c/hi4PggE8WZMs5WA03KhQzrY5ulORS0KflIhXUNdmemw/bwwn/XWfGvkhbr/n2SlO5j C8KHW3uOzuHbVi7K9U4XnBzQdK+rcCh22xSzrX3ViDaMb3Rjjj2glc1xbwo+KQinr4qn aZGNYrnre9ioFmcTP4digioRHrHRxfmxEm6qP68uUYo/cHcijV5Nqs6AINBbn6b/osK5 as/g== 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:in-reply-to :references; bh=rVweo33KLYbnOHE/+U26cSfd4GYMaOvts9eLgnV+KRI=; b=M+Tzxe8jgwVIaV5qRNQffdSOdup8l2l1nH85hvSaCmQ8E2AXRISmf9xtnnLL3Fx4lM FjRVNIt7i/6kjK5gGMQ8aJ+lMMuY6II2p/Q1aE7QMnWpz+dB0vwRcIMZ8ONSB9mI8E0r xYSthMVY/h8FOdN2qHmqoUu7RBsq9b3vMLjhjGLMKMYRUOnfVoRNAy9dC6SvHpUJ0DQH MqglZbogmikEV3Kkhvtk3Blfb2+icEC5buJO/HQs0KXiFwmq8e9lWV2chc1rXuGdWRbw UTavzVtPMweE+iwh7nW2fy1TI2Msp8s0BcIw0MTtSjJH2Vv+Gp6nTxxLOLiGSPGMIrLW yADA== X-Gm-Message-State: ALyK8tJdO/K9UiFug438GxpJ3OHZ8zas9VYznu4gMfLz/O/z+/X14hAKNn85RBO4usKphQ== X-Received: by 10.28.150.146 with SMTP id y140mr42737688wmd.32.1469722717778; Thu, 28 Jul 2016 09:18:37 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id i80sm12961969wmf.11.2016.07.28.09.18.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jul 2016 09:18:37 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jul 2016 18:18:16 +0200 Message-Id: <1469722696-2018-5-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469722696-2018-1-git-send-email-sebechlebskyjan@gmail.com> References: <1469722696-2018-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 --- libavformat/tee.c | 123 +++++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 65 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index b4158e1..1a055cd 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -36,7 +36,7 @@ typedef enum { typedef struct { AVFormatContext *avf; - AVBitStreamFilterContext **bsfs; ///< bitstream filters per stream + AVBSFContext **bsfs; ///< bitstream filters per stream SlaveFailurePolicy on_fail; @@ -104,46 +104,6 @@ fail: return ret; } -/** - * 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) { @@ -175,14 +135,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); @@ -352,7 +306,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 " @@ -365,6 +319,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))) @@ -389,20 +368,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); } } @@ -541,18 +516,36 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) ret_all = ret; continue; } - tb = avf ->streams[s ]->time_base; + tb = tee->slaves[i].bsfs[s2]->time_base_out; tb2 = avf2->streams[s2]->time_base; - 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; }