From patchwork Wed Jan 1 00:58:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17084 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp216738qvb; Tue, 31 Dec 2019 16:59:30 -0800 (PST) X-Google-Smtp-Source: APXvYqxislB6FoHu2mW3Ps7CKadYpGn+W6QmsRD9i1Yn6N/cJMdfLvHdJ3C5UCc3v2T1OBub0Gc0 X-Received: by 2002:a17:906:b2c3:: with SMTP id cf3mr78490770ejb.247.1577840369934; Tue, 31 Dec 2019 16:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577840369; cv=none; d=google.com; s=arc-20160816; b=irayld5Wq02GuS0XUNF7Dmzg5/rl65tGlEXVjDX+/o/Om1VpLv8EVmRCBM5mtvsTTi BMa+uYQGKidJfQdNh80YEknM9rOpRRpW3eKN+21ylW3+xPuqv3rYt1oXUKW7xf7TUGmM HBdpM3Jv6YRLodBAOjrzdgwbtrdQTRlc5/SqTPTL/cVCSmcHpXwa0VDE2tSiKhZmaOYV qt18fpTrXgZ2RigwJ81F0T7BLrelkK97ZjfO8a3Suxe/22zBOF5ywljYvEKJUb3YZkMG aiAAur5EVxn6dmPjEFcaTjq+1QTdFUYVlem8ZaIe0aqwRXfzu7UovQ4t0OVjAFYBPHOr j+nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=bL8lMXPvTexdh9VlBatj1btJp+hnCD+3XahugN6WHM4=; b=GRCmIykyZOzzgJM3xILLyTjuAaDy+dtQEtm77AR4eCmEafzZsYZLD4os0ELWACUm5T 0bY81+Wk+swdAg1Yt6eZA/pZfz+pWSMeUCwr7+7IzB2L2GCAuYo7Z1jw2X7oekaGvavG WAZ/pdcZ2/kPdbkLh5KP+TmEtKjzbLsyN1FdgOou3Eyr08dn0n6w4c1CxrDFiiQBclnO c3OBm9+/FDiG8nNka7fPJsDNjnqWqp8pRpLLjYGZgmDBlb1HjGQfrdmXr/OdOs+WaKH1 d9oTqDTOsW3c7XvE0Z14nmZk4ahHEIqjI0h8aWBzpKY87lpJFSbZp3/0MIOUzqN/CTKM klgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EIJYbxBV; 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=QUARANTINE 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 w16si30594243eju.247.2019.12.31.16.59.29; Tue, 31 Dec 2019 16:59:29 -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=EIJYbxBV; 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=QUARANTINE 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 652A468AD2F; Wed, 1 Jan 2020 02:59:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 147AF68ACE8 for ; Wed, 1 Jan 2020 02:59:04 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id d73so2825632wmd.1 for ; Tue, 31 Dec 2019 16:59:04 -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=5gUkiNMzyr46MInQMLLFkeWGc3sd1hk4f35vulxhv0U=; b=EIJYbxBVDMJKYHLQPrNZ2h/BP2/ftUZD5OonC4uv2NSWrQ5lkjBlXRXk2Ryo3PDup/ XO3sh+DksJu7bU0MplyQQL9YMoxaO9Akk8OUZGyIMPV7Ws8dPuE14lGvhhneLjovIq52 e/YQm14hzHWAWPyFIEFPo7YosMuvZdqlgCWFHsxNlbwnBQwhoQYeZllTB1g88dp+NZvT rGn4kvhGr/a0WHuKOTuJyIlJ7hNiokJvLoce3j0WPj1ohMfjvxc+shtm7YHk4mgm+f+n pc1h8DsQ2Jza6sAoJkeUeaJ+2bQKo5P7wmvUro3TQsQCQz7Ekacal09VsSioj68jAqbz ZASQ== 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=5gUkiNMzyr46MInQMLLFkeWGc3sd1hk4f35vulxhv0U=; b=DufNB+HoerqMKVMh4S1AJMJQIQ2ayB7ssrWRf7Ogso820uWd4zmOF0pkvszYrIi9eM 6q9RxkgJs7Sy54OdsLsmcK+e97eVIJaUy1OS7MIl1Fkc/bsI+JX0XVw04Fsl2yuDi29g EAPd0ZzzAgXlemzTUhq3sKCPb0SeUmmKii149jzUeqOE58B3s7WCJfRht+dBybVwO7Ge fMsQ1P3GcG+OLdT0T+foC/WDWUbyguGrDHTQNQ+dqRPoqUCZV0y8f2f+xR7zF82hQTv9 h9VDvlNc3uMicGxJuIsg0g0NayD09c/iMbwe4bz0l4iBYZ/POXD/Cv2qLjMobWKmk0DH T9pA== X-Gm-Message-State: APjAAAUdA8JqDZkFzPPQVMyQJ4yU/Nj/tkpo3/lvlBvVfE7vIYipQapR UifLukA9HP98GNKhDNARed3Q9CBh X-Received: by 2002:a1c:9d81:: with SMTP id g123mr6468394wme.29.1577840343340; Tue, 31 Dec 2019 16:59:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id w17sm52431655wrt.89.2019.12.31.16.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 16:59:02 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 01:58:20 +0100 Message-Id: <20200101005837.11356-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> References: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/20] avformat/matroskaenc: Remove useless 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" X-TUID: DxAfK0aivIwR Content-Length: 3952 Write a few numbers directly via AV_WB32 instead of using an AVIOContext (that is initialized only for this very purpose) to write these numbers at known offsets into a fixed buffer. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index bbf9b55e78..d51c8cbebf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -946,7 +946,6 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, AVStream *st) { - AVIOContext b; ebml_master projection; int side_data_size = 0; uint8_t private[20]; @@ -976,26 +975,24 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); break; case AV_SPHERICAL_EQUIRECTANGULAR_TILE: - ffio_init_context(&b, private, 20, 1, NULL, NULL, NULL, NULL); put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE, MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); - avio_wb32(&b, 0); // version + flags - avio_wb32(&b, spherical->bound_top); - avio_wb32(&b, spherical->bound_bottom); - avio_wb32(&b, spherical->bound_left); - avio_wb32(&b, spherical->bound_right); + AV_WB32(private , 0); // version + flags + AV_WB32(private + 4, spherical->bound_top); + AV_WB32(private + 8, spherical->bound_bottom); + AV_WB32(private + 12, spherical->bound_left); + AV_WB32(private + 16, spherical->bound_right); put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, - private, avio_tell(&b)); + private, 20); break; case AV_SPHERICAL_CUBEMAP: - ffio_init_context(&b, private, 12, 1, NULL, NULL, NULL, NULL); put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE, MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP); - avio_wb32(&b, 0); // version + flags - avio_wb32(&b, 0); // layout - avio_wb32(&b, spherical->padding); + AV_WB32(private , 0); // version + flags + AV_WB32(private + 4, 0); // layout + AV_WB32(private + 8, spherical->padding); put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, - private, avio_tell(&b)); + private, 12); break; }