From patchwork Fri Jan 19 12:01:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 7345 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp744792jak; Fri, 19 Jan 2018 04:02:26 -0800 (PST) X-Google-Smtp-Source: ACJfBouiWzQS4Z6d/yl/Uao/BmFWAG8xHFPEywbUbjWAFRpoJ0N0Jut7UhFoSNcLWVSphQY2FCrM X-Received: by 10.223.130.119 with SMTP id 110mr9741527wrb.139.1516363346818; Fri, 19 Jan 2018 04:02:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516363346; cv=none; d=google.com; s=arc-20160816; b=SfRMdqM6zbxgA3AFCAG7R16N+vJGG2lWK7GpjaGlPybduNQwTH68gCkwOi13+wqe03 TwbveOFK6Yext8R5ZkBqptIjiYJEb50pk70p+J+dVbKIeaboGWhtlhx3zJyokTsm075p jV6fFdvXFFoKNLSAm8JMywUGk2Q+S+7MTkNXP6a+1JJ0fnxKbTqZEeOIhCVPUMW32P4q 1KaNjW4O287CKultzInDhlNahewMacfI5XhRYavIOcbQBX1ucpggIkh6yKD1HKjDAUbY c0YAHaxJhuOez+76ZhM+udL4icV8zFbWFrzQPMvwPE7hTRz2W995iwMdsUYllVdpVv9C 4VCw== 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:message-id:date:to:from:dkim-signature :dkim-signature:delivered-to:arc-authentication-results; bh=tC2t2NOOOGFq/JVV83esRxUmvCvnvsF5CnASCsFMNOM=; b=p5xTilnDdafds7Syh5fybHQIm/d9KgnIqhKjIsvJUhswgWWG84ILI7UU0amZR7ywdM EnHJvxr5jj3uxGwzAKLXsyTpDg9vAdRGv+nTuPAYsZ3k8ef2P2BsRn6Ari+APPQWmEF1 Y7ufrYfBlD+uJIhSBz8R+zEHrLobqj2e/SOtLNDo88mNJwoADO0AuVUdWyOIJ4aqRoKg AKxZm6/vaRzS+HStF7JvuIrMFlP5TAZPmfWWftSuq+a+Fx8AARx7/UgpYSdNfqojlm7a VcfuMj83bLNiWOLZMcgehpG9lqyA/VClsX0X6R1RDEfsN0w1yI3wZ1J4gmsYC5D3Fhf6 eVpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ycbcr.xyz header.s=fm1 header.b=mj3Yjxwq; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=bfvHoAvi; 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 i88si7650412wri.258.2018.01.19.04.02.25; Fri, 19 Jan 2018 04:02:26 -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=@ycbcr.xyz header.s=fm1 header.b=mj3Yjxwq; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=bfvHoAvi; 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 4D77568A387; Fri, 19 Jan 2018 14:02:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EAD1689E21 for ; Fri, 19 Jan 2018 14:02:16 +0200 (EET) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id 538BA19B3 for ; Fri, 19 Jan 2018 07:02:14 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 19 Jan 2018 07:02:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ycbcr.xyz; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=NX6n3PUZ4TxLsLhXr9GGoaoCZ2pMglrJvYMJzxE45 Yo=; b=mj3Yjxwqd3v/gGeLQcxWl7OCYitlpDD4wxRDKGRaSmINnS2FyZy+UPv7a dnbQXpENxDXS319WIfRZLKX3lO/eG7d2a1ryjpYViIjszvwdjlC3jujXwubeaP9o fNVWA43aw6IBIeEAGNiOV8QzvqsmVzbp+JjkMUo6ePDot2htRSExZ/xUbVos6tfW gyyWdLdJtKAPWxf+Z7ks/mW9Xt5s/dRaFOBC/cbbKUClHUAtq0TbAoVF9IF41E9N 8tQ1XOlVhE+Izde4/M9VXwb5P0j8Tim3DExS3FAZTenFsw427sslfIRfl2A+tAlw vCINFZXvzOKHN7AO2hRLZSVqE5wNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=NX6n3PUZ4TxLsLhXr 9GGoaoCZ2pMglrJvYMJzxE45Yo=; b=bfvHoAvizuRoXpMPMouD1Mur+fmA8PP3K u+Zr8sNUnYPwAPJDHJUamHrCy2kPYIiklr75eAP6oL810CJSWs80q1N9mUsW2/e2 4nBkFfHwDm+EIBA8YVUEycqmCSXjWcEDArHNhWTccmhGKgNvBWtt3ZBYZEHIfRdo yjccmjy8kVqzqNvRejEzqH/56NlX1bMpaKljxWb42Sm07kZpICppa8eaqMnDpsAE GJXH/X/Umo9k5avyAGaL1OGUjSh4qOmHbvCGeFwHiDft3SiXiV+k0N7IPSISpyhF 2wjj8ZvoDGbutpOjb67PygOJ5rN4EhBhQDGpyXfupaR4IISl5bWcw== X-ME-Sender: Received: from localhost.localdomain (lfbn-lil-1-746-86.w81-254.abo.wanadoo.fr [81.254.79.86]) by mail.messagingengine.com (Postfix) with ESMTPA id 6710E7E0FA for ; Fri, 19 Jan 2018 07:02:12 -0500 (EST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jan 2018 13:01:56 +0100 Message-Id: <20180119120156.6796-1-robux4@ycbcr.xyz> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_slice: use the new SAR early when setting the decoder 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" If we don't do that get_format might not be called for a while and the proper SAR not used. See the sample mentioned here: https://trac.videolan.org/vlc/ticket/19435 --- libavcodec/h264_slice.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e6b7998834..319a37f5b6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1050,8 +1050,10 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl || (non_j_pixfmt(h->avctx->pix_fmt) != non_j_pixfmt(get_pixel_format(h, 0)))) must_reinit = 1; - if (first_slice && av_cmp_q(sps->sar, h->avctx->sample_aspect_ratio)) + if (first_slice && av_cmp_q(sps->sar, h->avctx->sample_aspect_ratio)) { must_reinit = 1; + ff_set_sar(h->avctx, sps->sar); + } if (!h->setup_finished) { h->avctx->profile = ff_h264_get_profile(sps);