From patchwork Mon Nov 12 14:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 10998 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 680D144DEA0 for ; Mon, 12 Nov 2018 16:19:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D306068A350; Mon, 12 Nov 2018 16:19:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 235FF68A2B1 for ; Mon, 12 Nov 2018 16:19:02 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id z13-v6so9555649wrs.3 for ; Mon, 12 Nov 2018 06:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/QR7qQBm9HQN9k32y1EqETDUVNil87nmMjuGxxfOJEc=; b=kFxCtZ2lMrHc8pKiLN/ndEpVceoHKTOqjYxngfmKqzPn85nRDFckRXVzFPZUmxEaVl wnkhggEvxJlSGACtCIqZg+l6wW3O/XxL9j2nMevPp2BldBV/3EgYDiYX8aLYrMw423WZ 73lgDn2yMsUaMRAOjNEeePvvPZ8q+3in6RL7sUqGG2XmNRV9URIgKu+7U9vpay8NpEO6 okT7bixKA7ByJBJogwtdWnnCIvDQYNTHqxmIUzaQ9OBTSPZrFMCQ03mP60+Dj+E6aX+1 V9rgJZvDIoqKwKxUMlEgkXQzuHQAr9KtSAge4TvOymeJRLZZ7ayv2NLqQFXL3s2u+yxW mDOg== 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=/QR7qQBm9HQN9k32y1EqETDUVNil87nmMjuGxxfOJEc=; b=Cbi768cw6dr3bJzPaAhtZg6E5Jt1Ej/QpFZqs6vJaFQ3J6FIa90MlLHVgGQlOIb5VC GtuSWtOnPQTGbnMAwCodHXSiG9+K1sXWLBXUYvujILgyj0IGf43//in/sIs6gflhh6nZ eS/pi6ZHut69eso6wWBM1VnZiX5oeF1gz+5r9Xi0NcsDf+f4hvvZXeU7YDRdL0crH43F e0CZqfUpKXJbZ728tl60fozKLXFJhl0pIWsKa/RKMSXsd46BOywmmc0ivGI4YtP93Ch4 imU8wJ9+bi90fKs25rYB+LBI0O4cfGmeO3yHKHk5d/MtdvP6OQvO6NDePhjMDIMkZRR4 KYhA== X-Gm-Message-State: AGRZ1gJ8QKeiDT2eGJLqu73/dDPP6eEF2kkO8cXQSxZMZ1oadNvLdey7 MW7EchxCrMJe5rz+O1sVDFikkDRM X-Google-Smtp-Source: AJdET5d70DdmX9zPQhS3XvthN+ALuf6javK15wyqCjs3lToJK+lvoJ0oaDkjDed50vXqpDPpJaWZXQ== X-Received: by 2002:adf:84a4:: with SMTP id 33-v6mr1157296wrg.191.1542032378218; Mon, 12 Nov 2018 06:19:38 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id 11-v6sm16981626wmk.26.2018.11.12.06.19.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 06:19:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Nov 2018 15:18:14 +0100 Message-Id: <20181112141815.4472-4-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181112141815.4472-1-andreas.rheinhardt@googlemail.com> References: <20181112141815.4472-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] h264_metadata: Fix handling of level 1b 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The earlier logic had two errors: 1. If level 1b for a non-High profile had been guessed, level 1b was not always written to the output, because constraint_set3_flag wasn't set. 2. If a level different from 1b that shares its level_idc with 1b was intended to be set, constraint_set3_flag wasn't cleared so that the output could mistakenly be read as 1b (in case none of the High profiles is in use). Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_metadata_bsf.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 521bc36b7e..7fe213e8cd 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -244,7 +244,12 @@ static int h264_metadata_update_sps(AVBSFContext *bsf, width, height, sps->vui.max_dec_frame_buffering); if (desc) { - level_idc = desc->level_idc; + if ((desc->level_idc == 11) && desc->constraint_set3_flag) + // This ensures that for level 1b the correct level + // will be inferred below. + level_idc = 9; + else + level_idc = desc->level_idc; } else { av_log(bsf, AV_LOG_WARNING, "Stream does not appear to " "conform to any level: using level 6.2.\n"); @@ -264,6 +269,15 @@ static int h264_metadata_update_sps(AVBSFContext *bsf, sps->level_idc = 9; } } else { + // If the earlier level was 1b or the new level + // is in danger of being mistaken for 1b, + // we clear constraint_set3_flag. + if ((level_idc == 11 || + sps->level_idc == 11) && + (sps->profile_idc == 66 || + sps->profile_idc == 77 || + sps->profile_idc == 88)) + sps->constraint_set3_flag = 0; sps->level_idc = level_idc; } }