From patchwork Fri Jan 27 00:47:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Snowhill X-Patchwork-Id: 2331 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5963vsb; Thu, 26 Jan 2017 16:48:39 -0800 (PST) X-Received: by 10.223.130.232 with SMTP id 95mr5992905wrc.34.1485478118958; Thu, 26 Jan 2017 16:48:38 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v61si3925987wrc.210.2017.01.26.16.48.38; Thu, 26 Jan 2017 16:48:38 -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; 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 A903368A7E6; Fri, 27 Jan 2017 02:48:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5495C68A6AF for ; Fri, 27 Jan 2017 02:48:28 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id f144so17415111pfa.2 for ; Thu, 26 Jan 2017 16:48:29 -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; bh=yLx1jrDuT6fjqsb/VnZsJb5Am2l5D7AYg6nwHuNU/D8=; b=LJjPQzoZ91RVyUHk1apauMX3BsmMCFdCBXnKnEUDlDcliIApFfKfLsIXEb1t+NfQqv 1cEILBM84Dy6SLhqDzSodrvRmWpUA6md/bZyZtpTT1jMGoNdWEDvREWC8D6KjJUI3BlC kHWXuySULHPKqUmQwL+nHycSyhLGBMTVGZ1me1uU3ArCtIJPgY8o8air5cSLjnTVumig JoUTiSGf4ZvVSKHfv0t5YwBYQVP4UfzXEzAtOVaEI1wu206PtxORb70iESghB6FQ/cY8 jBi6peZeAY7AYHouepcXB9Vmy5c/O2rqh0TU6gzL2mXAw/vIG3T2pgjmMer0B470EXzW WvMQ== 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; bh=yLx1jrDuT6fjqsb/VnZsJb5Am2l5D7AYg6nwHuNU/D8=; b=R7aKsoCSbpYx7zv1rRN+e/IY8YsvEcvK0/7F17NooZFqnpuLm1PrpJP0T37Hri6whJ 2ElVC8fPqJ+sSAhbZ5+Rg1s/3vdsqo+JW7sfrUGO4dDdcOE9gCJZb/LlEom5MwfuZZD9 Q/Art55g+MP0tXeWn6zB/5TQG5F8j/VQsAUKN0j8q04nc8IT4/E1qZ1IBJ+V/8hYQm11 c8UkTuCJSVnIbffGk+liv2TxP57AmwySVcMJVfXxRmfB8B1oyAZnk3wV8bXGFoHCXk2k 4ScRKmeEc8tU03hii/CR4fh6NklbB5zx69NZRhF6m3MfQAwdEPcpYgrzHkj3QhApjpTw K1KQ== X-Gm-Message-State: AIkVDXKPbZWRlKhEPjTAmweVbE3q90aRHwNvRyyEgZrx3Q46XGwNsx7YgGZcgI+CV6grCg== X-Received: by 10.99.2.151 with SMTP id 145mr6371019pgc.5.1485478107648; Thu, 26 Jan 2017 16:48:27 -0800 (PST) Received: from localhost.localdomain ([2602:306:30b9:e21f:2da0:8f12:1e95:c885]) by smtp.gmail.com with ESMTPSA id i21sm6023564pfi.94.2017.01.26.16.48.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jan 2017 16:48:27 -0800 (PST) From: Christopher Snowhill To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Jan 2017 16:47:12 -0800 Message-Id: <20170127004712.17308-2-kode54@gmail.com> X-Mailer: git-send-email 2.10.1.windows.1 In-Reply-To: <20170127004712.17308-1-kode54@gmail.com> References: <20161209143912.GI4749@nb4> <20170127004712.17308-1-kode54@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat: parse iTunes gapless information 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: Christopher Snowhill MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Christopher Snowhill --- libavformat/mp3dec.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 099ca57..b895e37 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -295,6 +295,66 @@ static void mp3_parse_vbri_tag(AVFormatContext *s, AVStream *st, int64_t base) } } +static void mp3_parse_itunes_tag(AVFormatContext *s, AVStream *st, MPADecodeHeader *c, int64_t base, int vbrtag_size, unsigned int *size, uint64_t *duration) +{ + uint32_t v; + AVDictionaryEntry *de; + MP3DecContext *mp3 = s->priv_data; + size_t length; + uint32_t zero, start_pad, end_pad; + uint64_t last_eight_frames_offset; + int64_t temp_duration, file_size; + int i; + + if (!s->metadata || !(de = av_dict_get(s->metadata, "iTunSMPB", NULL, 0))) + return; + + length = strlen(de->value); + + /* Minimum length is one digit per field plus the whitespace, maximum length should depend on field type + * There are four fields we need in the first six, the rest are currently zero padding */ + if (length < (12 + 11) || length > (10 * 8 + 2 * 16 + 11)) + return; + + file_size = avio_size(s->pb); + if (file_size < 0) + file_size = 0; + + if (sscanf(de->value, "%"PRIx32" %"PRIx32" %"PRIx32" %"PRIx64" %"PRIx32" %"PRIx64, &zero, &start_pad, &end_pad, &temp_duration, &zero, &last_eight_frames_offset) < 6 || + temp_duration < 0 || + start_pad > (576 * 2 * 32) || + end_pad > (576 * 2 * 64) || + (file_size && (last_eight_frames_offset >= (file_size - base - vbrtag_size)))) { + *duration = 0; + return; + } + + *duration = temp_duration; + + mp3->start_pad = start_pad; + mp3->end_pad = end_pad; + if (end_pad >= 528 + 1) + mp3->end_pad = end_pad - (528 + 1); + st->start_skip_samples = mp3->start_pad + 528 + 1; + av_log(s, AV_LOG_DEBUG, "pad %d %d\n", mp3->start_pad, mp3->end_pad); + if (!s->pb->seekable) + return; + + *size = (unsigned int) last_eight_frames_offset; + if (avio_seek(s->pb, base + vbrtag_size + last_eight_frames_offset, SEEK_SET) < 0) + return; + + for (i = 0; i < 8; i++) { + v = avio_rb32(s->pb); + if (ff_mpa_check_header(v) < 0) + return; + if (avpriv_mpegaudio_decode_header(c, v) != 0) + break; + *size += c->frame_size; + avio_skip(s->pb, c->frame_size - 4); + } +} + /** * Try to find Xing/Info/VBRI tags and compute duration from info therein */ @@ -303,8 +363,10 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) uint32_t v, spf; MPADecodeHeader c; int vbrtag_size = 0; + unsigned int size = 0; MP3DecContext *mp3 = s->priv_data; int ret; + uint64_t duration = 0; ffio_init_checksum(s->pb, ff_crcA001_update, 0); @@ -327,16 +389,29 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base) mp3_parse_vbri_tag(s, st, base); if (!mp3->frames && !mp3->header_filesize) + vbrtag_size = 0; + + mp3_parse_itunes_tag(s, st, &c, base, vbrtag_size, &size, &duration); + + if (!mp3->frames && !size && !duration) return -1; /* Skip the vbr tag frame */ avio_seek(s->pb, base + vbrtag_size, SEEK_SET); - if (mp3->frames) + if (duration) + st->duration = av_rescale_q(duration, (AVRational){1, c.sample_rate}, st->time_base); + else if (mp3->frames) st->duration = av_rescale_q(mp3->frames, (AVRational){spf, c.sample_rate}, st->time_base); if (mp3->header_filesize && mp3->frames && !mp3->is_cbr) st->codecpar->bit_rate = av_rescale(mp3->header_filesize, 8 * c.sample_rate, mp3->frames * (int64_t)spf); + if (size) { + if (duration) + st->codecpar->bit_rate = av_rescale(size, 8 * c.sample_rate, duration); + else if (mp3->frames) + st->codecpar->bit_rate = av_rescale(size, 8 * c.sample_rate, mp3->frames * (int64_t)spf); + } return 0; }