From patchwork Wed Jul 22 15:27:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21228 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 098DB44B467 for ; Wed, 22 Jul 2020 18:36:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E494068B71D; Wed, 22 Jul 2020 18:36:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7864868B559 for ; Wed, 22 Jul 2020 18:36:12 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id b9so1174760plx.6 for ; Wed, 22 Jul 2020 08:36:12 -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=5BZkdNEDcDUEVuOfWdF39o4FFTtgypqCaumzgxT27KE=; b=TKAXTUDwCw6EgnVovIOgGm6/Q95Rlpzyi9Q33aYSPQ9+W7yD89PV3zC0gn5qeILR2+ mvajsZy+HQUFr61UTmRrpRi58UGlGi8FwdNMnxF1yFJs7SxRpJIPH5Att2TgwO0unnFj uOEKYju2zG+C+eg6mKKDIZCNQ5eWP6OOx8cst1dz6KhG738TiVF+fe+nK6FgvHXJfZtR d7d04hUXzHxfelnfQoZqgwkEQnrUkqH1ufXhuv4QfX8w9w9lcKayvC/RFFhFoyrka7ut lqlnYrDcrgLIn7PtLSsiqUEB96RADsVJZo9K2bEbTCAn7tlZH5qUB8JKsKdlO21eHsT6 cGQA== 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=5BZkdNEDcDUEVuOfWdF39o4FFTtgypqCaumzgxT27KE=; b=WIodZmKbTqmlvqDF5MGgn7v0e181rSlKc/XXQ92y58IIi1bFyXAyr/7MGfh3z9oS/A 0sLuxpLVxW6HfZtOgBVKfePbTw633OMfrhnnPJSfhSGc8cNyz2Em8eGP8kGnurNfg6+C jkapVdI2UpCmHmzA20nJ/8RdRObagYel96tM+OABpYZ4dqv6WUt/btdrtixZxAXm6X3D LRvr/N2QMlE4IKlpvWrOhkWpPkbvNuMHL0R3U4ufFoq9L74E7yzCLjBb7ej/Csndp7Mg wLh4W7Ncu+kip0cZSdSjx0JPX5Ddk5ww8vQmtMLeQlGvfhHNiD9gEfI4nQs57C0pgrBh U2SA== X-Gm-Message-State: AOAM533oPXA1TL+XIxyuT6TDyv/ru+CMjkUQVbSyviILLCk5YeslMzAN eRF7k6ofItDNTozS9I4zag/gAKPi X-Google-Smtp-Source: ABdhPJzgnHu7kH6VeYx6Jjn4RaDo6ZZyOO6GNssYP7PsoPi3aNqxljUE8tf//rtsRENZsqfb7kwXdw== X-Received: by 2002:a17:902:8d95:: with SMTP id v21mr35909plo.108.1595431680982; Wed, 22 Jul 2020 08:28:00 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w71sm233889pfd.6.2020.07.22.08.27.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2020 08:28:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jul 2020 23:27:37 +0800 Message-Id: <1595431659-664-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595431659-664-1-git-send-email-lance.lmwang@gmail.com> References: <1595431659-664-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/8] avformat/mpegtsenc: support dvb ac3 descriptor by 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 Signed-off-by: Limin Wang --- libavformat/mpegtsenc.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 718ddab..a5b45fb 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -486,9 +486,50 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) case AVMEDIA_TYPE_AUDIO: if (ts->flags & MPEGTS_FLAG_SYSTEM_B) { if (codec_id == AV_CODEC_ID_AC3) { + int len = 1; + uint8_t component_type_flag = 0; + uint8_t bsid_flag = 0; + uint8_t mainid_flag = 0; + uint8_t asvc_flag = 0; + uint8_t componenet_type_value, bsid_value, mainid_value, asvc_value; + AVDictionaryEntry *component_type = av_dict_get(st->metadata, "dvb.ac3_desc.component_type", NULL, 0); + AVDictionaryEntry *bsid = av_dict_get(st->metadata, "dvb.ac3_desc.bsid", NULL, 0); + AVDictionaryEntry *mainid = av_dict_get(st->metadata, "dvb.ac3_desc.mainid", NULL, 0); + AVDictionaryEntry *asvc = av_dict_get(st->metadata, "dvb.ac3_desc.asvc", NULL, 0); + *q++=0x6a; // AC3 descriptor see A038 DVB SI - *q++=1; // 1 byte, all flags sets to 0 - *q++=0; // omit all fields... + + if (component_type) { + component_type_flag = 1; + componenet_type_value = atoi(component_type->value); + len ++; + } + if (bsid) { + bsid_flag = 1; + bsid_value = atoi(bsid->value); + len ++; + } + if (mainid) { + mainid_flag = 1; + mainid_value = atoi(mainid->value); + len ++; + } + if (asvc) { + asvc_flag = 1; + asvc_value = atoi(asvc->value); + len ++; + } + + *q++ = len; + *q++ = component_type_flag << 7 | bsid_flag << 6 | mainid_flag << 5 | asvc_flag << 4; + if (component_type_flag) + *q++ = componenet_type_value; + if (bsid_flag) + *q++ = bsid_value; + if (mainid_flag) + *q++ = mainid_value; + if (asvc_flag) + *q++ = asvc_value; } else if (codec_id == AV_CODEC_ID_EAC3) { *q++=0x7a; // EAC3 descriptor see A038 DVB SI *q++=1; // 1 byte, all flags sets to 0