From patchwork Thu Jun 7 23:43:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9311 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp195001jad; Thu, 7 Jun 2018 16:47:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI0kY6GL9VJrh41KETYHMgIgM/E6WTyROYiGGEZOpsYvxoQyxwgCKX8sse8QF2pbxgk9VVk X-Received: by 2002:adf:9924:: with SMTP id x33-v6mr3387730wrb.29.1528415260098; Thu, 07 Jun 2018 16:47:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415260; cv=none; d=google.com; s=arc-20160816; b=FVoFcKaQBqKEZPFN3pCO8F0uL/eCBRopsFc7aoT+r/GvFrPz06On2eVPPIxX78Ygy7 jHtF7mjGCJlxbAXln0kZlLfvdJ1PfnKxJ3QwSu6jJp74T+EQ2lfQcCdYFe0CeZVj3XI/ 30bBJcU8pFFYLeElc8Ynnf2aulYvvTdsYW2bs5Blfd4aCVtuNChtBF7dcmY0bwe82uyR gL7IE8+B8dAujY1Ki0iPNFON+DfrNeBIYD6DEPtpoNyvL+bCQAA0+yeWGQMaGLyZpNyq LEwJBJ2+hAsGq/np4hu1SYuodSm8M3r8i+bb+b5EN7h01/UUMUrwRyVG3oSB/sc1nNCr L+qQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HG0oOID2RzFqsdKDbWTT8oxqONRmlu6saMJE5VF2hzA=; b=A0SUzspWGYI2fy/yGjKB1V4hbQv9uz/kViQob1WVqdcYu+8tkYYnk2ak9IeYAqXyho Fm1nyvYIIeSptqQQo8wTl5rt1TUe0+u2JQMl8hUAvTs1qc5W3oI1LhLUyLqJNjnhCExi v8D8wv6QWP6S7uC24aG9qJZ63NT51rGg8yqPzogLFfcdR+NYZ4OQWCqsnSE2ifv1OngL u+x8rnsQnyoh4njPWChae+j1v8ZH+F35g2dw9Vmko+hOF53OMp1xtNOX5G8nYIfT+Y5I S+M1BM0g2AumfIZUyGbI/FYxqgjqGw9BuCWFnPVONpfels35RHXCs3h37+wJym8Ylfjk vPJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=R4tLjTEX; 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 b63-v6si24501508wrd.47.2018.06.07.16.47.39; Thu, 07 Jun 2018 16:47:40 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=R4tLjTEX; 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 28AF068A86B; Fri, 8 Jun 2018 02:43:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9EAE68A81D for ; Fri, 8 Jun 2018 02:43:21 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id w7-v6so11521090wrn.6 for ; Thu, 07 Jun 2018 16:44:09 -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:in-reply-to:references; bh=uFdFA9VVNZUz44YpQBjPV9/Lh2tXORorL6uP2vrQd8U=; b=R4tLjTEX3/kX+Pp33sxW6rS8BttPoh6MO0St0mEUPev+l6f2H8VPUuQGYUUySlWNUv n/Gz7/C4hkdGMYXSsI64ysG6aVRrFaTvWwNKPK//GFzfxLbgFh4eKH9EjVauRMQksFan zqxBLzFO0EFhSNIwyrJmqogh6xoYzIFiK5Jkm5V1O3IbJj49hkE3a2fXqErZeK48VTTc NfilffDI7JQTF0ixGAF/G8xjuekXm+aZfxfYh0VPbD2KIvothl7lVD4NLNQzDUxKzvZj bwLRTFLupBGhF8DvrAhMxwbykWZV1+cUEluYwoh9qsIoDSqDUR8kmlERR20+57w/m65f BBww== 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:in-reply-to :references; bh=uFdFA9VVNZUz44YpQBjPV9/Lh2tXORorL6uP2vrQd8U=; b=pXreEt3SV/iEh66e6R2Iq+zw0LSGsO0LHG042/bxzFVmjYTQxqFTI7Maj4WvnqTGAb tj1eHF/vh2sUm8AcaMV5knHppwWVansK6F0oRb3pu++WAr1IuGWqyGDm0S/ttPPg27Rk C0HgxpyDnbJX9LMxghqOrJv5g20cjBqMoyYcDNRmzOduQ1e7JWB4XE2J8QdnTHrj6wRf u2d/MaXEzY3Gy5X+ZO+bBMuttADcz7/uRRl28ziAdH68X5w+D0UuilegJV2eGriNsC9i /CX6ZO9Mr0LaemqF+wUzpztmCmLIRqHo8Lw5+og5UaSmqDT2+I3jQLJYIG2Vej1A8bsr e04w== X-Gm-Message-State: APt69E3SQqiSTFd+SmA05xU6ET3vQ9tocBXAqCzY5Vf71BDl7ttQRrFk o/pfdThuDutLCZocdUy38KcWbqcH X-Received: by 2002:a5d:4b4b:: with SMTP id w11-v6mr3153175wrs.87.1528415048916; Thu, 07 Jun 2018 16:44:08 -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 r2-v6sm18640545wrq.55.2018.06.07.16.44.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:44:08 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:24 +0100 Message-Id: <20180607234331.32139-30-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 29/36] h264_metadata: Add option to set the level of the stream 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" --- doc/bitstream_filters.texi | 9 +++++ libavcodec/h264_metadata_bsf.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 7d7e97503a..d948c6d658 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -215,6 +215,15 @@ insert the string ``hello'' associated with the given UUID. @item delete_filler Deletes both filler NAL units and filler SEI messages. +@item level +Set the level in the SPS. Refer to H.264 section A.3 and tables A-1 +to A-5. + +The argument must be the name of a level (for example, @samp{4.2}), a +level_idc value (for example, @samp{42}), or the special name @samp{auto} +indicating that the filter should attempt to guess the level from the +input stream properties. + @end table @section h264_mp4toannexb diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 90ad4aad98..cb1a835fb8 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -25,6 +25,7 @@ #include "cbs.h" #include "cbs_h264.h" #include "h264.h" +#include "h264_levels.h" #include "h264_sei.h" enum { @@ -39,6 +40,11 @@ enum { FLIP_VERTICAL = 2, }; +enum { + LEVEL_UNSET = -2, + LEVEL_AUTO = -1, +}; + typedef struct H264MetadataContext { const AVClass *class; @@ -74,6 +80,8 @@ typedef struct H264MetadataContext { int display_orientation; double rotate; int flip; + + int level; } H264MetadataContext; @@ -208,6 +216,58 @@ static int h264_metadata_update_sps(AVBSFContext *bsf, CROP(bottom, crop_unit_y); #undef CROP + if (ctx->level != LEVEL_UNSET) { + int level_idc; + + if (ctx->level == LEVEL_AUTO) { + const H264LevelDescriptor *desc; + int64_t bit_rate; + int width, height; + + if (sps->vui.nal_hrd_parameters_present_flag) { + bit_rate = (sps->vui.nal_hrd_parameters.bit_rate_value_minus1[0] + 1) * + (1 << (sps->vui.nal_hrd_parameters.bit_rate_scale + 6)); + } else if (sps->vui.vcl_hrd_parameters_present_flag) { + bit_rate = (sps->vui.vcl_hrd_parameters.bit_rate_value_minus1[0] + 1) * + (1 << (sps->vui.vcl_hrd_parameters.bit_rate_scale + 6)); + // Adjust for VCL vs. NAL limits. + bit_rate = bit_rate * 6 / 5; + } else { + bit_rate = 0; + } + + width = 16 * (sps->pic_width_in_mbs_minus1 + 1); + height = 16 * (sps->pic_height_in_map_units_minus1 + 1) * + (2 - sps->frame_mbs_only_flag); + + desc = ff_h264_guess_level(sps->profile_idc, bit_rate, + width, height, + sps->vui.max_dec_frame_buffering); + if (desc) { + 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"); + level_idc = 62; + } + } else { + level_idc = ctx->level; + } + + if (level_idc == 9) { + if (sps->profile_idc == 66 || + sps->profile_idc == 77 || + sps->profile_idc == 88) { + sps->level_idc = 10; + sps->constraint_set3_flag = 1; + } else { + sps->level_idc = 9; + } + } else { + sps->level_idc = level_idc; + } + } + if (need_vui) sps->vui_parameters_present_flag = 1; @@ -683,6 +743,36 @@ static const AVOption h264_metadata_options[] = { 0, AV_OPT_TYPE_CONST, { .i64 = FLIP_VERTICAL }, .flags = FLAGS, .unit = "flip" }, + { "level", "Set level (table A-1)", + OFFSET(level), AV_OPT_TYPE_INT, + { .i64 = LEVEL_UNSET }, LEVEL_UNSET, 0xff, FLAGS, "level" }, + { "auto", "Attempt to guess level from stream properties", + 0, AV_OPT_TYPE_CONST, + { .i64 = LEVEL_AUTO }, 0, 0, FLAGS, "level" }, +#define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ + { .i64 = value }, 0, 0, FLAGS, "level" + { LEVEL("1", 10) }, + { LEVEL("1b", 9) }, + { LEVEL("1.1", 11) }, + { LEVEL("1.2", 12) }, + { LEVEL("1.3", 13) }, + { LEVEL("2", 20) }, + { LEVEL("2.1", 21) }, + { LEVEL("2.2", 22) }, + { LEVEL("3", 30) }, + { LEVEL("3.1", 31) }, + { LEVEL("3.2", 32) }, + { LEVEL("4", 40) }, + { LEVEL("4.1", 41) }, + { LEVEL("4.2", 42) }, + { LEVEL("5", 50) }, + { LEVEL("5.1", 51) }, + { LEVEL("5.2", 52) }, + { LEVEL("6", 60) }, + { LEVEL("6.1", 61) }, + { LEVEL("6.2", 62) }, +#undef LEVEL + { NULL } };