From patchwork Sun Oct 15 15:04:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5569 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2782051jah; Sun, 15 Oct 2017 08:05:50 -0700 (PDT) X-Received: by 10.223.134.250 with SMTP id 55mr6391900wry.249.1508079949931; Sun, 15 Oct 2017 08:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508079949; cv=none; d=google.com; s=arc-20160816; b=aUNfpPQqJ+xE4h2fAmxiEwo0NidSHt326LD1ffQ9YDSwLoPMR7bN+ZzZHSA+mWqY5C zgp32M/CKFmtVZyjATHlLbsm7GRaWRrKDIltLAOVOANTIwBEHbTpqKqaozz0iiJVIXpp RFgI4gHrusqtYNv/AkWaqXD0+ZbrcdnqSFNS5f6dIPJA97hh/1HRUHMk6psJUg1dUh+g OGSaoXpWYVSADAWM2GtNI3hUiKKitZ7OqQD6hdBhFiYKs130gZte3txGyOwaNwgUge+g dvT8qkGzE7QDoEZxdB1ce/GCOrjKK1FW88KHgoNU/D2CgpSnx4fMQ0T0LhS16pXSaiiv 6xgg== 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=yMNJv+F1wJcjdHeo2wQ9BIHmc/21eCvGMhbsXV49A8k=; b=qQZmSXfN9oq6lPAMrBct9Qbf2MFDYMnVkOM3s5XGK7/GP0VH6l8V6cRz72nYkgneRf c2o1KQWcmd4WB0fByjwpqSER0UuZ7sG1sDJmb/Lvkn5+85Kt2I5j1WBoU/xbju9+xAFe CacvcPnojFg2OP6MvSMqdko8qIXlvUdCcFIZiRQP5/ldSO4sgI2ckAZbJ8ZTrPSkRf5d N857JdrEDzhGbmL6klsJ8e1ljVJNsQhmw5iYRpXtBq9QY3kurMBLJaB/CUa6a86OIQKg rv/Ao0TSs0mNDf+X6We/qsVC2J5WZMJqm6/u19bnF4DPr78wYPDCFYkDRT7UT5osdAWA bhzw== 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=LE7HTZts; 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 s67si1672063wme.273.2017.10.15.08.05.49; Sun, 15 Oct 2017 08:05:49 -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=LE7HTZts; 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 827B268A1DD; Sun, 15 Oct 2017 18:05:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1972868A1BC for ; Sun, 15 Oct 2017 18:04:56 +0300 (EEST) Received: by mail-wm0-f46.google.com with SMTP id f4so29643440wme.0 for ; Sun, 15 Oct 2017 08:05:00 -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=4V3BPE40BbwTYX5s/kWox2oOOBdv3m/4LeDHg6+HIAQ=; b=LE7HTZtsqCPsj0Xe8bkidGaIkXewC+i4OLLAc93wfwR7uiGREVNDYzcZoSzIzFKoxx pLWKRrNcuy71YvovOLUZob0NhtKRYRAd+bvkNDg/Xkm2qhJ9dr6y6L7iTaJb4hOWRpP5 c3/sEYsQlg7QHKRSWu2FfULYGka89RZibJbyoO4WSP+a+nHK4B10RWt/DU/giYhoRe1R FRFqm23VrRVklHVid+58AptYe33TkufzGyBbDN28I5UP3MN1imqsa+cw0LWi8tnp4coz omARD0DqVaZE8dnR6U41W9/eo2VVKSzJCwHe4CHXa5nxudqVGdNvW1TeW2/DzI4XFMHc hQfw== 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=4V3BPE40BbwTYX5s/kWox2oOOBdv3m/4LeDHg6+HIAQ=; b=kCaMSSQUT3cRmBbOYlYBAoHtuyHvk6U75CJ84yPg2ZR49GZ0TTp4xv/77P4CQAnHl0 OGz0Huop+PkaXpDBVs0S0vbqvcnSz8h5hc157qPdDUpb0lu3KLGjZnqICyw0claq3uFy wXae1tKD3U1X7JPk1m6a88Cz694nxKC65EGBtTbxe7igvizdoVLgrO5iqnYOiwy54y3j /NfEmsT9QOmCShe6tv5nU2VH8QXvMkg9nPk+yR0JoB3RuCRHblUp7SD3T78JkJtLe5gU PmcxziryLIkWCft5gsRgHCuj6wHrGPKnXEPWdTgBOKsW7WfkKtKiO5Eu9say9IHycDsh vLNg== X-Gm-Message-State: AMCzsaUzvvcVME9MkO314IJVaZw4FHIdUAvp0MGd/qD6Bu7jBvW+HEkX 5GoYH01C73nzjMlCH6KWmANBPBS6 X-Google-Smtp-Source: AOwi7QBjoYnYquZZn+pwv4t3B5cZCWeRZ1foDor7ihyUanhCtQByF3sT50+gIzPXOnJMM0Hy9booRQ== X-Received: by 10.223.167.76 with SMTP id e12mr5541771wrd.259.1508079899525; Sun, 15 Oct 2017 08:04:59 -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 h4sm2080508wre.13.2017.10.15.08.04.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Oct 2017 08:04:58 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Oct 2017 16:04:34 +0100 Message-Id: <20171015150447.18058-8-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171015150447.18058-1-sw@jkqxz.net> References: <20171015150447.18058-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 7ef922c27b..c26480df68 100755 --- a/configure +++ b/configure @@ -2914,6 +2914,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 0265c92130..5e09889bc6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1028,6 +1028,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..93d04cb509 --- /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, +};