From patchwork Tue Jul 28 15:03:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21342 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 8B48A44B6E5 for ; Tue, 28 Jul 2020 18:12:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68E8168B987; Tue, 28 Jul 2020 18:12:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC12468B94B for ; Tue, 28 Jul 2020 18:12:14 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id s26so11101157pfm.4 for ; Tue, 28 Jul 2020 08:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EZQJbfkRJ+jduH178/XhLG51alESBp9jhwDBlU13trs=; b=jpbskYzgBIth6mcJLDTc/PXJphn9KTAgL8OU2uESneXQYP/URjlodUGOFvfJwKHVZl mywD4KoZvGsy2jaQNIFAYaLE3gGfazDkYFTsZDIn+fTNTnX3Qf11jNxZA6cPV3QaZOZZ ZQnY3o1D4hN2k3dIcY4WywWgMHRUedExnraeqDC7Bj3O4l9BDlzZMbFWedmB8WQK0dlW nTuD/HP6ZuPhNlvb4AlM8KyUupGR4XI+PU1cxPwpJYYCS7NprdHzerFUqeyKmXrl4FJP Q32e8ZjUVw3zrWmccbjK51vBdh200ohNXKPfoeG4WR5tdOjDSxb2Rb6yXTAjf4J2t6nX mxFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EZQJbfkRJ+jduH178/XhLG51alESBp9jhwDBlU13trs=; b=BohhWDpiMuYFd39tpe9NRhleCiKdv3s233RXv+/u0fpoTQqNgk0cO3gFIGcVujInIr 3uE4fzZ6uCKbxMfbeOh5lqgT8bwqgtt1k6jOE5knkvb65WNsv6sZNkKnduMOmMK1fME5 Me6PokVMUOD6gyDKZt8W4cQrhG6XaevVFvtkoOSXMs+FejBlBu+rosSJqefZrbU7S2S/ UujBai5/uimeejgKVomgbBbCLYbe3WDi24dF7y5ld4j73Q987eqh0keBkVkaCP6oId7U Uo4t4REN1ZsbgDdJB6v+YJx0Rrucp6neP4TJozEctwsVtKYBzsU1Fm9kQ121SzsJSyJr dY9Q== X-Gm-Message-State: AOAM533a4xcnWdcgpTY239bKubBGZjjvlzsJGBKVa/Gd1vyLnGFp0mIl 488b6Jb3ssKvJUiTpLK0rMyZvczh X-Google-Smtp-Source: ABdhPJwB9rU4IKWjvFyUpTUUP9hwgQkNkabzymh6TymVP/ZZ1icYy+F8Yb0ryaUqrECnvhWbeQ3Mdg== X-Received: by 2002:a65:484c:: with SMTP id i12mr25981015pgs.145.1595948628358; Tue, 28 Jul 2020 08:03:48 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id m31sm3570005pjb.52.2020.07.28.08.03.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2020 08:03:47 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:03:32 +0800 Message-Id: <1595948614-10861-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595948614-10861-1-git-send-email-lance.lmwang@gmail.com> References: <1595948614-10861-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/dump: dump AV_PKT_DATA_MPEGTS_6A_DESC side data 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dump.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 6d29d85..b2e9721 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -28,6 +28,7 @@ #include "libavutil/log.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/dovi_meta.h" +#include "libavutil//mpegts_audio_desc_metadata.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" @@ -424,6 +425,19 @@ static void dump_s12m_timecode(void *ctx, const AVPacketSideData *sd) } } +static void dump_desc6a_conf(void *ctx, const AVPacketSideData *sd) +{ + const AVDescriptor6A *desc6a = (const AVDescriptor6A *)sd->data; + + av_log(ctx, AV_LOG_INFO, "component_type_flag: %u, bsid_flag: %u, " + "mainid_flag: %u, asvc_flag: %u, " + "component_type: %u, bsid: %u, mainid: %u, asvc: %u", + desc6a->component_type_flag, desc6a->bsid_flag, + desc6a->mainid_flag, desc6a->asvc_flag, + desc6a->component_type, desc6a->bsid, desc6a->mainid, desc6a->asvc); +} + + static void dump_sidedata(void *ctx, const AVStream *st, const char *indent) { int i; @@ -494,6 +508,10 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent) av_log(ctx, AV_LOG_INFO, "SMPTE ST 12-1:2014: "); dump_s12m_timecode(ctx, sd); break; + case AV_PKT_DATA_MPEGTS_DESC_6A: + av_log(ctx, AV_LOG_INFO, "ETSI 300 468 descriptor 0x6A(AC-3): "); + dump_desc6a_conf(ctx, sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd->type, sd->size);