From patchwork Tue Dec 3 17:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16564 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BFCE444ACC9 for ; Tue, 3 Dec 2019 19:09:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACBAB68B4A4; Tue, 3 Dec 2019 19:09:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFA6E68B4A2 for ; Tue, 3 Dec 2019 19:09:33 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id q9so2668640wmj.5 for ; Tue, 03 Dec 2019 09:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D+IpHbOWZ3xgWi8QtiWDTGB9PQxVCABzfTa/FlPe91k=; b=hkcFKLPL2ZpF/KZB4o2mRP+UaJaqF2tnZfLNKlzYK2mChSV/SjA8TTT4+wXX6v60oa 8Jte24rRq0xQixzY4Z4WW2yJXhTXVjjpgraDIww00jpbZnqx+1bzXm5wztob5vks0OJA 2awehQQCUgE7H6N6lpK1u1xZQrptTHoFjV2btxQwPPNnqC3WSctGqm5T3M1W3uFF2oDM yyOw0epe+8GJOJIViCfIomDHQHRLswJ+YxUrMrajLTKaLqgcQJzs3kfGyyRx53LgOcBl uTcnbZQKRS4r5gmz9s9G8OyeoY2zmQYfbWT9eqjG8VSYTUgfb42W/WGSciPiP+61pbM2 uAVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D+IpHbOWZ3xgWi8QtiWDTGB9PQxVCABzfTa/FlPe91k=; b=cYXGpCLNi3tG9NsZgFHfxh+F3EcR3koPlfKCH6CkBgfMg5tWbb8Hp2kmBbLD2GApPG YpwRExBZsnOuQbVHZI/hla9tfA2o5FNB5547JcQI2qHxUpHEB+ljWO1HAv/avldwMSi3 fjiqQgbiU4cEF6k2mPtQHHslLT4edeUfqWHFzxJ6h3wJjPreN0TKT83/NO0wdCPrcMxN W/yBQJioR60fwWVObw/Cnq18xvps8GWbKGoT74A4TkLJorgTTrFVOTrS1wElGqdSQ73G wLHm2AqL3Od4L0TQ0IGH2vm1avweGL3ecopiLrw6MLap8kzkweFj+0xJevdLh1WZ60jh 9X5A== X-Gm-Message-State: APjAAAXFVclbcAXKXAnU9ujANefRpSPg4bTJxeHjvTJnAXSQH7mmlOeP qR+0VPpO1Pwm5usgmJBzAt+PO5C4 X-Google-Smtp-Source: APXvYqyYc7ai1siLQKO90A8aZyw1ZHZPKMVpyW0i8Bu0ZnwfmEljaIHxRuW44/EBEnN21/qTXY1dtg== X-Received: by 2002:a7b:cbc4:: with SMTP id n4mr34602773wmi.118.1575392973285; Tue, 03 Dec 2019 09:09:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id x21sm3513630wmj.44.2019.12.03.09.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 09:09:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 18:09:05 +0100 Message-Id: <20191203170910.5310-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191203170910.5310-1-andreas.rheinhardt@gmail.com> References: <20191203170910.5310-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] avformat/matroskadec: Use bytestream API instead of AVIOContext 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It avoids the overhead of function calls. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d50211bf4f..32bd6b8446 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2545,6 +2545,7 @@ static int matroska_parse_tracks(AVFormatContext *s) memcpy(&extradata[12], track->codec_priv.data, track->codec_priv.size); } else if (codec_id == AV_CODEC_ID_TTA) { + uint8_t *ptr; if (track->audio.channels > UINT16_MAX || track->audio.bitdepth > UINT16_MAX) { av_log(matroska->ctx, AV_LOG_WARNING, @@ -2562,16 +2563,15 @@ static int matroska_parse_tracks(AVFormatContext *s) extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!extradata) return AVERROR(ENOMEM); - ffio_init_context(&b, extradata, extradata_size, 1, - NULL, NULL, NULL, NULL); - avio_write(&b, "TTA1", 4); - avio_wl16(&b, 1); - avio_wl16(&b, track->audio.channels); - avio_wl16(&b, track->audio.bitdepth); - avio_wl32(&b, track->audio.out_samplerate); - avio_wl32(&b, av_rescale((matroska->duration * matroska->time_scale), - track->audio.out_samplerate, - AV_TIME_BASE * 1000)); + ptr = extradata; + bytestream_put_be32(&ptr, AV_RB32("TTA1")); + bytestream_put_le16(&ptr, 1); + bytestream_put_le16(&ptr, track->audio.channels); + bytestream_put_le16(&ptr, track->audio.bitdepth); + bytestream_put_le32(&ptr, track->audio.out_samplerate); + bytestream_put_le32(&ptr, av_rescale(matroska->duration * matroska->time_scale, + track->audio.out_samplerate, + AV_TIME_BASE * 1000)); } else if (codec_id == AV_CODEC_ID_RV10 || codec_id == AV_CODEC_ID_RV20 || codec_id == AV_CODEC_ID_RV30 ||