From patchwork Thu Jun 21 16:58:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Otto X-Patchwork-Id: 9467 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:115:0:0:0:0:0 with SMTP id c21-v6csp63073jad; Thu, 21 Jun 2018 09:59:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJcQRUbuM4Bpv8HmTE8F52y7Tka92FpSJX61chm5xhWLbSj7ERGxg6arEOsjFcpiv8x088+ X-Received: by 2002:a1c:5c82:: with SMTP id q124-v6mr6201381wmb.24.1529600339926; Thu, 21 Jun 2018 09:58:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529600339; cv=none; d=google.com; s=arc-20160816; b=KjrTctMc1OwhZvmulh/LYV5vmLu5MYuhF4qUl6drU8Lq+y5UHHxWYt3LFY1A+0A8Dq GIdV5E3zcfYGMGHdtSYXSwf4pMal6JmKYwqo4OzUXWsw6r9xAL7nVyH4PzeC3yw+gC+O A5aKulus96Dy8DtyLitL882j6qCrilKCyZZ0oR8J2XruBvjRQ9S9UGDDf/BAmTxAkyI2 i1YvOMDmq0xpIk8nSzTKKoBIsgUMKpBGNVGAcSpi1r0IAwAGiMrB1bYqM//cMUgRhuAn K5up+7vZx/kl814AQDNqUQl7qp837EMS8q6G8oG869D2ymgpHRMPT0B6MLJKqXeWvKgy V/pA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=A3Bv3L1QhjCLoYLvN6Bre76CxTkNtXvsoKG5tbw/v+s=; b=0EssH9aF7RnltBviwVkDMweAwU2N9zsvA1WfZs3v+JN/8d7nLCgGTKdIi8SJmecbqR CdCko/4G3poO3VAaY+xpmvoDQlcs5j7kGwBdwacNf82eF0zhaWIpbCsI/lFTC+d2p4qP +yO0dwulnW9WcFccuKH/MI94dBkcZsLAXDyv/7pG7105KAUeRdo++mwmrg6NbKdSsq0z 71zVkQmu97dlLv/YTYwtMKm2G4886uumAF906ia94Zw2D1jcUcWsj8SKHBvkNHmN6NYn u/sjvoO2v80BHVJoJ2t7sueEmtkcEVxI8SmhJRI2j9cpDx500mZZsG0DmPDtUApGFGGk wN2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@posteo.de header.s=2017 header.b=WQJGAU9x; 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=posteo.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k16-v6si5000187wmh.219.2018.06.21.09.58.57; Thu, 21 Jun 2018 09:58:59 -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=@posteo.de header.s=2017 header.b=WQJGAU9x; 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=posteo.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D52568A68C; Thu, 21 Jun 2018 19:57:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 751D368A623 for ; Thu, 21 Jun 2018 19:57:34 +0300 (EEST) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9597620ECB for ; Thu, 21 Jun 2018 18:58:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1529600307; bh=SLVHt3HVF6UPa6e/gnPQInUUN+VaMVXnWCLYobNfhdg=; h=From:To:Subject:Date:From; b=WQJGAU9xcJiCZVz04+SmDnSMM64M2/u7zyKUdYgVrL0+GZOBUUC7EhSQMwLi8AMq0 hDTU+Vr3LzEIiVvDexmFXMFBqV7u7XNjT44mb3eM+bDEGZUX00fafvmLgCi5wjmEyi Icdvlg1sZDKBmG+dnLSmUeBgrcazUAxsvSf2OrgNmBw6ftImsputACqEEJoDY4AHsw hZVeXHZ/8Oc59oteQzcI6w3Kuh0WarFmwmO8g+9canw13p0Ie4KggSqSvKXtYqwO17 O6m6AdRU728JkLhA9aELxhtkRDqWRPzkz6WCEYqbYNyk3PbeWvg+GphwYl2myRhdv9 2XOn/U0c6vZGA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 41BSZW1vyZz10Wn for ; Thu, 21 Jun 2018 18:58:27 +0200 (CEST) From: Karsten Otto To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Jun 2018 18:58:25 +0200 Message-Id: <20180621165826.1714-3-ottoka@posteo.de> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180621165826.1714-1-ottoka@posteo.de> References: <20180621165826.1714-1-ottoka@posteo.de> Subject: [FFmpeg-devel] [PATCH v3 2/3] aadec: add chapters and seeking 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" read_packet reads content in chunks. Thus seek must be clamped to valid chunk positions in the file, which in turn are relative to chapter start positions. So in read_header, scan for chapter headers once by skipping through the content. Set stream time_base to bitrate in bytes/s, for easy timestamp to position conversion. Then in read_seek, find the chapter containing the seek position, calculate the nearest chunk position, and reinit the read_seek state accordingly. --- libavformat/aadec.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 4 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 4db71b1939..b009c9deca 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -35,6 +35,8 @@ #define MAX_TOC_ENTRIES 16 #define MAX_DICTIONARY_ENTRIES 128 #define TEA_BLOCK_SIZE 8 +#define CHAPTER_HEADER_SIZE 8 +#define TIMEPREC 1000 typedef struct AADemuxContext { AVClass *class; @@ -46,6 +48,7 @@ typedef struct AADemuxContext { struct AVTEA *tea_ctx; uint8_t file_key[16]; int64_t current_chapter_size; + int64_t content_start; int64_t content_end; } AADemuxContext; @@ -70,7 +73,7 @@ static int aa_read_header(AVFormatContext *s) uint32_t nkey, nval, toc_size, npairs, header_seed = 0, start; char key[128], val[128], codec_name[64] = {0}; uint8_t output[24], dst[8], src[8]; - int64_t largest_size = -1, current_size = -1; + int64_t largest_size = -1, current_size = -1, chapter_pos; struct toc_entry { uint32_t offset; uint32_t size; @@ -172,19 +175,23 @@ static int aa_read_header(AVFormatContext *s) if (!strcmp(codec_name, "mp332")) { st->codecpar->codec_id = AV_CODEC_ID_MP3; st->codecpar->sample_rate = 22050; + st->time_base = av_make_q(8, 32000 * TIMEPREC); st->need_parsing = AVSTREAM_PARSE_FULL_RAW; - st->start_time = 0; } else if (!strcmp(codec_name, "acelp85")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 19; st->codecpar->channels = 1; st->codecpar->sample_rate = 8500; + st->codecpar->bit_rate = 8500; + st->time_base = av_make_q(8, 8500 * TIMEPREC); st->need_parsing = AVSTREAM_PARSE_FULL_RAW; } else if (!strcmp(codec_name, "acelp16")) { st->codecpar->codec_id = AV_CODEC_ID_SIPR; st->codecpar->block_align = 20; st->codecpar->channels = 1; st->codecpar->sample_rate = 16000; + st->codecpar->bit_rate = 16000; + st->time_base = av_make_q(8, 16000 * TIMEPREC); st->need_parsing = AVSTREAM_PARSE_FULL_RAW; } @@ -198,7 +205,30 @@ static int aa_read_header(AVFormatContext *s) } start = TOC[largest_idx].offset; avio_seek(pb, start, SEEK_SET); + + // extract chapter positions. since all formats have constant bit rate, use it + // as time base in bytes/s, for easy stream position <-> timestamp conversion + st->start_time = 0; + c->content_start = start; c->content_end = start + largest_size; + + while ((chapter_pos = avio_tell(pb)) >= 0 && chapter_pos < c->content_end) { + int chapter_idx, chapter_size; + chapter_idx = s->nb_chapters; + chapter_pos -= start + CHAPTER_HEADER_SIZE * chapter_idx; + chapter_size = avio_rb32(pb); + if (chapter_size == 0) break; + avio_skip(pb, 4); + avio_skip(pb, chapter_size); + if (!avpriv_new_chapter(s, chapter_idx, st->time_base, + chapter_pos * TIMEPREC, (chapter_pos + chapter_size) * TIMEPREC, NULL)) + return AVERROR(ENOMEM); + } + + st->duration = (largest_size - CHAPTER_HEADER_SIZE * s->nb_chapters) * TIMEPREC; + + ff_update_cur_dts(s, st, 0); + avio_seek(pb, start, SEEK_SET); c->current_chapter_size = 0; return 0; @@ -215,9 +245,10 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) int written = 0; int ret; AADemuxContext *c = s->priv_data; + uint64_t pos = avio_tell(s->pb); // are we at the end of the audio content? - if (avio_tell(s->pb) >= c->content_end) { + if (pos >= c->content_end) { return AVERROR_EOF; } @@ -230,6 +261,7 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_DEBUG, "Chapter %d (%" PRId64 " bytes)\n", c->chapter_idx, c->current_chapter_size); c->chapter_idx = c->chapter_idx + 1; avio_skip(s->pb, 4); // data start offset + pos += 8; c->current_codec_second_size = c->codec_second_size; } @@ -267,10 +299,56 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; memcpy(pkt->data, buf, written); + pkt->pos = pos; return 0; } +static int aa_read_seek(AVFormatContext *s, + int stream_index, int64_t timestamp, int flags) +{ + AADemuxContext *c = s->priv_data; + AVChapter *ch; + int64_t chapter_pos, chapter_start, chapter_size; + int chapter_idx = 0; + + // find chapter containing seek timestamp + if (timestamp < 0) + timestamp = 0; + + while (chapter_idx < s->nb_chapters && timestamp >= s->chapters[chapter_idx]->end) { + ++chapter_idx; + } + + if (chapter_idx >= s->nb_chapters) { + chapter_idx = s->nb_chapters - 1; + if (chapter_idx < 0) return -1; // there is no chapter. + timestamp = s->chapters[chapter_idx]->end; + } + + ch = s->chapters[chapter_idx]; + + // sync by clamping timestamp to nearest valid block position in its chapter + chapter_size = ch->end / TIMEPREC - ch->start / TIMEPREC; + chapter_pos = av_rescale_rnd((timestamp - ch->start) / TIMEPREC, + 1, c->codec_second_size, + (flags & AVSEEK_FLAG_BACKWARD) ? AV_ROUND_DOWN : AV_ROUND_UP) + * c->codec_second_size; + if (chapter_pos >= chapter_size) + chapter_pos = chapter_size; + chapter_start = c->content_start + (ch->start / TIMEPREC) + CHAPTER_HEADER_SIZE * (1 + chapter_idx); + + // reinit read state + avio_seek(s->pb, chapter_start + chapter_pos, SEEK_SET); + c->current_codec_second_size = c->codec_second_size; + c->current_chapter_size = chapter_size - chapter_pos; + c->chapter_idx = 1 + chapter_idx; + + ff_update_cur_dts(s, s->streams[0], ch->start + chapter_pos * TIMEPREC); + + return 1; +} + static int aa_probe(AVProbeData *p) { uint8_t *buf = p->buf; @@ -316,6 +394,7 @@ AVInputFormat ff_aa_demuxer = { .read_probe = aa_probe, .read_header = aa_read_header, .read_packet = aa_read_packet, + .read_seek = aa_read_seek, .read_close = aa_read_close, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_NO_BYTE_SEEK | AVFMT_NOGENSEARCH, };