From patchwork Tue Oct 4 16:33:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 874 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2245845vsd; Tue, 4 Oct 2016 09:34:06 -0700 (PDT) X-Received: by 10.28.62.20 with SMTP id l20mr4382381wma.45.1475598846683; Tue, 04 Oct 2016 09:34:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t18si6145199wmd.78.2016.10.04.09.34.05; Tue, 04 Oct 2016 09:34:06 -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=@googlemail.com; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6354689DD0; Tue, 4 Oct 2016 19:33:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B49296899E0 for ; Tue, 4 Oct 2016 19:33:42 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id p138so20491769wmb.0 for ; Tue, 04 Oct 2016 09:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rhphmua+mBfd/zVuNPF/O7nnoCdGxCE06Oj1xwIokFU=; b=X6T9YKmB/POxHkRjRzkwcHdros2dtqkdP0Q77MdzExx0bdr7oHbIjySJzkRROkLtEu Zdbcn/Zn9L3n4qDKmIQAZ3QT9txOb4R8+7oCivVPT/DWqeN7FRrV82tNEFk5aXuGnC+P sm9Smk65mrRozbhEaVhGnsehz38D4yUHT0sB4w0ykO3vNM4hZnaCC4ERX+eznQjFhdOf 6YtT0UwLAKC7SLYNe1qG0WvDr4FMKsnZT725nDjZ4tVa/5zTzuNSDudZ/JQOZyFqHJoP 7UQO7WbxVHcM9IEODAjBgfUch+vjp+91oFv6H4TuTGSjm7MRTg/sr9HWIL/sFSOK1boc C9eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rhphmua+mBfd/zVuNPF/O7nnoCdGxCE06Oj1xwIokFU=; b=GI3AQWTuz9o9HeOHl34mJcz5iYeUTRdmTEYaWC65CuJ/P6zNf33yVI+pYMUsq+ujjU mKss9G05yTH0qsHKPAXZ+fwLvFMABTYkGEFcePCoNJn2k2ol0pJ4Eo1qxiDG3fD1R3ip GtfzbbZ30xjO6mkYY0qlmFdYKwwYO1rk9VNvGBhROORYwlA8vz24MhEpEGLRNuEdp3Gk ONjMkmLfsEMV1YGlgXfFkIgQ5ei/jEXtcUZBQwIR+BhsCcVaJoPQgkls7nNeGSmv4uN1 S7O5Qk7snNcSJW1LU7mcnBp6h1FPkLlP/N+bLWJvJW8D9XuCCbdUkeH3JWRsFglNcTcN CjYw== X-Gm-Message-State: AA6/9RmhbyhNQQsCX63YAQ3JHejGYhP++zx9wht7ZMnQVrD5N34l0zM3AND/tDPAeQ9Zsg== X-Received: by 10.194.189.198 with SMTP id gk6mr3766808wjc.167.1475598836943; Tue, 04 Oct 2016 09:33:56 -0700 (PDT) Received: from localhost.localdomain (p4FF00092.dip0.t-ipconnect.de. [79.240.0.146]) by smtp.googlemail.com with ESMTPSA id o5sm4894165wmg.16.2016.10.04.09.33.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Oct 2016 09:33:56 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2016 18:33:48 +0200 Message-Id: <20161004163348.24786-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161004162139.GH5270@nb4> References: <20161004162139.GH5270@nb4> Subject: [FFmpeg-devel] [PATCH] lavc: set best effort timestamp if unset when using new decode API 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some API users (in particular ffmpeg.c) check the best effort timestamp only. --- Using guess_correct_pts() - not sure what I was thinking. --- libavcodec/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ef3da65..9f8f9c7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2867,7 +2867,14 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr if (avctx->codec->receive_frame) { if (avctx->internal->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) return AVERROR_EOF; - return avctx->codec->receive_frame(avctx, frame); + ret = avctx->codec->receive_frame(avctx, frame); + if (ret >= 0) { + if (av_frame_get_best_effort_timestamp(frame) == AV_NOPTS_VALUE) { + av_frame_set_best_effort_timestamp(frame, + guess_correct_pts(avctx, frame->pkt_pts, frame->pkt_dts)); + } + } + return ret; } // Emulation via old API.