From patchwork Sun May 28 20:39:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3754 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1179124vsk; Sun, 28 May 2017 13:40:46 -0700 (PDT) X-Received: by 10.28.157.11 with SMTP id g11mr18658339wme.113.1496004046455; Sun, 28 May 2017 13:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496004046; cv=none; d=google.com; s=arc-20160816; b=exGlTN1fu4LXA3/DLu4igYEZTt0Y6Ud7RvLRBIT4YZpdkc7gJd2VDfa1e6Jp0aUFOZ mEl1hfPRhyRHu6VEbynafPg88HeRzNOUrrXeu1Z8LbYlqpdarYQr35ERfJapD0b9p/CN qq7NpPIl/AlRfr2PCMtp750WwiV1CZNHICoJaOEIEvilf3ipTaS+Psf5bnYGDqMZCaTB 7RQ55NCrn/UhpLy61SbVZHzKAH20JEmAaivXKi6PVkzE2FiM7ffqrDqBimSZLWI7oka6 ua5k3CBdgqreR2oyS952jmaSuDAl/EwHuU77px9UYNZU5j5oylCYSK8EfgZFv4NGI68z myzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=3IO2vsFUDK/B2MwmxXEK8j6bGnfJG3deZITcLmCC89Y=; b=W+1uvPpj0D6tAB7Vpj8k9Jav7gOfFDeWdYui0y1EbXyrKFgD08xSj8bJrYPcAmQWGu R3E5YPrx+VtKvQ0vuI5Hq9GIBhbANaS4AA0W1cDBb5GxuZDEHvFpPItTUmKRNidrw3l8 mN6KzSN4IbrPPw25ut6qwNZll6DCHR3eaP0vffX/gZnKBiFPWGslwRr6eUdP7KV1MFeD U2DNqGqANGYVb1eqFXFx82xvAoqg9tu3YTZyS+gjWghWtCQWbCvoN2Ychk5nP7D8Rpci AuOeUwDCLl+XxEHUcYEF8ScBRjGxJYnOeUzfiSIkwyPA5yo7n7ytkQLfXQcFoGH9Qzu8 KBcg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 88si8253447wrf.233.2017.05.28.13.40.45; Sun, 28 May 2017 13:40:46 -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 D0022688336; Sun, 28 May 2017 23:40:38 +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 5EC31680224 for ; Sun, 28 May 2017 23:40:32 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id j13so7201314qta.3 for ; Sun, 28 May 2017 13:40:36 -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=DRiKVjTh3cWpbkCFXyrVVsuhPUzaceSr1OdFMcE5LoM=; b=fej+r9jHijfUq9pLpk4cHNE9j490ZLD6GWUHnyrtJZ1fHYfGY7McHxlh9ZNpd9uMQJ 6qgqrecKiXBsOjA7k1xYEpl3LLZa7xt4nFrCtqZHSZYD/SM1fiROaaVC0gJ61DGB3NpR IWKHsh5EQBCc/F3rnW80sNkfYhnBrNDv6wRGl5Hlv38Acts7obiu3WYBLZI8Ij2bUccC yHeW2/vWzrfYwLIiBzmAQ3H2uRIBfpcWJ2gMJkVo2lzNPzvt2gIj+jGK9liUgteWJXMo OPCXNHb2AxoyReBrTB/NKgx3KrvcPYatUDdGfNZuw1rESYJfj0XNekYDw8+hgKf12UMZ Is0g== 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=DRiKVjTh3cWpbkCFXyrVVsuhPUzaceSr1OdFMcE5LoM=; b=qu0bxXOKmrv278EiG+wQJMqCM3fiiS6ZoPVwrYVSINTYL7rx/zgme7WgMktizEkffH cNgePfHiZqQBdKAG0rqiaabBhxoUEJYc58mFG5emg8hSpBqX+Lhhf4mSrKUxJbmytp20 ArVgHbXskIw9K13ax8o3ZWx8NeqUy6ZQt88uc+nvcWq59y0wqaxOxHEl1RC8ZqV15NHa ZRcbowymRRIhRfIG+sBaOJQTFsnTbE7FLLP+gTzpV9+8IU7ls1mxKyL5u39Wjk8tkpZq mmfd9cUO/tujQfIMYPr/97+PKHKZ/1YbIo64A88/DQnuC0YQ5p9wPh2V2tZiDc/wVZoS qPyQ== X-Gm-Message-State: AODbwcD24ZUPxDpfAoYVYx6ISrY+tRz82L/p/EnSXfmhw+yWuQF/Mwjy 4t9Ea8tTCvzNYpDQ X-Received: by 10.237.34.246 with SMTP id q51mr14068760qtc.39.1496004034765; Sun, 28 May 2017 13:40:34 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id h68sm4950436qkf.7.2017.05.28.13.40.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 May 2017 13:40:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2017 17:39:21 -0300 Message-Id: <20170528203921.2232-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170528200944.6852-1-jamrial@gmail.com> References: <20170528200944.6852-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat/aiffenc: add aiff_init() 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" Signed-off-by: James Almer --- libavformat/aiffenc.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index fcadf149a0..1e0c5b11a0 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -98,13 +98,11 @@ static void put_meta(AVFormatContext *s, const char *key, uint32_t id) } } -static int aiff_write_header(AVFormatContext *s) +static int aiff_init(AVFormatContext *s) { AIFFOutputContext *aiff = s->priv_data; - AVIOContext *pb = s->pb; AVCodecParameters *par; - uint64_t sample_rate; - int i, aifc = 0; + int i; aiff->audio_stream_idx = -1; for (i = 0; i < s->nb_streams; i++) { @@ -126,6 +124,32 @@ static int aiff_write_header(AVFormatContext *s) /* First verify if format is ok */ if (!par->codec_tag) return -1; + + if (!par->bits_per_coded_sample) + par->bits_per_coded_sample = av_get_bits_per_sample(par->codec_id); + if (!par->bits_per_coded_sample) { + av_log(s, AV_LOG_ERROR, "could not compute bits per sample\n"); + return -1; + } + if (!par->block_align) + par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; + + avpriv_set_pts_info(s->streams[aiff->audio_stream_idx], 64, 1, + s->streams[aiff->audio_stream_idx]->codecpar->sample_rate); + + return 0; +} + +static int aiff_write_header(AVFormatContext *s) +{ + AIFFOutputContext *aiff = s->priv_data; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + uint64_t sample_rate; + int aifc = 0; + + par = s->streams[aiff->audio_stream_idx]->codecpar; + if (par->codec_tag != MKTAG('N','O','N','E')) aifc = 1; @@ -165,15 +189,6 @@ static int aiff_write_header(AVFormatContext *s) aiff->frames = avio_tell(pb); avio_wb32(pb, 0); /* Number of frames */ - if (!par->bits_per_coded_sample) - par->bits_per_coded_sample = av_get_bits_per_sample(par->codec_id); - if (!par->bits_per_coded_sample) { - av_log(s, AV_LOG_ERROR, "could not compute bits per sample\n"); - return -1; - } - if (!par->block_align) - par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; - avio_wb16(pb, par->bits_per_coded_sample); /* Sample size */ sample_rate = av_double2int(par->sample_rate); @@ -199,9 +214,6 @@ static int aiff_write_header(AVFormatContext *s) avio_wb32(pb, 0); /* Data offset */ avio_wb32(pb, 0); /* Block-size (block align) */ - avpriv_set_pts_info(s->streams[aiff->audio_stream_idx], 64, 1, - s->streams[aiff->audio_stream_idx]->codecpar->sample_rate); - /* Data is starting here */ avio_flush(pb); @@ -327,6 +339,7 @@ AVOutputFormat ff_aiff_muxer = { .priv_data_size = sizeof(AIFFOutputContext), .audio_codec = AV_CODEC_ID_PCM_S16BE, .video_codec = AV_CODEC_ID_PNG, + .init = aiff_init, .write_header = aiff_write_header, .write_packet = aiff_write_packet, .write_trailer = aiff_write_trailer,