From patchwork Sat Nov 18 06:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 6161 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1503794jah; Fri, 17 Nov 2017 22:13:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ566Iy9+a8NA30QmtzNexgAiyj+sCjAe32d/5ppEBAGIZPcqhuMLscHvcTLau29NSa6Dpb X-Received: by 10.223.184.47 with SMTP id h44mr5687787wrf.11.1510985603455; Fri, 17 Nov 2017 22:13:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510985603; cv=none; d=google.com; s=arc-20160816; b=oDQfdetQ8NUo9hL/lv4LPKdExwwa67FdyO+FTV4uxxShJrTovoEwbIv7yFfH6KF/UP ABTy1QR62wCIJLBjb7zSrczpWEzHel1M6x9Ur0+qwo3x15QcMhVlgxbopNN0sFzpVakF 2jxgWvR40J8Coax81fEJPn2d92Mw0QGaRD3thaMF1x3HrJPRRD4EB803jEQk+NZgew1b X4Yr2luAC1WofVwiVTXQws9hL0fzPcpGnMr9T7j4PiMYrlYjzrD9wnE9Jj59EEPLTOjf N2163e4f5nT7vTF6LA6/ZFDdij8Zx2NMWogvFXa9Cx4ZwexghJBUKSZOc1Gf6f4IXm75 Sfyw== 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=u9qdSVpADfDGoIxhulrtRutfTWckKTFS0vVn6ZK9YlU=; b=tlzY//r3B598+kkdYF6yrBWhEfnnbMUaSlow99mhhhOxGgM2tVq7aOE2pqstWDWPRr A1DJH4wJ88La2Uj9sAzxbokVwlRIgPeiUDnvdiFrSClLlPsQBVuBI7o3q9aUP5dvxUim AIr6fhAJo6zd0IEAeIPbZPw4Yv4ZtJpPJDhFlUIeHj/hkmMCauD1yCe1mLcYVJYX1FKS MYbPNPnq0zXMvExMStlPck25yehstkB01Z/TOfz1UTSvjHOYBLv0Hq7c+pgB2sgxGmpH 4P4V4IZ5B8VnoKNm1/x/iK5+A3tGTbR1Q60rgXu8SBt3k5qsJf0xNdPWsgxLk6Nz+G5c to4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=KzYMUCh6; 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 e15si3748460wmh.154.2017.11.17.22.13.23; Fri, 17 Nov 2017 22:13:23 -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=KzYMUCh6; 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 F2BB5689957; Sat, 18 Nov 2017 08:13:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC877689224 for ; Sat, 18 Nov 2017 08:12:59 +0200 (EET) Received: by mail-io0-f171.google.com with SMTP id t11so10901749iof.13 for ; Fri, 17 Nov 2017 22:13:16 -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=+R0qBxa9MO2XX5ENui11bg3lot3nGEvDNA6ltu6r/pg=; b=KzYMUCh60jkgShNni7HTMu6qDPyLX0LwDg+9jPQHmw9/5u/IV5WrwqaIY3yfNK3nrr v88HNv3TEHvwqmAjwdgF2y8G1sKa0hhMZ6uNnmHg3cRw7ufwttwviPHXPQVjkNsiTr/7 QMIW7hXkxLIpPhTGurgrdsJswtSazqudqo/3nHb3VKNnFxM2Doxtv/BA/x1Oyo1HYr77 t/22GcREShbwhAlEK3MB7QKLR9WLbggpf5+0l4k0zqfSLNae2u4CJwuJZoKHp1aaaHdU Scf2CazmNz0jl9X7vaRWZTKH1PFWEFzJ07RqD3QJ0xt3Py5SMSdwHE4+HvECDRNYJJu0 oihA== 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=+R0qBxa9MO2XX5ENui11bg3lot3nGEvDNA6ltu6r/pg=; b=WlrdtFimz4JOJm+7pqiMAJbBpAtgQivFCABHQTLD99lKAnQFLo8c4R5lq4NhT/QUpr VN2NR3cGDuObd1w21cNfrYgbsuVxb1xcn9KzaomMihA6QrWT1TWNpXYvp+MivNRM0+4X 5Qn0HemRzoxh9Xnh9XQpzEH0u8S70DBrqwq6bCBDXkquCVI/BHkuI8SesKBqucTC/u3Y Xz4Mb7YimF2i6RPTQ+8lsJd8BQDYJA2Ux1If8oFKgjvxmCSPBsmcXNxygqoTXrc1qcnX DGt3S7MrJcg0xxAdPHo/msZ03+JwSGkz9XOdc4cAWgpOmuJ50BSaGLun7vkZTMgqBpg5 z73A== X-Gm-Message-State: AJaThX4OnMRTJDdgg27xRBScJl8IMeKUFk/grg/+R/EtNyTkxLb3HUfP Z6aVb98D31cwR1HNPMrXAdBMrBPD+z8= X-Received: by 10.107.50.85 with SMTP id y82mr6033884ioy.67.1510985594503; Fri, 17 Nov 2017 22:13:14 -0800 (PST) Received: from isasi.mtv.corp.google.com ([172.27.82.28]) by smtp.gmail.com with ESMTPSA id e12sm2455931iod.4.2017.11.17.22.13.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Nov 2017 22:13:13 -0800 (PST) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 22:12:30 -0800 Message-Id: <20171118061230.4655-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 | 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]