From patchwork Wed Dec 13 11:44:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 6761 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5315184jah; Wed, 13 Dec 2017 03:52:00 -0800 (PST) X-Google-Smtp-Source: ACJfBotBO7jvvBsFqI1yWxRBKY6Ivug4NmD/kNTNQt0U74C1/Jh0ISJQbqbV+wsuEWsajPtpS99a X-Received: by 10.223.151.212 with SMTP id t20mr2293729wrb.2.1513165920152; Wed, 13 Dec 2017 03:52:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513165920; cv=none; d=google.com; s=arc-20160816; b=YJv9ZRSn5xLtnER1TUePygLKiHq4dU/HAk2XYOW1Z4tzIbDeNZBDnFp8EH/jWoiYO0 3NpDdaHhpv/+KjdpZysUpC8z+fao8OrvUE6TnRb4UIuaQfkcDUco5TtKG9VmVv4DIqa1 lnE5irmxUXl2/rQNGGSEfk7acqvQDj7awLbAJLDS4bf41Rfq18+y7GpGATP8v19MPnJr SiX8jBOCjHAzQtCd0Owyg68oScsOp55TKMII3fXpsVH6321VLRxLtBB0zHvcrl1+qNzA jSPkiNJGK+FbwYJRtfni9uu7Fgjze2SCNOV24ll+dkL3DitOxA/nsJpaNa3fCPNU7MdW PSnA== 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=Wvtl4xedoMCDwwVLL7tBuAiIzU2Jksz7T7qZjs6TrlU=; b=HjutKg3DEBmzqABogIZOuAoMGy+EDE9UUBjHhTHMXxuoSyTnpjeqxGimSSPIP5XEg8 hyhHPjbJbgU94PzuFRlTalssoPWrJaw+pDD4LQzV6cFNTFGKAzRSgibvP0vF4uC2AFaY 7EaYET/UQyc4FAaF5/rBORenegmLNJTiE7hPuqinHh8pK+h/8nXYzOimiAHn2HF1HQSt 7h+RZPs/PxJ6QK24MAL7+GbzMGvPqiKFdVjpdLfEcBNci2ZMGg8Er7zGMEW4i18eA+Nw kXG8NmVxcYWjxlcvhrmUJ79R5oUacWNwWS7Du2sXi62bkYUPLPFBqNGrB6+Wm+KLlB4w Gm9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gpchjnRP; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b17si1272594wme.197.2017.12.13.03.51.59; Wed, 13 Dec 2017 03:52: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=@gmail.com header.s=20161025 header.b=gpchjnRP; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 996E568A1F2; Wed, 13 Dec 2017 13:51:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 013EC6805A1 for ; Wed, 13 Dec 2017 13:51:44 +0200 (EET) Received: by mail-io0-f180.google.com with SMTP id u42so2534986ioi.9 for ; Wed, 13 Dec 2017 03:51:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=VIlzD4TE0xeuCM39jz3PcSnxeZv+eeetZHn6NMGZLLo=; b=gpchjnRPEvh80yvn3oih/9Cr4AH5n/S6OZbvzmxRip4jQYk47LlvxRdscmIpOKgqSs BFWDS64WbIfsyPRK54QNfdO0vtnHAVuUwolViiW+ZWk+8z/6i9ztWxa+7+EZDWywb0sM Ic9+l2UwCuesoVFdJQwZI4Pe3be0BK5oKdJvRnQgz1LgFMoV8jPc+Z3bvgROnyzVRxdS Tb3pfhaiY173hyy0qX11OsFGk0vx03ho3LeIMwrq5TLSOrFQOUYfH3oGjF/Cx2ANtd0y yMlfk0A1hhDnYBvvIZq76g7k6fweXbK67iGHyUBsb7cltZMh4J+nBlwPK9myArG6MO3d yzow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=VIlzD4TE0xeuCM39jz3PcSnxeZv+eeetZHn6NMGZLLo=; b=JRyzRL/OjoE29mZNJuOGvJMawlFqWmxqE7VqEKDdhGyXCjDKXD7Fpw6cmFAbRXZ41/ P1K8P7NmiAkXrXnodVHICTcHhOjNn48oIKNCA/oskTNtbUPsMV0hCCQJkrd8Ph5ssoNI 9fOdC0IYXvPLLvWlQ5sc4Ncqzf1dgANd7U7ozI3sLMp/HjDKAGGuhH83d2PxerBiJDDN mL4MPcWgiQ9iCXQED3yM80FiCQricX7YYGcdT0sWdQ4JgegBBSvQjOOG8eTy49N8v/Ks rQ7NjueiGVVbO5JyPfyR4njr1d1wV8mYZF33wWXdgRPqf9EFwMBEYLTMyJ05yX+qeJkN /VSg== X-Gm-Message-State: AKGB3mJBKFhWriUD3TM3mx4KEJRdHHH+eiCvT4HaeUMGkHjQ4OclfD+E GmbJBtbk2eoaiDBvBov1Wo7a2o8j X-Received: by 10.107.46.159 with SMTP id u31mr2577333iou.2.1513165503026; Wed, 13 Dec 2017 03:45:03 -0800 (PST) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id q6sm1106447ita.38.2017.12.13.03.45.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Dec 2017 03:45:02 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 05:44:52 -0600 Message-Id: <20171213114453.22089-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213114453.22089-1-rodger.combs@gmail.com> References: <20171213114453.22089-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavf/utils: add flag to discard timestamps on corrupted frames 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" --- libavformat/avformat.h | 1 + libavformat/options_table.h | 1 + libavformat/utils.c | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4f2798a871..d10d583dff 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1450,6 +1450,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer +#define AVFMT_FLAG_DISCARD_CORRUPT_TS 0x400000 ///< Discard timestamps of frames marked corrupt /** * Maximum size of the data read from input for determining diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b8fa47c6fd..515574d3e0 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -58,6 +58,7 @@ static const AVOption avformat_options[] = { {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, {"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, {"autobsf", "add needed bsfs automatically", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_AUTO_BSF }, 0, 0, E, "fflags" }, +{"discardcorruptts", "discard timestamps on corrupted frames", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_DISCARD_CORRUPT_TS }, 0, 0, E, "fflags" }, {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), AV_OPT_TYPE_INT, {.i64 = 1<<20 }, 0, INT_MAX, D}, diff --git a/libavformat/utils.c b/libavformat/utils.c index 8d49348d9e..2e15f34469 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -873,6 +873,14 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) st->cur_dts = wrap_timestamp(st, st->cur_dts); } + if ((s->flags & AVFMT_FLAG_DISCARD_CORRUPT_TS) && + (pkt->flags & AV_PKT_FLAG_HEADER_CORRUPT)) { + pkt->pts = pkt->dts = AV_NOPTS_VALUE; + av_log(s, AV_LOG_WARNING, + "Discarded timestamp on corrupted packet (stream = %d)\n", + pkt->stream_index); + } + pkt->dts = wrap_timestamp(st, pkt->dts); pkt->pts = wrap_timestamp(st, pkt->pts);