From patchwork Sat Nov 18 19:09:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 6180 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2102406jah; Sat, 18 Nov 2017 11:17:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMYHYef/uJGmoVmNgvqX2qP4L/o4jaLN0R6ymwan+oRre5YKU3kXzo9/JOGjGRTWeLPXWEg/ X-Received: by 10.28.105.196 with SMTP id z65mr7204791wmh.146.1511032620785; Sat, 18 Nov 2017 11:17:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511032620; cv=none; d=google.com; s=arc-20160816; b=zkCSb4Mmz85LPvI1mHUSBCD89I89HzYPWWkhnGCwMcurh5vIcC5vuHNfmr6KaJ03fy VqkoWRyy0c6eYrRanmRjY5i4m9BKR3AcBiKn2aGwE8bgm6buTUXhNPYBjT9lshRNbHAm 34sTxczoLzE2L5VOiIsyqw2jRA2ulZu4xbsyy+9InNf1F2UxKvWK9dBPgF9uggWT+P/q R+kMeTTdKuIIu/uqnocifUiv8L0Kaxa2DI7cSuc2dpjCMkfI8bctYP8PileRrXw94dbY NpoA4BJDkouxLLfDBp2f8L2bgXLLLYL5t5tHV83253VRXplay0oADRRL9pCHYBoih2Ae MXyg== 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:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=igv+DHv4iga5k7t/b1ZwQ7gPcUFaY9ahv4m7pATgeg0=; b=w+uCOYPITp8/Q41Zh52yvLFxjEnzBKh1zSpLjJ1HxMz37IvDTyDw+AZtoQvkiw4VX8 o1GwyrmKpNt01O+282XzS7Fj1MQQaOiVJMA+caK47IfnGtciFKLv90K6kXj4u9rvWFjh w0ziHfoBeNVGCMiisSztc24jn8QkJUMWUnaZweVDuc+sIgm/MehZEJn2L+Vm1b83S0N1 7eWUaOgLPptPzkNDHXM9FhJ4U4mA2T4Nq2mBvBs5dk01bX2vzSZmh/YRLmN6FHIBJ4rv mRUdL58uCC2m6MCItz5JJpFnlg/o8F2PRgBfhIw2E3pYUN3AjuNXnFRjDhmLgyQ1s4Uf 6RsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=g/fDYqDL; 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 15si1802577wrb.157.2017.11.18.11.17.00; Sat, 18 Nov 2017 11:17:00 -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=@google.com header.s=20161025 header.b=g/fDYqDL; 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 23C0268A0CB; Sat, 18 Nov 2017 21:16:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f45.google.com (mail-it0-f45.google.com [209.85.214.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C50B68A07B for ; Sat, 18 Nov 2017 21:16:36 +0200 (EET) Received: by mail-it0-f45.google.com with SMTP id o130so1289253itg.0 for ; Sat, 18 Nov 2017 11:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Nbvy6aBQssbemHNH2OG5/kDc1BacMJGtGRkEVZz5l/M=; b=g/fDYqDL7JRNWwTCAHlIAaHIe9cwxpH0H+BhVCrpKoZ6Sa6JgFRaYCeYE0NKpkwQBV PD32fFXaJfDxL7KbLqJugPdW9xPjdSPmI1NIVY3lTpAC2bE5Ywe2Qen7VqOiLXZhNbPv pdmOOPXLADuHlH5odl8+9NCKTcVYDm3O9/eWdBfL27Y551lbU0YjX19vJrsY1bL6jAID u1RsqOc677lSGjbwaUncPCmXV1t8YSLRcYuzBppkiGzX/+qXq1WmZysJ+0C2lxV6ve3s SWo/OcnkAWikDWTVj6Uaf/uFPx1U7eCEZUTiEQG5TgoWTuC/+/HNdPa9NSRUH0ByCwHl 3o5A== 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=Nbvy6aBQssbemHNH2OG5/kDc1BacMJGtGRkEVZz5l/M=; b=ARbxEEFcKGbBhbVZsPUIh++b58KAslfS+E+1QN1t6zAaWk2jhxYW0zwBARYiU06+/K UwYKSYbS2OULsNOHuCvOEKM+Q+ba50UC0asTebdjz3XTnU7dVZcvqZmhjnJBgux2OT+3 rMwhqIxidnGTHlQwEqt5MqZE8VFaR14AjHqN8TdmoV3BM/hpA8w0dF5uLgY+LTySi9wR QSUN294hzYaV3Yz2BMlHsY5aKOczW2psyGIss09NFxa/m8QQjB1G0T+52wfOsKMzXBaR CDrXY4eglQVVV8MjRrxdCIke40txFzG+UlOEOr4pB0VsCl0PggoN8aSc85vTGY4xs35a nSyQ== X-Gm-Message-State: AJaThX5uc4MQfI2klg0PmIQ1G5gTzQPGMqwFgMC1dmmxqGsFoPIffL2J ZjToNX+1aIUMn3OyWaso1HtWrUc5h1U= X-Received: by 10.36.70.76 with SMTP id j73mr12072031itb.32.1511032222215; Sat, 18 Nov 2017 11:10:22 -0800 (PST) Received: from isasi.mtv.corp.google.com ([172.27.82.28]) by smtp.gmail.com with ESMTPSA id s129sm3363435itb.22.2017.11.18.11.10.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Nov 2017 11:10:21 -0800 (PST) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Nov 2017 11:09:44 -0800 Message-Id: <20171118190944.14687-1-isasi@google.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] lavf/mov.c: Guess video codec delay based on PTS while parsing MOV header. 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" Done. is there a better way to identify codecs that might need Signed-off-by: Sasi Inguva --- libavformat/mov.c | 52 ++++++++++++++++++++++++++++++++++++++++ tests/fate/mov.mak | 5 ++++ tests/ref/fate/mov-guess-delay-1 | 3 +++ tests/ref/fate/mov-guess-delay-2 | 3 +++ 4 files changed, 63 insertions(+) create mode 100644 tests/ref/fate/mov-guess-delay-1 create mode 100644 tests/ref/fate/mov-guess-delay-2 diff --git a/libavformat/mov.c b/libavformat/mov.c index fd170baa57..687297be33 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3213,6 +3213,56 @@ static int64_t add_ctts_entry(MOVStts** ctts_data, unsigned int* ctts_count, uns return *ctts_count; } +static void mov_guess_video_delay(MOVContext *c, AVStream* st) { + MOVStreamContext *msc = st->priv_data; + int ind; + int ctts_ind = 0; + int ctts_sample = 0; + int64_t curr_pts = AV_NOPTS_VALUE; + int64_t prev_pts = AV_NOPTS_VALUE; + int64_t prev_max_pts = AV_NOPTS_VALUE; + int num_swaps = 0; + + if (st->codecpar->video_delay <= 0 && msc->ctts_data && + (st->codecpar->codec_id == AV_CODEC_ID_MPEG2VIDEO || + st->codecpar->codec_id == AV_CODEC_ID_H263 || + st->codecpar->codec_id == AV_CODEC_ID_H264 || + st->codecpar->codec_id == AV_CODEC_ID_HEVC)) { + st->codecpar->video_delay = 0; + for(ind = 0; ind < st->nb_index_entries && ctts_ind < msc->ctts_count; ++ind) { + curr_pts = st->index_entries[ind].timestamp + msc->ctts_data[ctts_ind].duration; + + // This is used as an indication that the previous GOP has ended and a + // new GOP has started. + if (curr_pts > prev_max_pts) { + st->codecpar->video_delay = FFMIN(FFMAX(st->codecpar->video_delay, num_swaps), 16); + num_swaps = 0; + prev_max_pts = curr_pts; + } + + // Compute delay as the no. of "drop"s in PTS inside a GOP. + // Frames: I0 I1 B0 B1 B2 + // PTS: 0 4 1 2 3 -> num_swaps = delay = 1 (4->1) + // + // Frames: I0 I1 B1 B0 B2 + // PTS: 0 4 2 1 3 -> num_swaps = delay = 2 (4->2, 2->1) + if (prev_pts != AV_NOPTS_VALUE) { + if (curr_pts < prev_pts) + ++num_swaps; + } + + prev_pts = curr_pts; + ctts_sample++; + if (ctts_sample == msc->ctts_data[ctts_ind].count) { + ctts_ind++; + ctts_sample = 0; + } + } + av_log(c->fc, AV_LOG_DEBUG, "Setting codecpar->delay to %d for stream st: %d\n", + st->codecpar->video_delay, st->index); + } +} + static void mov_current_sample_inc(MOVStreamContext *sc) { sc->current_sample++; @@ -3846,6 +3896,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st) // Fix index according to edit lists. mov_fix_index(mov, st); } + + mov_guess_video_delay(mov, st); } static int test_same_origin(const char *src, const char *ref) { diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 76f66ff498..ef89e62096 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -11,6 +11,8 @@ FATE_MOV = fate-mov-3elist \ fate-mov-440hz-10ms \ fate-mov-ibi-elst-starts-b \ fate-mov-elst-ends-betn-b-and-i \ + fate-mov-guess-delay-1 \ + fate-mov-guess-delay-2 \ FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \ fate-mov-zombie \ @@ -72,3 +74,6 @@ fate-mov-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries str fate-mov-gpmf-remux: CMD = md5 -i $(TARGET_SAMPLES)/mov/fake-gp-media-with-real-gpmf.mp4 -map 0 -c copy -fflags +bitexact -f mp4 fate-mov-gpmf-remux: CMP = oneline fate-mov-gpmf-remux: REF = 8f48e435ee1f6b7e173ea756141eabf3 + +fate-mov-guess-delay-1: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_3bf_nopyramid_nobsrestriction.mp4 +fate-mov-guess-delay-2: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_3bf_pyramid_nobsrestriction.mp4 \ No newline at end of file diff --git a/tests/ref/fate/mov-guess-delay-1 b/tests/ref/fate/mov-guess-delay-1 new file mode 100644 index 0000000000..96cb67be0c --- /dev/null +++ b/tests/ref/fate/mov-guess-delay-1 @@ -0,0 +1,3 @@ +[STREAM] +has_b_frames=1 +[/STREAM] diff --git a/tests/ref/fate/mov-guess-delay-2 b/tests/ref/fate/mov-guess-delay-2 new file mode 100644 index 0000000000..248de1c3ea --- /dev/null +++ b/tests/ref/fate/mov-guess-delay-2 @@ -0,0 +1,3 @@ +[STREAM] +has_b_frames=2 +[/STREAM]