From patchwork Sat Oct 27 21:39:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10805 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 DEA2544D8FB for ; Sun, 28 Oct 2018 00:39:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5719168A141; Sun, 28 Oct 2018 00:39:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AACAB689C3E for ; Sun, 28 Oct 2018 00:39:24 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id p2-v6so4424227wmc.2 for ; Sat, 27 Oct 2018 14:39:54 -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=YWd6VnDWY9qhPhfpxtDXGkTQNqQyx8BNaQORfGhbFyY=; b=ZjfObujVBNFDS1ML1wk+J+qUBAM1mMyQTnFjN4+R556BQpCOfpDrcYG7j0kwslbsTQ RmsCq00/sPns6gi4IJEd0c+6qcTXxBGsohRPTwMuwCshibBXAdFxGgyA9tLrpihZuON+ bKlwMHq3l7YAjZk692lAub7nQ2rRsLunm/RyTwX9wTAy/v4aVOOpi2VX8FCYcSTDIXlZ 3vCvgS+/4/yHQE8tWLvFO3gFLahzkVKdNwx3t0Pv5c5FGqDkseQo6kaadBHObcnwkWsf lIB/vblj6yLRNtiIFu4hS8BnuqsA5rRntnilYAg3fUkO063ghYsC/Nl4ljP615CPS2J1 +5TA== 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=YWd6VnDWY9qhPhfpxtDXGkTQNqQyx8BNaQORfGhbFyY=; b=JihnlU8QjMoHwg0z4CPPx6vwtwkXgGVyM49rUKOMvqdRFI5/d/ebp9PkaWl43Px6PI A+ej4i4p36TCzX1531Jk1+48oicUJF2hLTFAQSD3lyIv9dBVhJW84tXnrhBU4zildat8 81cNiR50q01pQ9rmIMQctOV6k3Up9KWyct2J/sPqw3ZmnzCrYA8zF4mzyowCGlQ9NtWr 3qAjgvv94Gv2OfOuURyeGu2oSSbxrkc74YTx2dDQIDD1mreqGutUgaf84wEuLSfwH6zk DDoL/fMQW//Z3PihiLdGwkDArLjd3cDOD9WeO2oDmcHTJ9bIlhRFvYrimKrUxouy9HQv FB7w== X-Gm-Message-State: AGRZ1gKlQkVJ215eLbicsDMMhTfrG9ZY2e5/yrq8/Os/9I0/FsCEZaRT mUJIsrjv71ipRwsEu0Wnq1Lx9/NrgJ0= X-Google-Smtp-Source: AJdET5e09lRUo1odUFeffGPfXV7MddKdTCTQZv7CzZk3TpZe+TIiXqW9ZpsZ5yzM6yTFTZ1cc217kA== X-Received: by 2002:a1c:2345:: with SMTP id j66-v6mr3300328wmj.79.1540676393700; Sat, 27 Oct 2018 14:39:53 -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 x18-v6sm7604798wme.42.2018.10.27.14.39.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Oct 2018 14:39:53 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Oct 2018 22:39:46 +0100 Message-Id: <20181027213950.27048-1-sw@jkqxz.net> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] cbs_h264: Include SEI type names in trace output 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" --- libavcodec/cbs_h264_syntax_template.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 9e29132fec..dbf9ff1268 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -513,6 +513,8 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, const H264RawSPS *sps; int err, i, length; + HEADER("Buffering Period"); + ue(seq_parameter_set_id, 0, 31); sps = h264->sps[current->seq_parameter_set_id]; @@ -605,6 +607,8 @@ static int FUNC(sei_pic_timing)(CodedBitstreamContext *ctx, RWContext *rw, const H264RawSPS *sps; int err; + HEADER("Picture Timing"); + sps = h264->active_sps; if (!sps) { // If there is exactly one possible SPS but it is not yet active @@ -674,6 +678,8 @@ static int FUNC(sei_pan_scan_rect)(CodedBitstreamContext *ctx, RWContext *rw, { int err, i; + HEADER("Pan-Scan Rectangle"); + ue(pan_scan_rect_id, 0, UINT32_MAX - 1); flag(pan_scan_rect_cancel_flag); @@ -699,6 +705,8 @@ static int FUNC(sei_user_data_registered)(CodedBitstreamContext *ctx, RWContext { int err, i, j; + HEADER("User Data Registered ITU-T T.35"); + u(8, itu_t_t35_country_code, 0x00, 0xff); if (current->itu_t_t35_country_code != 0xff) i = 1; @@ -731,6 +739,8 @@ static int FUNC(sei_user_data_unregistered)(CodedBitstreamContext *ctx, RWContex { int err, i; + HEADER("User Data Unregistered"); + #ifdef READ if (*payload_size < 16) { av_log(ctx->log_ctx, AV_LOG_ERROR, @@ -758,6 +768,8 @@ static int FUNC(sei_recovery_point)(CodedBitstreamContext *ctx, RWContext *rw, { int err; + HEADER("Recovery Point"); + ue(recovery_frame_cnt, 0, 65535); flag(exact_match_flag); flag(broken_link_flag); @@ -771,6 +783,8 @@ static int FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * { int err; + HEADER("Display Orientation"); + flag(display_orientation_cancel_flag); if (!current->display_orientation_cancel_flag) { flag(hor_flip); @@ -788,6 +802,8 @@ static int FUNC(sei_mastering_display_colour_volume)(CodedBitstreamContext *ctx, { int err, c; + HEADER("Mastering Display Colour Volume"); + for (c = 0; c < 3; c++) { us(16, display_primaries_x[c], 0, 50000, 1, c); us(16, display_primaries_y[c], 0, 50000, 1, c);