From patchwork Wed Jul 22 15:27:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Limin Wang X-Patchwork-Id: 21230 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 EC4A844B563 for ; Wed, 22 Jul 2020 19:22:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD56668B7EF; Wed, 22 Jul 2020 19:22:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E42168B546 for ; Wed, 22 Jul 2020 19:22:24 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id j19so1526261pgm.11 for ; Wed, 22 Jul 2020 09:22:24 -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; bh=BamH8Ylxh6xfuswwBaN5fxZEZhmptG/oIn9JxQirY8I=; b=J15H9nvaBpEhwwRQvHG27l3SWdG/dx2EvLXaDNaxK6qHFiF9P4VHSKWtzgwbCeZ6Lq 6gKbO0UFGBEv56KOBItBXRLDeorHw0T7SgIt18JFZuQtCz8lBzExLeOZANyi4qY/4Zwf auLXg+LQ0jn1ntGBQ0BLB7V3VjPS+2xEt88gqX9jijFygQOwUMfT1qJjcDBV+3Yjvdxp LaGHJO8ZdLRBOqNWyQTre5XVlOyROV1tH6D1Xk87XUUr7Nj/RHifBjsnVUFwbufNUD1g UfkyLhpXc72HiuZfqt3oiGUJA0vTWK4nNyiYpP2QTH43SyR/KqxCdpZ9Xar8Dg8pRzpm Ahog== 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; bh=BamH8Ylxh6xfuswwBaN5fxZEZhmptG/oIn9JxQirY8I=; b=Ihr/yOWB8WGLGlc4LUsfHuHZbFanrlLNjjpiB1679JGv6D0Xpq3xs+U387AMuUNjxP JY34T5A7aLS+i+q+bZrrBoiOjIwGcahzW5Kcx9VlaxrnolDjzKLCcCpQauUu/OKbCqBt fcrL6RmjjCidKqJR8dVJG09CMvunADdaaRBEIjJlapCqZXq9YqxYKp1RKlFmniOv+I1V 8Z5zop7yM7yYuUA7RCwpa11ZPObkHr5VcdAD8ZLMJ2Fm3cuCRhEwawcxtEXI/H2CU2ws x0/9GOOyB3DkBwwlh2kGM3jPybbL+ctUx/Itb83WtJ6N6njHrurW9XqEBaYPEM3oOgMH wNrg== X-Gm-Message-State: AOAM532DYyL1A0/m3NXFdwcai2pT2sGxAne9EDE9xe88c0Ut1bQBY4Pr HPuINXDtF62n9A/vKue/Le9jeeNL X-Google-Smtp-Source: ABdhPJwZnQN0PXFdBUz9r6jKxfpudOV9FMv1XUHjrGuXyEC/nByMjzmXd9ODCKdVdBQajTtvNvOefA== X-Received: by 2002:aa7:9909:: with SMTP id z9mr169908pff.139.1595431672739; Wed, 22 Jul 2020 08:27:52 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w71sm233889pfd.6.2020.07.22.08.27.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2020 08:27:52 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jul 2020 23:27:32 +0800 Message-Id: <1595431659-664-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/8] avformat/mpegts: add dvb ac3 descriptor metadata 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 Below is one metadata information for the ts with dvb ac3 descriptor audio: ./ffmpeg -i ac3_desc.ts ... Stream #0:1[0x294]: Audio: ac3 ([6][0][0][0] / 0x0006), 48000 Hz, 5.1(side), fltp, 448 kb/s Metadata: dvb.ac3_desc.component_type: 68 dvb.ac3_desc.bsid: 6 dvb.ac3_desc.mainid: 0 Signed-off-by: Limin Wang --- libavformat/mpegts.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c6fd3e1..1ed7eaf 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2073,15 +2073,33 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type break; case 0x6a: /* ac-3_descriptor */ { - int component_type_flag = get8(pp, desc_end) & (1 << 7); + uint8_t flags = get8(pp, desc_end); + uint8_t component_type_flag = flags & (1 << 7); + uint8_t bsid_flag = flags & (1 << 6); + uint8_t mainid_flag = flags & (1 << 5); + uint8_t asvc_flag = flags & (1 << 4); + if (component_type_flag) { - int component_type = get8(pp, desc_end); + uint8_t component_type = get8(pp, desc_end); int service_type_mask = 0x38; // 0b00111000 int service_type = ((component_type & service_type_mask) >> 3); if (service_type == 0x02 /* 0b010 */) { st->disposition |= AV_DISPOSITION_DESCRIPTIONS; av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, "New track disposition for id %u: %u\n", st->id, st->disposition); } + av_dict_set_int(&st->metadata, "dvb.ac3_desc.component_type", component_type, 0); + } + if (bsid_flag) { + uint8_t bsid = get8(pp, desc_end); + av_dict_set_int(&st->metadata, "dvb.ac3_desc.bsid", bsid, 0); + } + if (mainid_flag) { + uint8_t mainid = get8(pp, desc_end); + av_dict_set_int(&st->metadata, "dvb.ac3_desc.mainid", mainid, 0); + } + if (asvc_flag) { + uint8_t asvc = get8(pp, desc_end); + av_dict_set_int(&st->metadata, "dvb.ac3_desc.asvc", asvc, 0); } } break;