From patchwork Tue Nov 21 04:27:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 6241 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4777023jah; Mon, 20 Nov 2017 20:33:25 -0800 (PST) X-Google-Smtp-Source: AGs4zMb9XotBBKBFXKRTM9tcszPjOAShKw4B+UyQDDX7G2GKomzlwiZHiI8uaq6WLzQlBHQY8Zpj X-Received: by 10.223.139.73 with SMTP id v9mr14618536wra.77.1511238805233; Mon, 20 Nov 2017 20:33:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511238805; cv=none; d=google.com; s=arc-20160816; b=Nan83rDCep+SUmRy0Z/soKHTkWGl3awjsk4P/j5StjimD73taTcJ/IuFoUXwqlAkQy qY9aNUe020KQJJjgL6kAqxLLOeUOHzqkzMnL47fbX/0Ls6iH2aNeOVjXPBcZjlhxrsMV SNJIGDqPHA2gFoHrBC2AZiDYwtfyNjLp5rt39DDeKAKu2DgNPdKfSVQnYnWS10CTKWpK B7BWK+gCWH5Z3BKrIKl0343WpgzDd0NTQwXi8M3PK/4x+6HXqkxu2T79mYGJwyTBoZHF hUw8khkvqnJpTqueu+zfOrXr8LIdIIK0ZFFCDnT4sZGHLLd0q73LAN6J6O1gMw6OQQGn 8oRw== 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=5Z6suIoXKI+CRkWGfhg75YM/gWZvqTrCTSO/3+EJH78=; b=KPabgg+Y96C+Mrxgp6wLqNIl0lHEKM/JYT5i0zC5bu0uNxrlnAo900XBqtFvKJOo7H g/SqhQeQpONBthnV/OcA0BSQXCxespY5VVPbKI1CjGrk0QAazb8Uay4bsKdz34/kX0EU 5fBMtxU7lmz77m+BOI5IzTuB88mlYdFoDCe00RHPP3jwI9FFDluCJx54p2gcTIXckJSU 3TXHRh6rKRFf435OdwbBoJwXuMalO4sFNprx2+AoaoCav/wFKdhqeywOEm2MwEzbDTll 5u4VV/eaZoQM8d+F7smAopN5VR/635mBbhmxxFl0qA52oJLFJKR8/C4E8uSGNs987y/d ySWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=psBb5gab; 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 70si256177wmt.253.2017.11.20.20.33.24; Mon, 20 Nov 2017 20:33:25 -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=psBb5gab; 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 6ED7D689F3B; Tue, 21 Nov 2017 06:33:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FB586883A1 for ; Tue, 21 Nov 2017 06:33:00 +0200 (EET) Received: by mail-it0-f41.google.com with SMTP id n134so440667itg.1 for ; Mon, 20 Nov 2017 20:33:17 -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=m+Ael5K6Hnp4e8JvP6NNGdiG8u6AiK9phUGZCRsUh7E=; b=psBb5gabhp97EO/Gz9xxWBnekrk0XmlbTnBhk5OGXO4NV1k+HbCuNohUc3hxc13mt2 D9wj7B+HpsM1v9NqhQcFJrpbF7ymLuBmOPoVdAMhZS1mZW6fWu/Nhk6f8VbVf+olTSft HWYHFP/PisOps/VLMZHMrf5rvire88INDZGSivbQqvyqUXA8b1w5YkUJX9EYSOeNSo98 RY50NoCailjjTmBBenyI/PmIw/IKdZnMkL4B47rk06UT4S2yMyGQGkMTfd8wHB6DbsWJ bmtHu4JFG1qZqllL4o2E3eb6VuCrSuvjWGIltX63H8wGVnWc44wTjTzS4jEgV6M7gzhK zB0Q== 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=m+Ael5K6Hnp4e8JvP6NNGdiG8u6AiK9phUGZCRsUh7E=; b=gSCxA8z1dC54uuKUUJN08M+0iGh+W8YplwtAiG+E3idjy2Z4Rgh2skJ3QEwb7ow1nZ eCAdipDmrM+rtYxi0VZLa4MBAh1wiFRHLv00/FVEZN1Ei5PLJ+O9bsO178/7HTiCP4jj 3iiZiA6iRlNsWcuN2ZAttShuABDSy06MO63wY5oNEr/AJ4bOGeDlDm2ulSU3mBb8sN/F pBOfuHq/lhLB/aSIIVbXD+PG2AWW81XEjGCaRWDDzB++7oTboHYWUxPJnSu0D/eY9V9G OAHh7WQzB/cKP1P8aXyV02OH8kziizxcOO1VfFXoNhoqL1ukKL6tvbGJqcrHAIiNG3O0 x6pg== X-Gm-Message-State: AJaThX7uRRvovUAFEzw9fM+BiX1fTkwBmNxwm3JMcbz2AETZLqjLPueS XCACO93vCAW+66QuMAlYqKykYj9iqDE= X-Received: by 10.36.14.145 with SMTP id 139mr220902ite.111.1511238459903; Mon, 20 Nov 2017 20:27:39 -0800 (PST) Received: from isasi.mtv.corp.google.com ([172.27.82.28]) by smtp.gmail.com with ESMTPSA id k19sm165445itb.18.2017.11.20.20.27.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 20:27:39 -0800 (PST) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Nov 2017 20:27:05 -0800 Message-Id: <20171121042705.7021-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" Signed-off-by: Sasi Inguva --- libavformat/mov.c | 50 ++++++++++++++++++++++++++++++++++++++++ tests/fate/mov.mak | 7 ++++++ tests/ref/fate/mov-guess-delay-1 | 3 +++ tests/ref/fate/mov-guess-delay-2 | 3 +++ tests/ref/fate/mov-guess-delay-3 | 3 +++ 5 files changed, 66 insertions(+) create mode 100644 tests/ref/fate/mov-guess-delay-1 create mode 100644 tests/ref/fate/mov-guess-delay-2 create mode 100644 tests/ref/fate/mov-guess-delay-3 diff --git a/libavformat/mov.c b/libavformat/mov.c index fd170baa57..afb0d4ca5c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3213,6 +3213,54 @@ 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 min_prev_pts = AV_NOPTS_VALUE; + int64_t prev_max_pts = AV_NOPTS_VALUE; + int num_steps = 0; + + if (st->codecpar->video_delay <= 0 && msc->ctts_data && + st->codecpar->codec_id == AV_CODEC_ID_H264) { + 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; + + // Everytime we encounter a new max_pts we reset num_steps and compute again. + if (curr_pts > prev_max_pts) { + st->codecpar->video_delay = FFMIN(FFMAX(st->codecpar->video_delay, num_steps), 16); + num_steps = 0; + prev_max_pts = curr_pts; + min_prev_pts = curr_pts; + } else { + // Compute delay as the length of the path from max PTS to min PTS. + // Frames: I0 I1 B0 B1 B2 + // PTS: 0 4 1 2 3 -> num_steps = delay = 1 (4->1) + // + // Frames: I0 I1 B1 B0 B2 + // PTS: 0 4 2 1 3 -> num_steps = delay = 2 (4->2, 2->1) + if (min_prev_pts != AV_NOPTS_VALUE) { + if (curr_pts < min_prev_pts) { + ++num_steps; + min_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 +3894,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..6e79f0aba8 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -11,6 +11,9 @@ 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-guess-delay-3 \ FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \ fate-mov-zombie \ @@ -72,3 +75,7 @@ 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 +fate-mov-guess-delay-3: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=has_b_frames -select_streams v $(TARGET_SAMPLES)/h264/h264_4bf_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] diff --git a/tests/ref/fate/mov-guess-delay-3 b/tests/ref/fate/mov-guess-delay-3 new file mode 100644 index 0000000000..248de1c3ea --- /dev/null +++ b/tests/ref/fate/mov-guess-delay-3 @@ -0,0 +1,3 @@ +[STREAM] +has_b_frames=2 +[/STREAM]