From patchwork Thu Jun 7 23:43:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9312 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp195295jad; Thu, 7 Jun 2018 16:48:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI98pk4+JFP2UFXsxVX+eucfAgPK+3Purxw/mxxGWw1c/yRhWG5vvS9H4eYRQOe9ZFHv6mc X-Received: by 2002:a1c:7212:: with SMTP id n18-v6mr2948898wmc.5.1528415283838; Thu, 07 Jun 2018 16:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415283; cv=none; d=google.com; s=arc-20160816; b=iNB/DeIPP4vsIlRi15yPUnuRwGKHlgUvmxNblK2RfdZetJyC/MeAQAGTg8WAJ/bWCG x4oc/9mZcwIhIGZwuNn2w66L0vJcQHWo/Cvz4mgljnMeEonk5QLTorUOXnn/mHzT5ycV RC5zFbjHw/S52pK83C7jIN4CdXPhqTKN5RDnygBTwM/5bAQPQWeH0oyS6nH/CRsZg9LX rv8HbOXA0OJs5+LfogHmTqy6os2B7MPRJ+1MfhWXjIPgMGShoiHP9qXV4e0xDvPGfxsg KUEyxvb17w1sr6tKTWNxkHtW5fjY+CDbkUOMO68Pu5qKdjMzynNjiQeIjeaLltF5NOkQ mseA== 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=wZPoaVUp9/pvwvSEv7EtZPPCrgVu6xd8u7kcHLqVxNI=; b=oSfu3jM3ThtESZX1k8LJSqHPpRtsClhDd9N6tQKZqNz1rj72UAw/QwmEliS2ydzsCk 8aWe3nmfWvyere47cw9fW0BMG5ahY/Sr4tdbz5rw32ze8dmwIaG/HtNEerz7MS1JVu0X zzh8PQ3MotmSwS/FO8G5LaPbhm8B8ML12cypT8jmEliLFTV9fmin6hwIggNNZYupJk88 JmRd8/+NLIbqFfhW0akmWqiARKLovka0n6rIPThpDLGYF0crCPMHkzeEGHrnaikFw2Vu LFnten/SUlncauWbMQW5Vh02x+yZx7hMNUq4Q4ZAMlPk8lz8H2AlC4fj7FogGfNQz/7W seGQ== 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=S7wwi7kW; 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 z14-v6si27128345wrc.263.2018.06.07.16.48.03; Thu, 07 Jun 2018 16:48:03 -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=S7wwi7kW; 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 D2CD568A889; Fri, 8 Jun 2018 02:43:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCA2368A87A for ; Fri, 8 Jun 2018 02:43:24 +0300 (EEST) Received: by mail-wm0-f51.google.com with SMTP id o13-v6so226548wmf.4 for ; Thu, 07 Jun 2018 16:44:12 -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=9w9ndcniUHteLGQW23OO8idn/Kg1xmtzPdvOsG2iW5Y=; b=S7wwi7kWrZhCUxjMZc9VrFsYs3A6p/jlhUFIDSv81tal9CAM+Zq1LHCbMmSklm9o/d fcBxbJqo+QSPu3VpDnBmrY3NRmKEdLJQZv0eV3fgK4wxyUe2DtFon627VwdJiux4XwrV dUKUdOs156pEIP8AcfDbTz3rd+6ToIcTHqMu0kOhndZmTwW6zogvmWVG+oCYAPOoGioI 5EaHPLlpwWCG2dj160EZjsNjfaS2llT8awYF0j/2ZNShBVSdGMR599dbRvsWnVGgovK6 +0il7oOiqHVdi2Uof/goY0r2BE8S5Htf7a8yXAu9wXLWn8JQTzezyxsSYKjdCyJrORpT I1vg== 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=9w9ndcniUHteLGQW23OO8idn/Kg1xmtzPdvOsG2iW5Y=; b=ouTRap8OaeLltgXDXwzNgJHVIH94mr79X+D5EtyQHc1j6o6N4rYdmDXZYHpFEzl5+p mtIiiRLT9dys0BneSCis3mKrFYkzNKSTrUI329Ttg7Y1n95E0c5mJWSlPTPUhMcmSev8 QzULOJYFE4lpxlN8UlZo2zdWj7AxTHUixAjJ4GUu9loYoikpnuX/1S9aPLq4tYTtU4EY 9a2KdXX2pxZY6/RGfzfqDPTzhSKjoWmGTe8x/gw1PCVOqDzrSyYvif+dk+rZz1bHoOCa p1dIrE/N50OflvCwefRUsmNfGI8JjYQ+Ce8MZc6c0Z+GMdshc3e9vMp6A4IwAuw/D8iW 7GZQ== X-Gm-Message-State: APt69E10QtecX1clrjvANBQRIAM9iylzalzzqxU+EpGcrCvSziN+Sw/M hoJTmJTGGLn8pEJS01AqLM46z2ei X-Received: by 2002:a1c:58a:: with SMTP id 132-v6mr2727026wmf.95.1528415052058; Thu, 07 Jun 2018 16:44:12 -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.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:44:11 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:27 +0100 Message-Id: <20180607234331.32139-33-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 32/36] cbs_h264: Infer default VUI values if VUI parameters are not present 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" --- libavcodec/cbs_h264_syntax_template.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index f53c02467e..03f2a15b0b 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -211,6 +211,46 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } +static int FUNC(vui_parameters_default)(CodedBitstreamContext *ctx, + RWContext *rw, H264RawVUI *current, + H264RawSPS *sps) +{ + infer(aspect_ratio_idc, 0); + + infer(video_format, 5); + infer(video_full_range_flag, 0); + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); + + infer(chroma_sample_loc_type_top_field, 0); + infer(chroma_sample_loc_type_bottom_field, 0); + + infer(fixed_frame_rate_flag, 0); + infer(low_delay_hrd_flag, 1); + + infer(pic_struct_present_flag, 0); + + infer(motion_vectors_over_pic_boundaries_flag, 1); + infer(max_bytes_per_pic_denom, 2); + infer(max_bits_per_mb_denom, 1); + infer(log2_max_mv_length_horizontal, 15); + infer(log2_max_mv_length_vertical, 15); + + if ((sps->profile_idc == 44 || sps->profile_idc == 86 || + sps->profile_idc == 100 || sps->profile_idc == 110 || + sps->profile_idc == 122 || sps->profile_idc == 244) && + sps->constraint_set3_flag) { + infer(max_num_reorder_frames, 0); + infer(max_dec_frame_buffering, 0); + } else { + infer(max_num_reorder_frames, H264_MAX_DPB_FRAMES); + infer(max_dec_frame_buffering, H264_MAX_DPB_FRAMES); + } + + return 0; +} + static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, H264RawSPS *current) { @@ -315,6 +355,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, flag(vui_parameters_present_flag); if (current->vui_parameters_present_flag) CHECK(FUNC(vui_parameters)(ctx, rw, ¤t->vui, current)); + else + CHECK(FUNC(vui_parameters_default)(ctx, rw, ¤t->vui, current)); CHECK(FUNC(rbsp_trailing_bits)(ctx, rw));