From patchwork Wed Jun 2 11:48:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp469306iof; Wed, 2 Jun 2021 04:49:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRfkICiuFZls2U8fAzGv6k9gp9Ky1SIiI+RQ5DKHk6bqo3bjiLWdVpYX3/JpBzbaTzTbU/ X-Received: by 2002:a17:906:a281:: with SMTP id i1mr33244471ejz.307.1622634544931; Wed, 02 Jun 2021 04:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622634544; cv=none; d=google.com; s=arc-20160816; b=Z+NkPGlkgFc93RlFShzWokSOZX3GGBZAkayWmCRCm/IKAAul+ploepytoCY3PEgESI nzXkhe2r7e59Eg2E0AwN7aRa15NMnwTiv39VdxwOsasHmZei4A4QdbWsUad+cOHEoPFM W+S+txBpfIUyWtmBdo68izhzBgY0gFcS4RnT3DcOa/Ho0ymzSyT73lYpe1ukpL1ZW+Y9 EbqVWKbKVbyRC0w4AHprUtUKvp57Keu+jAVINyt2tz+XGR9cO1vJU64+gWOV1uLru/EO tJ5AZZEgZrDNzdSSilVmN8wxCq0se+Pq0X+cxxLAWGbImy9cTWgqw0ZJFnAexeyEhXm5 FN8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=P+HRVt6ChprkuWGjZOOJTnhBOZlHWL5C5rDSg0dWLUs=; b=eCnk9AVR6GcjuJTBFs4WhuvB9zPuW8plfDUXwwYbLztixN8aUiWQnJL2LbzoyhKTMx BmY9Y32Vp5ZTNu1Ia170M2wJFkUmZ28aih6mghPEFa3oAtp/5fVcQWneUdBjpwQoYf8r v0YDYNFgKaxVvAmQNgu+ZM4syzo3OQOhKgLOu7l2EKSDiERsJ1topkxyD5HxgD8v1ze+ a5p/PI3XKmDw4+APGbLdFCcG2buZeze+4zrtKqEDXuiASirEhjMcX5h2eFv5shmjXwoj zsw7ZIyYogDQELxZ1Lw0Uo9/tJCQ8iSxyZ8L/gf5X1nmzENaW6tgEB0hvKcYZaKig48/ A49g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="XLX/IbAD"; 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=QUARANTINE 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 mp12si18422516ejc.245.2021.06.02.04.49.04; Wed, 02 Jun 2021 04:49:04 -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=@gmail.com header.s=20161025 header.b="XLX/IbAD"; 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=QUARANTINE 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 194C0689FCE; Wed, 2 Jun 2021 14:48:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27A17689FFE for ; Wed, 2 Jun 2021 14:48:47 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id x38so2882424lfa.10 for ; Wed, 02 Jun 2021 04:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfKWf+Q+ukeFxMGQvE+/xZAUkzaUdKswmGwe85EhCDk=; b=XLX/IbADDkg0U2I502Picta2Xt6qB3K/wlGeh7a7TB5oH4+jNKE9M3dUM0Lz3KHL7V qFNfHnq0gKmPo1akdQ5WpyypRxvo5XbP+GlemCkpHCDZtMNVcIHrZZmJj2omBF8KHsHI 1h/6T+WtTRbLenEP8wqlE/UqslQYQ95mSrpYRIqwiK5CC45azcWzvoftKIWh1wAb7vmx eigqp9kOud2xU4DrX7Ye2zq4ZAVf8JRf6pbfIQfgTrXl+Ak3NDnl3ZHJOxeR+GBxP7eD kVbkrLFuVqhkSOpGIzLA1OIUkqvXV2G/WSUlHMQOa2ofhQd9QPIhBR/AzlD5r2eu4lvI OmCA== 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:mime-version:content-transfer-encoding; bh=SfKWf+Q+ukeFxMGQvE+/xZAUkzaUdKswmGwe85EhCDk=; b=GBv/PNYFGUEZkYLD2fBpibhLbaeeD+hbQ+OwwhuTmWEuCt9ys1RntjPV6mUNNEV90o 8jaFM3DW5pQWBS545uLSAMDuiGolT4P1eZlgwa9pddYAqhmunO2tnf77ZUraSSB5+O6f SGoMXmBE/9gApp3zW9jPdYqLXREv/QMRBGeqsEdd9iByAobujqhy7BEv5ztXQjOcyIQq o7qTXmq7rYtpVdAegPIkS958EQEXOm8eqbLaHmaQcUpnssI3oiO5lvuduK0g2VwcYFJu CgubgtJGJAtPk4HKnj7gyg/0VJ6U9+fMICq9ko6D5ytTuEzaJGY3OK2PvrCSQIeFGaO2 QSDw== X-Gm-Message-State: AOAM5312FTpoHYjZKWKYhaiJK1dFNYgLeW6zR2KWw7kTHlOAVImBq30L Xn//+clCsahwJP3oJz9VFJBEDRs1sQaY+w== X-Received: by 2002:a05:6512:3d20:: with SMTP id d32mr21165761lfv.459.1622634525451; Wed, 02 Jun 2021 04:48:45 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id x24sm1981606lfr.4.2021.06.02.04.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 04:48:45 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jun 2021 13:48:32 +0200 Message-Id: <20210602114832.2295-2-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210602114832.2295-1-dcnieho@gmail.com> References: <20210602093301.2073-1-dcnieho@gmail.com> <20210602114832.2295-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: handle unknown sample time X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R2CIhwWopcml GetTime may return an error indication that the sample has not timestamps, or may return a NULL start time. In those cases, fall back to graph time Signed-off-by: Diederick Niehorster --- libavdevice/dshow_pin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c index 8408af26da..5b9e91002d 100644 --- a/libavdevice/dshow_pin.c +++ b/libavdevice/dshow_pin.c @@ -320,8 +320,10 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this, IMediaSample *sample) /* PTS from video devices is unreliable. */ curtime = graphtime; } else { - IMediaSample_GetTime(sample, &curtime, &dummy); - if(curtime > 400000000000000000LL) { + HRESULT hr = IMediaSample_GetTime(sample, &curtime, &dummy); + if (hr==VFW_E_SAMPLE_TIME_NOT_SET || curtime==NULL) { + curtime = graphtime; + } else if (curtime > 400000000000000000LL) { /* initial frames sometimes start < 0 (shown as a very large number here, like 437650244077016960 which FFmpeg doesn't like. TODO figure out math. For now just drop them. */