From patchwork Thu Apr 13 19:54:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3404 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp840890vsd; Thu, 13 Apr 2017 12:56:24 -0700 (PDT) X-Received: by 10.223.148.7 with SMTP id 7mr4316369wrq.65.1492113384377; Thu, 13 Apr 2017 12:56:24 -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 m81si14603520wmi.139.2017.04.13.12.56.23; Thu, 13 Apr 2017 12:56:24 -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 sp=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 D38A46899D8; Thu, 13 Apr 2017 22:55:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DCE868992B for ; Thu, 13 Apr 2017 22:55:25 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id r49so9296313qta.1 for ; Thu, 13 Apr 2017 12:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=KLAznBy5gqmqWQYiEx/A21VfZzpIh3ndtjrNnK+jOOI=; b=ZyVEP6Rh4uDgepHMUEdtsvqvA5J4eI2ZtlYdZXqSZtfmabxMeee0sv4BRBRS3R2rFl 4JHda/yJFTAxdJKJS6gPoHkoG6mNJgGHhbhDtFJ1/AdjOflsCk6M5ZSu4yLa+qPmrvLN BL4wu7qAajYusJumoQlhIA+YMo5MWXf69Qhj/KslrAhXVEjwDyscgFiBfPgqBG1g6UsZ cf/R/5SwzhjBb9WyUzlYRhguApPAHjHi4hqUlbS67EitYiclPKNJ/kdJY+TqfaMe4W4A gbnl4OU3zqbyRR4gG+2VH6K3e+tuly+KB+Gakfeulqglgxex2mNS346QNYvd2pi6eH3F xz9A== 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:in-reply-to :references; bh=KLAznBy5gqmqWQYiEx/A21VfZzpIh3ndtjrNnK+jOOI=; b=ob6UGBph72F/RcbGgVfkBnZioYfG30bUYQsvCLApRbXpsoQbNTtMSwbOBydAeltD2m i52yRgzztWlhdE65pWppRLyZOnuITFCP1y5JRyoTRJEouA4wbe3rQBQaNpSiiBF6Li89 dJvXGoizM5tQAc7QIaYXmPiRh4swmBL0Mbdn/vu4I8KhmvxrgoIRRDl3EJZXw4rVHWKn H7KDNiHgda55fDDgwdsNJmwMKjiAdruChm1gyq4s2tvxW86phqLNj1LnFAPSsdKGT0Iy kx7in+QDobrcpzua0ii3getv9xyXNC95Gp139Az6mduWxHc4hYj/9qwTiYfhtM5ut3qr MuLQ== X-Gm-Message-State: AN3rC/7F1cL6FEQZFBRJKGoCGXK5imL7xjtwPX2A69s1Dt+EnCSJ1eH+ fEdNslxk4tiue/FN X-Received: by 10.200.47.16 with SMTP id j16mr4139712qta.222.1492113330501; Thu, 13 Apr 2017 12:55:30 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id g185sm16443226qkc.7.2017.04.13.12.55.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Apr 2017 12:55:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2017 16:54:17 -0300 Message-Id: <20170413195417.9064-6-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170413195417.9064-1-jamrial@gmail.com> References: <20170413195417.9064-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/6] ffmpeg: remove bsf extradata propagation hack 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" The offending bitstream filter was fixed, so this is no longer needed. Signed-off-by: James Almer --- ffmpeg.c | 19 ------------------- ffmpeg.h | 1 - ffmpeg_opt.c | 7 ------- 3 files changed, 27 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e4b94b2fa0..1a0f6a57f1 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -536,7 +536,6 @@ static void ffmpeg_cleanup(int ret) for (j = 0; j < ost->nb_bitstream_filters; j++) av_bsf_free(&ost->bsf_ctx[j]); av_freep(&ost->bsf_ctx); - av_freep(&ost->bsf_extradata_updated); av_frame_free(&ost->filtered_frame); av_frame_free(&ost->last_frame); @@ -835,27 +834,9 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) continue; } else if (ret < 0) goto finish; - /* HACK! - aac_adtstoasc updates extradata after filtering the first frame when - * the api states this shouldn't happen after init(). Propagate it here to the - * muxer and to the next filters in the chain to workaround this. - * TODO/FIXME - Make aac_adtstoasc use new packet side data instead of changing - * par_out->extradata and adapt muxers accordingly to get rid of this. */ - if (!(ost->bsf_extradata_updated[idx - 1] & 1)) { - ret = avcodec_parameters_copy(ost->st->codecpar, ost->bsf_ctx[idx - 1]->par_out); - if (ret < 0) - goto finish; - ost->bsf_extradata_updated[idx - 1] |= 1; - } /* send it to the next filter down the chain or to the muxer */ if (idx < ost->nb_bitstream_filters) { - /* HACK/FIXME! - See above */ - if (!(ost->bsf_extradata_updated[idx] & 2)) { - ret = avcodec_parameters_copy(ost->bsf_ctx[idx]->par_out, ost->bsf_ctx[idx - 1]->par_out); - if (ret < 0) - goto finish; - ost->bsf_extradata_updated[idx] |= 2; - } ret = av_bsf_send_packet(ost->bsf_ctx[idx], pkt); if (ret < 0) goto finish; diff --git a/ffmpeg.h b/ffmpeg.h index 4d0456c1fb..1a381aa345 100644 --- a/ffmpeg.h +++ b/ffmpeg.h @@ -455,7 +455,6 @@ typedef struct OutputStream { AVRational mux_timebase; int nb_bitstream_filters; - uint8_t *bsf_extradata_updated; AVBSFContext **bsf_ctx; AVCodecContext *enc_ctx; diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index d1fe8742ff..08e03c4ef9 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1374,13 +1374,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e if (*bsfs) bsfs++; } - if (ost->nb_bitstream_filters) { - ost->bsf_extradata_updated = av_mallocz_array(ost->nb_bitstream_filters, sizeof(*ost->bsf_extradata_updated)); - if (!ost->bsf_extradata_updated) { - av_log(NULL, AV_LOG_FATAL, "Bitstream filter memory allocation failed\n"); - exit_program(1); - } - } MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, oc, st); if (codec_tag) {