From patchwork Fri Aug 4 18:46:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 4625 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp2626014vsu; Fri, 4 Aug 2017 11:47:44 -0700 (PDT) X-Received: by 10.223.142.23 with SMTP id n23mr2366500wrb.212.1501872464887; Fri, 04 Aug 2017 11:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501872464; cv=none; d=google.com; s=arc-20160816; b=WBe29/Uw+aV30Fkm/IethFCWSFBad6tktcRMes8Dm7AS5++N9qEQpW3AFEDjq2xC8c sI0TD5Pe279LwKWdVFtpt2KOKYqYSIymdL5nLm2bwcGKkKg6kq5vUwcEepvUTTBmksO1 4+F+MXCg05C+TR35cUNdchsO8yGHvFbuc9/GgHpSUgLxmuZEWeZB6lPlIcm79CUBS01f jQ6BQ/Q+BNRwE6BbTMTUWd+sUmoV3em4Mo5UltNHjeZCzIRYAQQmVd6zc7YLXFJFOfwK 1mh7g+exAtZuxEgBq9VEW4IZXxLdYt9UFK+eo07mxyO6WAUvuQnHifG870rqm8vMOihO 5DGg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=kU9lku1vtIwxcrB5EaScIZB/oanVUyH3/3nEVuMWWzk=; b=EjZC8Ms0nsO/ZViy8NfC0d9K9jFp0/vqvnWwxfaIIfptB09UP6Ismb+awAS/UlSgr3 cu1MvnpJI7nx8NZh74NwqCYMcqvNTWM+YtNVZeptIOvZwPKU62dEOMxvQT3rxQ4XKzaG 2AQ6AslE/dLsO468VycPhIAVUsB6EZjnetZTd60JWhvq/IQt7hzJFyQUzb8skRNfAuJ+ jgm6FFdwPscIbaN1/kscgBgRr7GvDC9q0LDmsYr7YDotYaDu6yM/7/N0IDr4C7DJKzu/ o4Im56QRpn7FNIjUEz3Bw7I4K937+f8+GkMzZI0qPMlhSglqVAL0t5avuoYjP75rzi2G t0MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.b=g4MgoaBR; 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 z25si3872205wrz.452.2017.08.04.11.47.43; Fri, 04 Aug 2017 11:47:44 -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 header.b=g4MgoaBR; 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 0B894689A2D; Fri, 4 Aug 2017 21:47:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC2F5689A38 for ; Fri, 4 Aug 2017 21:47:33 +0300 (EEST) Received: by mail-pg0-f49.google.com with SMTP id v189so11153015pgd.2 for ; Fri, 04 Aug 2017 11:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VhOzt2lvQy8h9hJEs4cebRtSypt4vGjryAp9Q9wwPUk=; b=g4MgoaBRkJKIei1R5PGFromLsrz6VgeDLoef1apvUWd3vG6HBkfCQqMCIatG/u2U9L R5IXd8Mq3kHcWxoDTIVhqbzPSf1VXogl6XEzNMI9kELFnm52oeGdL1Lt0ASAS1qzp9hU qD/TkA+jlkCuwRg/4T3mSdtwGo01iyGp5NdEXabpTGdRTTeBopW/Z35M1LvvLSpF/Wd1 Wokb3eOWvc1wys5vBngp1SDCaN20igM3dMt7ePNZAznvJL6O72wCTgFLhroSo7h/E/Zx GOjSM1w4WXMAFrpniBbMrEXLUs1pXIJQDg1qZmT1AUgaEtQTcvVHG50K1etTSpkNLgp9 uxLw== 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; bh=VhOzt2lvQy8h9hJEs4cebRtSypt4vGjryAp9Q9wwPUk=; b=lCnsacyyEq9daE8MBVG3kC2g9LLxGS8jC1Zj1kXBy7ScrK6GB/+TS2YmfTINMg5lcH 4MlxMTLpRwUt0SKwqJ19TdUwGoUAzS1LLFstgUxo7ixvKnjVjyGUyOcxUWeuxdEELd+v +ndswYY0LunHzMZWxq2YTHU4Afi6fLLJtA6Ydxa2YVFLamiCR+SKYjETcp+4ilj5f/uR YlVGS9aRhtryGScxnI+9s3Wq3Hxzjk+TOlTXHXHljAxPQiNlwbimhDr9uFOmx8SUnAQ7 TZc3gui5AH9hE0Ga0LsvLBhCjsPjS5ADRFguw73fWwecjjCBygqQjLGZ76joGqH/tftF 3fYw== X-Gm-Message-State: AIVw110CPwwrMsBoc77FbjDcsJcp+d0cCVwkZ70XH00AhdaV23eCwjcd +Vwg1NaSyK4I7lbOZnhkTg== X-Received: by 10.98.147.74 with SMTP id b71mr3440264pfe.283.1501872451194; Fri, 04 Aug 2017 11:47:31 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.196.44]) by smtp.gmail.com with ESMTPSA id o125sm3508354pfg.32.2017.08.04.11.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Aug 2017 11:47:30 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Aug 2017 11:46:48 -0700 Message-Id: <20170804184648.11392-1-isasi@google.com> X-Mailer: git-send-email 2.14.0.rc1.383.gd1ce394fe2-goog Subject: [FFmpeg-devel] [PATCH] lavf/movenc.c: Set sgpd and sbgp atoms to represent decoder delay for AAC. 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: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" According to https://developer.apple.com/library/content/documentation/QuickTime/QTFF/QTFFAppenG/QTFFAppenG.html Signed-off-by: Sasi Inguva --- libavformat/movenc.c | 70 +++++++++++++++++++++---------------- tests/ref/fate/adtstoasc_ticket3715 | 4 +-- tests/ref/fate/copy-psp | 4 +-- tests/ref/fate/movenc | 12 +++---- 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0e5b45d150..10b959ad02 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2208,39 +2208,47 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) (AVRational){1, 1000}, (AVRational){1, 48000}); - if (track->entry) { - sgpd_entries = av_malloc_array(track->entry, sizeof(*sgpd_entries)); - if (!sgpd_entries) - return AVERROR(ENOMEM); - } + if (!track->entry) + return 0; - av_assert0(track->par->codec_id == AV_CODEC_ID_OPUS); + sgpd_entries = av_malloc_array(track->entry, sizeof(*sgpd_entries)); + if (!sgpd_entries) + return AVERROR(ENOMEM); - for (i = 0; i < track->entry; i++) { - int roll_samples_remaining = roll_samples; - int distance = 0; - for (j = i - 1; j >= 0; j--) { - roll_samples_remaining -= get_cluster_duration(track, j); - distance++; - if (roll_samples_remaining <= 0) - break; - } - /* We don't have enough preceeding samples to compute a valid - roll_distance here, so this sample can't be independently - decoded. */ - if (roll_samples_remaining > 0) - distance = 0; - /* Verify distance is a minimum of 2 (60ms) packets and a maximum of - 32 (2.5ms) packets. */ - av_assert0(distance == 0 || (distance >= 2 && distance <= 32)); - if (i && distance == sgpd_entries[entries].roll_distance) { - sgpd_entries[entries].count++; - } else { - entries++; - sgpd_entries[entries].count = 1; - sgpd_entries[entries].roll_distance = distance; - sgpd_entries[entries].group_description_index = distance ? ++group : 0; + av_assert0(track->par->codec_id == AV_CODEC_ID_OPUS || track->par->codec_id == AV_CODEC_ID_AAC); + + if (track->par->codec_id == AV_CODEC_ID_OPUS) { + for (i = 0; i < track->entry; i++) { + int roll_samples_remaining = roll_samples; + int distance = 0; + for (j = i - 1; j >= 0; j--) { + roll_samples_remaining -= get_cluster_duration(track, j); + distance++; + if (roll_samples_remaining <= 0) + break; + } + /* We don't have enough preceeding samples to compute a valid + roll_distance here, so this sample can't be independently + decoded. */ + if (roll_samples_remaining > 0) + distance = 0; + /* Verify distance is a minimum of 2 (60ms) packets and a maximum of + 32 (2.5ms) packets. */ + av_assert0(distance == 0 || (distance >= 2 && distance <= 32)); + if (i && distance == sgpd_entries[entries].roll_distance) { + sgpd_entries[entries].count++; + } else { + entries++; + sgpd_entries[entries].count = 1; + sgpd_entries[entries].roll_distance = distance; + sgpd_entries[entries].group_description_index = distance ? ++group : 0; + } } + } else { + entries++; + sgpd_entries[entries].count = track->sample_count; + sgpd_entries[entries].roll_distance = 1; + sgpd_entries[entries].group_description_index = ++group; } entries++; @@ -2304,7 +2312,7 @@ static int mov_write_stbl_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext if (track->cenc.aes_ctr) { ff_mov_cenc_write_stbl_atoms(&track->cenc, pb); } - if (track->par->codec_id == AV_CODEC_ID_OPUS) { + if (track->par->codec_id == AV_CODEC_ID_OPUS || track->par->codec_id == AV_CODEC_ID_AAC) { mov_preroll_write_stbl_atoms(pb, track); } return update_size(pb, pos); diff --git a/tests/ref/fate/adtstoasc_ticket3715 b/tests/ref/fate/adtstoasc_ticket3715 index 949b565c2f..96795a2ca3 100644 --- a/tests/ref/fate/adtstoasc_ticket3715 +++ b/tests/ref/fate/adtstoasc_ticket3715 @@ -1,5 +1,5 @@ -ef8ce3cbd1d86113e7c991a816086068 *tests/data/fate/adtstoasc_ticket3715.mov -33270 tests/data/fate/adtstoasc_ticket3715.mov +0221e04333e6ac432fa42960502f0d5a *tests/data/fate/adtstoasc_ticket3715.mov +33324 tests/data/fate/adtstoasc_ticket3715.mov #extradata 0: 2, 0x00340022 #tb 0: 1/44100 #media_type 0: audio diff --git a/tests/ref/fate/copy-psp b/tests/ref/fate/copy-psp index 6603d3ff26..81eb172549 100644 --- a/tests/ref/fate/copy-psp +++ b/tests/ref/fate/copy-psp @@ -1,5 +1,5 @@ -6889223644fc560069c8591984175a62 *tests/data/fate/copy-psp.psp -2041379 tests/data/fate/copy-psp.psp +cada61453a2483ef8ba1fb82c8bbff25 *tests/data/fate/copy-psp.psp +2041433 tests/data/fate/copy-psp.psp #extradata 0: 51, 0xaf6d1012 #extradata 1: 2, 0x00b200a1 #tb 0: 1/90000 diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index 09e603aeb7..47bcf9d515 100644 --- a/tests/ref/fate/movenc +++ b/tests/ref/fate/movenc @@ -1,18 +1,18 @@ write_data len 36, time nopts, type header atom ftyp -write_data len 2335, time nopts, type header atom - +write_data len 2389, time nopts, type header atom - write_data len 788, time 1000000, type sync atom moof write_data len 110, time nopts, type trailer atom - -214242e9c7c93171d2f47f5b47776559 3269 non-empty-moov +17a37691eba8b858cf15e60aa9a7dbf7 3323 non-empty-moov write_data len 36, time nopts, type header atom ftyp -write_data len 2667, time nopts, type header atom - +write_data len 2721, time nopts, type header atom - write_data len 908, time 966667, type sync atom moof write_data len 110, time nopts, type trailer atom - -44467d568a3cc38d414fd8ed4b2a968f 3721 non-empty-moov-elst +0026ffe059c06c592021f972bf2c5e79 3775 non-empty-moov-elst write_data len 36, time nopts, type header atom ftyp -write_data len 2575, time nopts, type header atom - +write_data len 2629, time nopts, type header atom - write_data len 908, time 1000000, type sync atom moof write_data len 110, time nopts, type trailer atom - -de22b98a3885f9b4b83cdd48ff46aeb9 3629 non-empty-moov-no-elst +c184e168ac1e5bb3d9c70e580ab6179c 3683 non-empty-moov-no-elst write_data len 20, time nopts, type header atom ftyp write_data len 1171, time nopts, type header atom - write_data len 728, time 0, type sync atom moof