From patchwork Tue Sep 12 23:43:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5112 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp296766jaa; Tue, 12 Sep 2017 16:46:05 -0700 (PDT) X-Received: by 10.28.72.131 with SMTP id v125mr983229wma.134.1505259965363; Tue, 12 Sep 2017 16:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505259965; cv=none; d=google.com; s=arc-20160816; b=mDfYscywwkBtJXCvApdUIy7atLfrx4bEAvwFLcFTOvdvNigQHOvQ5OdDex22M8vJxN dluc854ryU0cLMvNiv/YKbDOzDTsBmKofDF7dfiQaQ4pJX4uRbMCw1UKukS3dIavl3o9 5sYBvr12f1X9lu0kyTM6I9+Qrg3ws8+HZnGmdYyPoTwfIHzU3vB/JICU7dY2DQLuw4RP m+MZp2u2ivE2/3bYveK//uxcPOrjwaySxTt6vqY1FwE0f2c4MMKheV7Rm8+whbjJxd++ /mMLf5vaVmbAyhPyDe6HbT8gPDpgc0lX6q3ew3yidWmODGELV+IeGjQ1ydZa/SLNHOTB XHCQ== 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=LtnF/UeaiKqlCcUFVHkE50iKUlS5K7FWwIVymKZz/hI=; b=xlADZs039ewdq2FGsjPZB/F/7Vma06RsHYpLPnlY6TmT4X3GJaNYPDKG+AB36RZY8b lh4pUA7Zy4IwnoQnGOHbDVsk3G1XgovZMBumkyQV7sj//bleBisArEwjhtLypE1CXsp9 wHyFsqMY84d5mwMEqfvAPEaw81KXgyzCTly3PBpP7Yfzsh/n1x2OW8EVMOYt0iGacO+t Vdp/5E/IozgMj7jMgmIHhEGdviaLKVcyfHrk7uemO9m09AoRw843d8ih/E17LAFkPeL8 n7RQcMJksSNwwAQq332B/6O5x3vv7Udr0dfVBcIxRYjb7gf8aolAsNxo48RG31d8Z/9G +02Q== 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=jwB93bxI; 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 f37si2464716wrf.171.2017.09.12.16.46.04; Tue, 12 Sep 2017 16:46:05 -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=jwB93bxI; 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 5DE88689E5D; Wed, 13 Sep 2017 02:44:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0911689E1C for ; Wed, 13 Sep 2017 02:44:15 +0300 (EEST) Received: by mail-wr0-f181.google.com with SMTP id v109so25569394wrc.1 for ; Tue, 12 Sep 2017 16:44:22 -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=WOstuyug3JrZ8cgIZSuMasC3BonJGZR7PWL1Ivd03/k=; b=jwB93bxI4w9XHR7ZN100R8s2Kw5nXvBf0ntMLvTTA5hFQZhmWWgHqFxN4bd9oe0FD6 tZXcY2kC5z15NHxonMPOwj9FJ1Q66dZ1Fme22iQYPpbBYhsDbDCk5oyfWW53g20W2dWB bzQwTCozYskBZVlzTY78TWDejX5nsl6Dftk3LZ7oLxkQp+h37tGcCgi/DkPOcL3fHovb lihh7nCJyi85HpzEdkBW7TEyWhEIS/GLlPJPCHjDfUm4SejFGvm4l6iRRy9Vl1MNniIf vElqfgnXt4or+lQ3bwosUAB6Ak9i5PR5/9Tf6SYvvNRJQ7wK5QJSF2grZjKYO3Pwl1mL NlbQ== 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=WOstuyug3JrZ8cgIZSuMasC3BonJGZR7PWL1Ivd03/k=; b=QIplYspcgf0QhTTBmtD3TzV7UhTRNADVd9k1uNmmmc8mLuXjey9EE+tZsCxDK1Cjp0 P6VeksdbFJ87eoKPZP9W9vFsg5LfySFTmpsQv+uqnJ4stUCsnGBFGomhsXmjPkTi3MY5 MrA7fXLMJN1ag5x7dV7ANEF2nZNbjvUm0jKbYU9AFxn7Il7DK5OwytUhHCY6Ie3P5TOQ tXe5hNkkjl+r9QuHZexwC09BctlHqq6YGCvT76tDdME7uImarjG1DETe7s4LALdwMKj+ FVOAXgHIcMw3xzS+Wxk2O75Pzq7J0cRUzqa51z16BrHEtujt0u1oIttEkJ0mA9Dhj8jm xqmg== X-Gm-Message-State: AHPjjUgOPc922q37Fj5+Z1LXVPjAeyEzfaals6PZxH4GM0vQoYfhrs3v VM0z5K6XSx5Vil7qX44= X-Google-Smtp-Source: ADKCNb7L6f+lxed4165kJRImHk8PRySzDO5T9cUx654Km4sIFAIqPKr0J28CmQMQAGeHIc27Ir8EeQ== X-Received: by 10.223.165.5 with SMTP id i5mr13195004wrb.87.1505259861305; Tue, 12 Sep 2017 16:44:21 -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 p193sm4378138wmg.37.2017.09.12.16.44.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:44:20 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 00:43:57 +0100 Message-Id: <20170912234410.14093-8-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912234410.14093-1-sw@jkqxz.net> References: <20170912234410.14093-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 07/20] lavc: Add trace_headers bitstream filter 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" Supports all streams that the coded bitstream infrastructure does (currently H.264, H.265 and MPEG-2). (cherry picked from commit f11d8a5e8b185340cc50fcbc8a1437b0fbe7e931) --- configure | 1 + doc/bitstream_filters.texi | 8 +++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/trace_headers_bsf.c | 126 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 libavcodec/trace_headers_bsf.c diff --git a/configure b/configure index 2ef31a888b..ee4d642d35 100755 --- a/configure +++ b/configure @@ -2852,6 +2852,7 @@ vc1_parser_select="vc1dsp" # bitstream_filters mjpeg2jpeg_bsf_select="jpegtables" +trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2" # external libraries aac_at_decoder_deps="audiotoolbox" diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 2dffe021f9..990b4f3c58 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -275,6 +275,14 @@ codec) with metadata headers. See also the @ref{mov2textsub} filter. +@section trace_headers + +Log trace output containing all syntax elements in the coded stream +headers (everything above the level of individual coded blocks). +This can be useful for debugging low-level stream issues. + +Supports H.264, H.265 and MPEG-2. + @section vp9_superframe Merge VP9 invisible (alt-ref) frames back into VP9 superframes. This diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 13860734d3..b7ea51ee4c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1007,6 +1007,7 @@ OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o +OBJS-$(CONFIG_TRACE_HEADERS_BSF) += trace_headers_bsf.o OBJS-$(CONFIG_VP9_RAW_REORDER_BSF) += vp9_raw_reorder_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += vp9_superframe_split_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index ce34de640d..dd0247182b 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -41,6 +41,7 @@ extern const AVBitStreamFilter ff_noise_bsf; extern const AVBitStreamFilter ff_null_bsf; extern const AVBitStreamFilter ff_remove_extradata_bsf; extern const AVBitStreamFilter ff_text2movsub_bsf; +extern const AVBitStreamFilter ff_trace_headers_bsf; extern const AVBitStreamFilter ff_vp9_raw_reorder_bsf; extern const AVBitStreamFilter ff_vp9_superframe_bsf; extern const AVBitStreamFilter ff_vp9_superframe_split_bsf; diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c new file mode 100644 index 0000000000..9ea6308a61 --- /dev/null +++ b/libavcodec/trace_headers_bsf.c @@ -0,0 +1,126 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "libavutil/avstring.h" +#include "libavutil/common.h" +#include "libavutil/log.h" + +#include "bsf.h" +#include "cbs.h" + + +typedef struct TraceHeadersContext { + CodedBitstreamContext cbc; +} TraceHeadersContext; + + +static int trace_headers_init(AVBSFContext *bsf) +{ + TraceHeadersContext *ctx = bsf->priv_data; + int err; + + err = ff_cbs_init(&ctx->cbc, bsf->par_in->codec_id, bsf); + if (err < 0) + return err; + + ctx->cbc.trace_enable = 1; + ctx->cbc.trace_level = AV_LOG_INFO; + + if (bsf->par_in->extradata) { + CodedBitstreamFragment ps; + + av_log(bsf, AV_LOG_INFO, "Extradata\n"); + + err = ff_cbs_read_extradata(&ctx->cbc, &ps, bsf->par_in); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n"); + return err; + } + + ff_cbs_fragment_uninit(&ctx->cbc, &ps); + } + + return 0; +} + +static void trace_headers_close(AVBSFContext *bsf) +{ + TraceHeadersContext *ctx = bsf->priv_data; + + ff_cbs_close(&ctx->cbc); +} + +static int trace_headers(AVBSFContext *bsf, AVPacket *out) +{ + TraceHeadersContext *ctx = bsf->priv_data; + CodedBitstreamFragment au; + AVPacket *in; + char tmp[256] = { 0 }; + int err; + + err = ff_bsf_get_packet(bsf, &in); + if (err < 0) + return err; + + if (in->flags & AV_PKT_FLAG_KEY) + av_strlcat(tmp, ", key frame", sizeof(tmp)); + if (in->flags & AV_PKT_FLAG_CORRUPT) + av_strlcat(tmp, ", corrupt", sizeof(tmp)); + + if (in->pts != AV_NOPTS_VALUE) + av_strlcatf(tmp, sizeof(tmp), ", pts %"PRId64, in->pts); + else + av_strlcat(tmp, ", no pts", sizeof(tmp)); + if (in->dts != AV_NOPTS_VALUE) + av_strlcatf(tmp, sizeof(tmp), ", dts %"PRId64, in->dts); + else + av_strlcat(tmp, ", no dts", sizeof(tmp)); + if (in->duration > 0) + av_strlcatf(tmp, sizeof(tmp), ", duration %"PRId64, in->duration); + + av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", in->size, tmp); + + err = ff_cbs_read_packet(&ctx->cbc, &au, in); + if (err < 0) + return err; + + ff_cbs_fragment_uninit(&ctx->cbc, &au); + + av_packet_move_ref(out, in); + av_packet_free(&in); + + return 0; +} + +static const enum AVCodecID trace_headers_codec_ids[] = { + AV_CODEC_ID_H264, + AV_CODEC_ID_HEVC, + AV_CODEC_ID_MPEG2VIDEO, + AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_trace_headers_bsf = { + .name = "trace_headers", + .priv_data_size = sizeof(TraceHeadersContext), + .init = &trace_headers_init, + .close = &trace_headers_close, + .filter = &trace_headers, + .codec_ids = trace_headers_codec_ids, +};