From patchwork Wed Sep 28 18:29:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Toohill X-Patchwork-Id: 770 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp566390vsd; Wed, 28 Sep 2016 11:37:19 -0700 (PDT) X-Received: by 10.28.136.195 with SMTP id k186mr1226590wmd.39.1475087839286; Wed, 28 Sep 2016 11:37:19 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u141si10546212wmu.24.2016.09.28.11.37.17; Wed, 28 Sep 2016 11:37:19 -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=@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 3A06F689F48; Wed, 28 Sep 2016 21:37:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 275F4689C90 for ; Wed, 28 Sep 2016 21:36:57 +0300 (EEST) Received: by mail-pf0-f182.google.com with SMTP id q2so20003746pfj.3 for ; Wed, 28 Sep 2016 11:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PzZpDHRiMPZaVCd1efgbpHbfuXFfHKFdKlXK/l3/Rqw=; b=mxFD+q+LnVqM6XvIBkiHs4C0avBIHmjbNgdVuQFX3m/lbwjK/pkle5ZKyzw2/GdW3b DCD2LUgJuKtZ0m19zkSdm6Go3vgHuuS09Bq3C5kZ7CRrUCERDMxCErB9MUZuSRMa5Is3 T8rbqgjx47R+B8mVedLuykmxjY4Ojfc8lVgpsDPTj24ORu1YaaHwF9gFLl1WTFb3TEVZ o5LGX4pT9/22XQSTmhkuZcm7xpzLlO1Igh4vVNliUwVixuArif0mforqqY+bvv4h5IRS LtBkIWzN2Q5bIBs7TgrvIzHzLBY2XByr05cAZk9qe/zSIB6qK+o9ZlMQDqUBJebpCDT9 19LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PzZpDHRiMPZaVCd1efgbpHbfuXFfHKFdKlXK/l3/Rqw=; b=UeDboOIsGJYpoKoxaGBMrLijze5ybtE0qyagREeuBB5ftAJKVhZ13wbLJm048AcLQ1 +OGfdVF8HY9JamKXsEMW3mCWe2Z+0pXQuR6KfPJcv7hxDwKa7k8VLel+DjojPT2C2RtO TuctqR3L4iKriZR1i0/PYt4mvCLEU2xv5n/GX89Q3m5I97v1NCEO8EmglqGgTbzLpGBu rcTxaTOKifIRmfY8RZaEqCldUbFD5Nf9lr0rBczv5ctmTiSB3LuR0taP5jYOFR7q1t2k Gu/8jt4Q5HGKuia+7vQMHSV/XALsbI7Cn2xPG5KI53PVSxSMa3yQUhnICWZ4w9CvUTFe sNkg== X-Gm-Message-State: AE9vXwPd7Jv09p668v3maLiPTsYZ4ZnvZ6WVdidxkrUP+wmT7E6434ksuJfcMnx4BSLlNAta X-Received: by 10.98.91.197 with SMTP id p188mr60225575pfb.101.1475087367461; Wed, 28 Sep 2016 11:29:27 -0700 (PDT) Received: from mungolini.mtv.corp.google.com ([100.96.2.73]) by smtp.gmail.com with ESMTPSA id wa9sm14248493pac.35.2016.09.28.11.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Sep 2016 11:29:25 -0700 (PDT) From: Jon Toohill To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2016 11:29:03 -0700 Message-Id: <1475087343-29745-6-git-send-email-jtoohill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475087343-29745-1-git-send-email-jtoohill@google.com> References: <1475087343-29745-1-git-send-email-jtoohill@google.com> Subject: [FFmpeg-devel] [PATCH 4/4] lavf/mp3dec: read encoder delay/padding from Info 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: Jon Toohill MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mp3dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 56c7f8c..9cc85a3 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -239,6 +239,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, mp3->start_pad = v>>12; mp3-> end_pad = v&4095; + st->codecpar->initial_padding = mp3->start_pad + 528 + 1; + st->codecpar->trailing_padding = mp3->end_pad; st->start_skip_samples = mp3->start_pad + 528 + 1; if (mp3->frames) { st->first_discard_sample = -mp3->end_pad + 528 + 1 + mp3->frames * (int64_t)spf;