From patchwork Mon Nov 20 20:44:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6236 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4392464jah; Mon, 20 Nov 2017 12:45:32 -0800 (PST) X-Google-Smtp-Source: AGs4zMbgNnPqYo70yIbWjwZx/cjGdDemgN7HX2gjpbfsvViV6c7+Az7XAkhZZTSAtnhSimoJj25Z X-Received: by 10.223.187.78 with SMTP id x14mr11539615wrg.192.1511210731955; Mon, 20 Nov 2017 12:45:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511210731; cv=none; d=google.com; s=arc-20160816; b=CqEnDzSi1tuJh51bnPs0WPVQmbPua6GMPlmhH+RqeV8iRoVtK+em9550bTg++62Cv7 CAlUle/1G3bQ1WV9rpT1x1bQucClUAdPb9zQzX7BFrpolIroKPdAu8N5usuU63D8y4vz sicKV0OHrCA0prEFl4aD5z+j635HPtnpTBdxy+8VY/lKpJkoXl24SBXfC5MIB8cpU6r7 dOFydADPUt0cxs2o+JKNgYS9GOxpV4rOufq2wWmNQjytePpsBmFdcMyGz8n1eu2m3oOm hI5IIpi8s4lWA6WAf+hIH9Wa40wvTLvclRU4SwiDD0cCVFTS48wMTzMKJ+0ZYTFuuSSn f2bw== 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=MKb9bHX6nffjMotLNh3SXDlxSaq0VCOtta5/cWOtaho=; b=d0c27nLD1Mc7UgT/pYJxFFc8BRiWJoR+nTYhIKOraDm2SEPSgH6s8/5Wru92kiOQ9N ugakeIrmN1eM/cd4KX1haOnziWtAmq/XFIGvSdwT/4a3fMkWISo7nGlYH3APte3h691g OPxGSIq1J4+N/niGYB4ZKNPWsWPZDQ74JbUudUkgYe+GX9Oe/w9ScHavWVpxQjnRSg7h Ry+g4PGPCLR8+Ar+UkomQW1E5CZ6NMo/dJ3bnfc5At2gGPdpLFk6NBG5PiywMIQ0qhni Xabj+/I6bUxhT/n1GakOuMaQZjrSEw46UbBN6m6huu4YLrO1ezflbFSOQOk6Ch1Ccxlo HxTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VzZ2WGzg; 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 m44si9165052wrf.516.2017.11.20.12.45.31; Mon, 20 Nov 2017 12:45:31 -0800 (PST) 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 header.s=20161025 header.b=VzZ2WGzg; 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 4C771689EAE; Mon, 20 Nov 2017 22:45:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BA11689A32 for ; Mon, 20 Nov 2017 22:45:00 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id h42so16368272qtk.11 for ; Mon, 20 Nov 2017 12:45:18 -0800 (PST) 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=1mOM/6ak34G52oTdzklRe0Kr22rNACeOiHWxeosV+6E=; b=VzZ2WGzgpWvgLucvJD0LOq4fk7vStRc//p2baCT9GY1Q72wUuJ41PdTtEat8SHCRdx 21DvodoYZD/V/kBTpb0+VTaKhmO3se5+Q66tYtkXT1CKGB5/QkceZuTCuPWGppjpM9+l sTqixiICnA2HGKrTGvriyn1fBEd/sFurOApMFKilzNOcOkKAdkULC3HeXNqzg6/eJ/aN 7Mp/8GLTmLUUpPl1wdbP7UVP8QxaArsTyhr7RcOXMiZzqUQRBFQLB5wSP96LwwzskSVF SXN6yA1Sk/YPWNiiI+R+UE/CpDDKDO4lKGUkyr4+A7nUcA/GCJ5PwJWR4r/0mGXWW9OL lb2w== 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=1mOM/6ak34G52oTdzklRe0Kr22rNACeOiHWxeosV+6E=; b=OAYxGjXaSFgbU1Xiz7goZdnu7Hk2p0gHJCuCiZnOp+cHw4EaY+ZYSjmC6pt1jEUpqs ZmtqPXIzCzvh8Gv/8gheSQUZkUiOFQBOn+4rOpCrrx0Wc8LBHLid4xjetfqW8jpsCqNQ vt3ZWtF2uYD5M9I1LtIvl50HO30PX/Q7jjCRv9av6uSUy92qgXD4Ka1yKXl7vvu0Khvl DA0XzSdQCP+J79b9SC5wzrdpzhvy29FD2IhI9clr+9XaJ59tjo684XKGowOipPWbOd7N JCrVBE5JZoCtLvWCELpnvBerxB9O2ERRfZ6NlpxQJIvMy+1TCPTpWxkvOuwxvy+mzlZm YIoA== X-Gm-Message-State: AJaThX4YF5Q1fYiVykbpKIywlHH+KR0/839UEZ4RXhAeqjKIzfRYEms+ NXUUXVTisjBX+ZGazG45PziYzw== X-Received: by 10.200.53.139 with SMTP id k11mr23379504qtb.77.1511210716891; Mon, 20 Nov 2017 12:45:16 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id b202sm7513526qkg.18.2017.11.20.12.45.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 12:45:16 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 17:44:56 -0300 Message-Id: <20171120204456.804-2-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171120204456.804-1-jamrial@gmail.com> References: <20171120204456.804-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/ttaenc: add tta_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/ttaenc.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libavformat/ttaenc.c b/libavformat/ttaenc.c index b05705b6b6..add15873d0 100644 --- a/libavformat/ttaenc.c +++ b/libavformat/ttaenc.c @@ -35,16 +35,17 @@ typedef struct TTAMuxContext { int last_frame; } TTAMuxContext; -static int tta_write_header(AVFormatContext *s) +static int tta_init(AVFormatContext *s) { TTAMuxContext *tta = s->priv_data; - AVCodecParameters *par = s->streams[0]->codecpar; - int ret; + AVCodecParameters *par; if (s->nb_streams != 1) { av_log(s, AV_LOG_ERROR, "Only one stream is supported\n"); return AVERROR(EINVAL); } + par = s->streams[0]->codecpar; + if (par->codec_id != AV_CODEC_ID_TTA) { av_log(s, AV_LOG_ERROR, "Unsupported codec\n"); return AVERROR(EINVAL); @@ -54,6 +55,23 @@ static int tta_write_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } + /* Prevent overflow */ + if (par->sample_rate > 0x7FFFFFu) { + av_log(s, AV_LOG_ERROR, "Sample rate too large\n"); + return AVERROR(EINVAL); + } + tta->frame_size = par->sample_rate * 256 / 245; + avpriv_set_pts_info(s->streams[0], 64, 1, par->sample_rate); + + return 0; +} + +static int tta_write_header(AVFormatContext *s) +{ + TTAMuxContext *tta = s->priv_data; + AVCodecParameters *par = s->streams[0]->codecpar; + int ret; + if ((ret = avio_open_dyn_buf(&tta->seek_table)) < 0) return ret; @@ -66,13 +84,6 @@ static int tta_write_header(AVFormatContext *s) avio_wl16(s->pb, par->channels); avio_wl16(s->pb, par->bits_per_raw_sample); avio_wl32(s->pb, par->sample_rate); - /* Prevent overflow */ - if (par->sample_rate > 0x7FFFFFu) { - av_log(s, AV_LOG_ERROR, "Sample rate too large\n"); - return AVERROR(EINVAL); - } - tta->frame_size = par->sample_rate * 256 / 245; - avpriv_set_pts_info(s->streams[0], 64, 1, par->sample_rate); return 0; } @@ -167,6 +178,7 @@ AVOutputFormat ff_tta_muxer = { .priv_data_size = sizeof(TTAMuxContext), .audio_codec = AV_CODEC_ID_TTA, .video_codec = AV_CODEC_ID_NONE, + .init = tta_init, .write_header = tta_write_header, .write_packet = tta_write_packet, .write_trailer = tta_write_trailer,