From patchwork Wed Sep 19 13:58:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 10407 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp738424jap; Wed, 19 Sep 2018 06:59:16 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY77+D6xiAVAROKTO9rcMu6Ulf3ovwVp0hDo/MZYihbQr7aq5guYo4H8sjDOcsxDU0d3Osc X-Received: by 2002:a1c:b707:: with SMTP id h7-v6mr19592743wmf.91.1537365556484; Wed, 19 Sep 2018 06:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537365556; cv=none; d=google.com; s=arc-20160816; b=u1nIXjvJ499rr8r0iAq/ncCx3ZRYbm0Rzl1AFUgSDUyLP54376hsE6+qB5rVrVWnA/ 6Z5ziFBCObNAoan3DPAmHuLge5nTUTSmhcU595Xg/dywgZA/L92sPNFgVvvG8OhNv/Hb fl5exfor5bPslcP/eBRc8e6Cr1ZjWhMpXHbDcnaiYj/jJShwhO9rQxF2D3AtO18yg2bA 9Er4TwSK89VycOzgLt800Xw3/xBEBPgFIZF+QmrvvdDj2tpMV+p8KiCcTHEWvAW8Y8Bv Yqr3zRRDPm7UWGbtyvChTiRAGHCU4WNG9er8z9Jx7/OSRh79t3+qnsw9onD/uYi3f7YR P0Dg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to; bh=6cU+YosC7cIaxMav3cstVwvyGWznievY7dTFcWzgytA=; b=HYN8L1IYhtyPCeAhdeFjTAC6uY15v1UBDVoRIgEo9q+TXvgeR514AEJth1m7GN6wLW SdRy75qNnzXf0W3eUO9Cy0aTaQZzijZODC21mntBUuYMAqLQv7eKMu3tdDNBi42reWQC 0S2SZ65xLAqDYf9KxVfsMlT32Grx0+yzU21z1VrJ2+j/nJbnfWJ88IFYmu70JVqnlGAJ uVT5jmMXdLOYSOcgLY3Dv6ryaEi7wHTzaDNQEvJ8HXtSz282kWBcvCUv+kaxnXQUvTIG nRY+pAa71Kwn7heKEPV99/kwt3E2O+h7b3+B/f2oWyMNJxmzj1YPVkSnAgkJIITM3Vix LhkA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 136-v6si14236340wmf.64.2018.09.19.06.59.16; Wed, 19 Sep 2018 06:59:16 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6537468A5F9; Wed, 19 Sep 2018 16:58:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29FF868A308 for ; Wed, 19 Sep 2018 16:58:39 +0300 (EEST) Received: from paradise.fritz.box ([79.223.50.137]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MDzGN-1g1H1i07fr-00HNrl; Wed, 19 Sep 2018 15:58:52 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Wed, 19 Sep 2018 15:58:32 +0200 Message-Id: <7e5a464694286c640d8c8b855371e81bc10699a3.1537349317.git.barsnick@gmx.net> X-Mailer: git-send-email 2.14.4 In-Reply-To: References: In-Reply-To: <7c20364f6ad0f6fb75f3a362ea7da3026c37c53b.1537349317.git.barsnick@gmx.net> References: <34079525021f9afa22dfbae674203b85968be872.1537349317.git.barsnick@gmx.net> <7c20364f6ad0f6fb75f3a362ea7da3026c37c53b.1537349317.git.barsnick@gmx.net> X-Provags-ID: V03:K1:CJEyO9lQVUAcn/BQ580CPq80oBUwtdBF47WdTxTgrQZYMfQkRB/ alja4O5IAT/Xgn+vo7J77kRV7WRwAGSq4psWLScowccY6RpvL088ljl40pRNB/ipwykWxiA ddCsu1hOXZDhSwEWrRrVw0UNsDJWPwTF2+q6g3UdoH33pnVIZIOAghPdoLpWk852/p3cSPt aP0LR+J89h1VBgU/zzUgQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:rjh7C2QT3mg=:7lgrvBoNWhoncK7mVaGz15 dbQDnFCe1ZSSX2UkRsHZBcvTRrMdwWUF8aKNnm2pMIFWfF9EIO7UFT8/FPy5Ku743x8OOPzgx Z36vGMMAsTuVlhMz5s2cb+CIVEMuXyCgcUb+yG6ERtsQkWTmCru/WWEPOseLlS9F1kTYq1Pua 1de82AbQK/zxFcmWYBaz0x6rCQpL7Gv6FLiFnVjcTmmQGRSJ1qzrJgOirOSZL3nXFR7H0SM2t QpnUByxThypVpxfR6T0XGv9bUREeCTll3ZNsVjExlA+92OVUdRiidiyqtzsgPmH222mS/3Myv hQYAoHcqY3KPEDmS6uzTVLQrJlBXqo6/GQ3uOWBRldDWicFyDqAOPXK/mFhVsS2q/FUAlgo7i JPa15Z+cQ/VFshPkyFYwCVxh/kAwZeqQsWBjV9sEn+8LMR7vG8o8FbkKQ3v85USm4+7/UaPHR fcl3AB3InVP/Mf3jiBWtRVMV5onkW2IfoAvWIZWg7MqTrbW5gmGK4N86nj4lN8aC63vC97len Qkoa4FtYloU95lrnbrjXHbgdzyfs0++Fp1DivEg8HM2Y+gCy51dwc9DF+BYB8ooZJko7bG+oK XK3eq0b+anxCYhExYhmu79ukgySaqkaM5rCWwquy6bWXtLj8uXRRnbHWUOjEZq7bCnKTXh/3Y ShI5LGFsPnBqdxx0nUr/bSf6ji5v0spwbx+uXjvrxLc8H2uWJE91/RoNr7RRGM6v+ciYgqCxK k8TlZtZZaNFQLH25cPdMU7SaouY8PH2/4n8wp2uX2nr7Y2Dx6kjZsE8qajYiKU7pMjbz7hVVi g8k7cFCrZjVwmM7gXBZwHo6Hi0V3g== Subject: [FFmpeg-devel] [PATCH 3/3] avformat/movenc: use mov_write_int_metadata() in place of mov_write_tmpo_tag() 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Removes code duplication. Signed-off-by: Moritz Barsnick --- libavformat/movenc.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0bb66e5fd1..52f661e061 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3356,24 +3356,6 @@ static int mov_write_string_metadata(AVFormatContext *s, AVIOContext *pb, return mov_write_string_tag(pb, name, t->value, lang, long_style); } -/* iTunes bpm number */ -static int mov_write_tmpo_tag(AVIOContext *pb, AVFormatContext *s) -{ - AVDictionaryEntry *t = av_dict_get(s->metadata, "tmpo", NULL, 0); - int size = 0, tmpo = t ? atoi(t->value) : 0; - if (tmpo) { - size = 26; - avio_wb32(pb, size); - ffio_wfourcc(pb, "tmpo"); - avio_wb32(pb, size-8); /* size */ - ffio_wfourcc(pb, "data"); - avio_wb32(pb, 0x15); //type specifier - avio_wb32(pb, 0); - avio_wb16(pb, tmpo); // data - } - return size; -} - /* 3GPP TS 26.244 */ static int mov_write_loci_tag(AVFormatContext *s, AVIOContext *pb) { @@ -3552,7 +3534,7 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_covr(pb, s); mov_write_trkn_tag(pb, mov, s, 0); // track number mov_write_trkn_tag(pb, mov, s, 1); // disc number - mov_write_tmpo_tag(pb, s); + mov_write_int_metadata (s, pb, "tmpo", "tmpo" , 2, 2); return update_size(pb, pos); }