From patchwork Sun Jul 28 18:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 14107 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2C8E5448019 for ; Sun, 28 Jul 2019 21:23:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06F8E6801A4; Sun, 28 Jul 2019 21:23:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFE916800E4 for ; Sun, 28 Jul 2019 21:23:20 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id l2so51525012wmg.0 for ; Sun, 28 Jul 2019 11:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=F9hIqMZNndjcH7jCM7AelwqQprdod5MaPKlkAKgPgrs=; b=0oyh6NAJ/AvkSe/HyeKY1H8BoJe73cbVxM9sIPzENffy/TC/NowQ1VQ4mDI5MeT4FR PJwTnefM2nAFHrYWUxNNeKvFiK60d1ctLyhaIlnSiFG9h2vmK7+l8ObSEaheGnzSI7uq 9g0haoRjU5azZ3dgN8FzEBXQfMi0UgOi9/fEdSRN9W9JvwmVDoZYphWrMkQL01jzqtat KrcvU14KWLj1yiuyMnMDoK0aBtDyDPpoe4pVnzFBTCS6c65PS4u4GDTfz22D/PYVqncA ovLOvIeKYA2Txr6Lr+wLUeYLFl5E0qZfa0mwD0Isa3Y0zu5UiPrAiS6qeurPa/YqLt8b +Ihg== 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:mime-version :content-transfer-encoding; bh=F9hIqMZNndjcH7jCM7AelwqQprdod5MaPKlkAKgPgrs=; b=hrB5jGFklPTU5xNGWdCwCkMxGiKbalpHi4ALyucc/5BStA0YgjAxN/dNW43ptg0ROS xlNkSRLOm0nG9srog2cprD8fnDkPAmeuTaMiDUcUnQ6TZ3zt3asoIkF8v7/D/mErjhN8 TnB2/2z62enNxmaqbH5tDzr+V6l7AQuOFY+nsFwJEdx+bONFuZ+t4tqscFjDazQUurAX PKp+GibA9h1/X/NISYsh1dwqWnp/svwptgYhrhAtYk5T+qImmopv17MUar41iYPoHk9b b5rMpn3fEkeCw3lfGdSUVRsEX9PyCHJICpQiBczSnspKmSlrwXXjp6uyKGTHAsBBPjUb hu0w== X-Gm-Message-State: APjAAAVbmrEc7YO0hUqLUBa8uY9LwsSdNznmNh6D1bK6xGOSseUQXGol 9hWtjMeMCNIxzf8ntdInbqtODhbK X-Google-Smtp-Source: APXvYqxP+xjJ572/2UTHGreuZBD/sfYgpKKvQ6v43MW71D9R20SCbKt49RjcDldUPZZc3UXk9Vc5aA== X-Received: by 2002:a1c:e710:: with SMTP id e16mr98135038wmh.38.1564338200055; Sun, 28 Jul 2019 11:23:20 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id i66sm99219312wmi.11.2019.07.28.11.23.19 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 28 Jul 2019 11:23:19 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2019 19:23:15 +0100 Message-Id: <20190728182316.8700-1-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] cbs_h264: Fix missing inferred colour description fields 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" With video_signal_type_present_flag set but colour_description_present_flag unset the colour fields would not have had their correct values inferred. --- libavcodec/cbs_h264_syntax_template.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 26be6e590f..1671a15d33 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, ub(8, colour_primaries); ub(8, transfer_characteristics); ub(8, matrix_coefficients); + } else { + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); } } else { infer(video_format, 5);