From patchwork Fri Aug 14 14:35:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21661 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 6145A44ABE5 for ; Fri, 14 Aug 2020 17:36:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3919168AF49; Fri, 14 Aug 2020 17:36:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3085D68AD4D for ; Fri, 14 Aug 2020 17:36:01 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id ha11so4478598pjb.1 for ; Fri, 14 Aug 2020 07:36:01 -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=aK1/bh5JztRo46KK10YVhQyPpVZ/xvN/LGnMr+e2DFY=; b=oxcM+qbAmk78vK2hGPIaI14n9ad+Q2eXqHh0qOzv39RNZznk0ZB+EXqxR5rFnXmnFD qF1NGdbB132VfAGoeJ480gBTIGElTV5c69CrHORkaxf57K8JjoipOwFsRW0xjQayfrL1 2yiSocpLvaQa7R1ytX7nu4+oYcnL3mqGJ1pZcGG4Kg8jJNdPPax5kyNRFy5+La1Af5PN 34qrkpVSDbZK4MNNw5DZERdZtJ3wngAOraOcWvIgKDK396hcsBs/SyR8zLonRXmiW9mG n76b4eG+4qwSQn1m6RHsDGwuTAZzUIokitz/UaPPmUyfzuqJfu/q0eX5tVy8/Eh2cJyQ VscA== 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=aK1/bh5JztRo46KK10YVhQyPpVZ/xvN/LGnMr+e2DFY=; b=t/SjKfYBh7WUfh/CqFv5Kl17lsyD14S6IfwwrJT+rxoWj8uy8W70KiSZTmc4Wpyrr1 zjOkRSL3Xf7ij4E9DEEJm3tQIdZl8SR2byH1f4Wq5l/DR4qKWMEOy9uzYTEzDymQt9dZ 4o8wm7IovS9+hgkWFgrxKO77FtvjGirum7yQIJGVb/nwSyXYcIDqJMw1kM2HhJzj6kUd 4glOyHiTSxv9fTCgbfXCgUyk7MIrcXXMRkFkgEHFfDlDHcBBnHvXrRwByqGVzXLb0XXs eOBQudeSIDJ+AO7gJNii++FQKCAdFNeiR/eLl0yTdlT4UEj48Mgy4c+CXgnmqJga5nXg pxTQ== X-Gm-Message-State: AOAM531+3UMuK/IC+FvEAmRGlPN0gO4ZlV6vggS1s0leJiA1PbegEOYi f033ORYONm+5yW1q3Hf1bu90/N5f4XY= X-Google-Smtp-Source: ABdhPJxfsEuJXrLebBGQy5VddTNZd5QK8xxK4/AAFGYE/pQ90Iclcs9HnflXZRvFzmeZshB8GxEZnA== X-Received: by 2002:a17:90b:ecd:: with SMTP id gz13mr2554889pjb.197.1597415759074; Fri, 14 Aug 2020 07:35:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b185sm9543931pfg.71.2020.08.14.07.35.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2020 07:35:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Aug 2020 22:35:16 +0800 Message-Id: <1597415717-22817-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mpegtsenc: support DVB 6A descriptor for AC-3 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 --- Sorry, fix for the patch order for fate test libavformat/mpegts.h | 16 +++++++++++ libavformat/mpegtsenc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index fe10b38..951aa61 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -175,6 +175,22 @@ typedef struct Mp4Descr { SLConfigDescr sl; } Mp4Descr; +/* + * ETSI 300 468 descriptor 0x6A(AC-3) + * Refer to: ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems) + */ +typedef struct AVDVBAC3Descriptor { + uint8_t component_type_flag; + uint8_t bsid_flag; + uint8_t mainid_flag; + uint8_t asvc_flag; + uint8_t reserved_flags; + uint8_t component_type; + uint8_t bsid; + uint8_t mainid; + uint8_t asvc; +} AVDVBAC3Descriptor; + /** * Parse an MPEG-2 descriptor * @param[in] fc Format context (used for logging only) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 718ddab..e9ac08d 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -27,6 +27,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" +#include "libavcodec/ac3_parser_internal.h" #include "libavcodec/internal.h" #include "avformat.h" @@ -244,6 +245,8 @@ typedef struct MpegTSWriteStream { /* For Opus */ int opus_queued_samples; int opus_pending_trim_start; + + AVDVBAC3Descriptor *desc6a; } MpegTSWriteStream; static void mpegts_write_pat(AVFormatContext *s) @@ -486,9 +489,28 @@ 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) { + AVDVBAC3Descriptor *desc6a = ts_st->desc6a; + *q++=0x6a; // AC3 descriptor see A038 DVB SI + if (desc6a) { + int len = 1 + + !!(desc6a->component_type_flag) + + !!(desc6a->bsid_flag) + + !!(desc6a->mainid_flag) + + !!(desc6a->asvc_flag); + + *q++ = len; + *q++ = desc6a->component_type_flag << 7 | desc6a->bsid_flag << 6 | + desc6a->mainid_flag << 5 | desc6a->asvc_flag << 4; + + if (desc6a->component_type_flag) *q++ = desc6a->component_type; + if (desc6a->bsid_flag) *q++ = desc6a->bsid; + if (desc6a->mainid_flag) *q++ = desc6a->mainid; + if (desc6a->asvc_flag) *q++ = desc6a->asvc; + } else { *q++=1; // 1 byte, all flags sets to 0 *q++=0; // omit all fields... + } } 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 @@ -1843,6 +1865,59 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) * need to count the samples of that too! */ av_log(s, AV_LOG_WARNING, "Got MPEG-TS formatted Opus data, unhandled"); } + } else if (st->codecpar->codec_id == AV_CODEC_ID_AC3 && !ts_st->desc6a) { + uint8_t number_of_channels_flag; + uint8_t service_type_flag; + uint8_t full_service_flag = 1; + AC3HeaderInfo *hdr = NULL; + AVDVBAC3Descriptor *desc6a; + + if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) >= 0) { + desc6a = av_mallocz(sizeof(*desc6a)); + if (!desc6a) + return AVERROR(ENOMEM); + + service_type_flag = hdr->bitstream_mode; + switch (hdr->channel_mode) { + case AC3_CHMODE_DUALMONO: + number_of_channels_flag = 1; + break; + case AC3_CHMODE_MONO: + number_of_channels_flag = 0; + break; + case AC3_CHMODE_STEREO: + if (hdr->dolby_surround_mode == AC3_DSURMOD_ON) + number_of_channels_flag = 3; + else + number_of_channels_flag = 2; + break; + case AC3_CHMODE_3F: + case AC3_CHMODE_2F1R: + case AC3_CHMODE_3F1R: + case AC3_CHMODE_2F2R: + case AC3_CHMODE_3F2R: + number_of_channels_flag = 4; + break; + default: /* reserved */ + number_of_channels_flag = 7; + break; + } + + if (service_type_flag == 1 || service_type_flag == 4 || + (service_type_flag == 7 && !number_of_channels_flag)) + full_service_flag = 0; + + desc6a->component_type_flag = 1; + desc6a->component_type = (full_service_flag << 6) | + ((service_type_flag & 0x7) << 3) | + (number_of_channels_flag & 0x7); + desc6a->bsid_flag = 1; + desc6a->bsid = hdr->bitstream_id; + desc6a->mainid_flag = 0; + desc6a->asvc_flag = 0; + + ts_st->desc6a = desc6a; + } } if (ts_st->payload_size && (ts_st->payload_size + size > ts->pes_payload_size || @@ -1934,6 +2009,7 @@ static void mpegts_deinit(AVFormatContext *s) AVStream *st = s->streams[i]; MpegTSWriteStream *ts_st = st->priv_data; if (ts_st) { + av_freep(&ts_st->desc6a); av_freep(&ts_st->payload); if (ts_st->amux) { avformat_free_context(ts_st->amux); From patchwork Fri Aug 14 14:35:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21662 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 907B844ABE5 for ; Fri, 14 Aug 2020 17:36:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79A5868B3D1; Fri, 14 Aug 2020 17:36:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE93968B4E8 for ; Fri, 14 Aug 2020 17:36:02 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id g7so3135861plq.1 for ; Fri, 14 Aug 2020 07:36:02 -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=nPV6o1soFRQwScZ/cmPpfs6ngptDg2dCy4oh2xQ6c14=; b=Jx/4ddXxT2rmkZ8P653c4YW3R+fYMROKznfY0dL4vVy2QDDhK/5HxxkkzqVSPZ+y5V WYib7n3nfLY9XOAO/tdwqIyAzDyEQ63L0Dry8C0beNqifHQiPhA1P+jgr2o7h7Y5kWTS QMcBTLU3VICRdbW+A664yvJ/WqxcK2pPDC9/iWogfuH1eDHMOF5fc6JwqYn2r+Kk4q2b /7Va7Jn4zFNlFSQTHCW0AauTxL7j4C+R3+dNX9mAM2823mUtF3rUS32TCbAjFB8sBUha LSkbRMrGgL9uHnN6rSCCa2ys9q/ZJ0/BK6j3ebb2+mIYmgtxa1SsWEeY+m2CFKSy8Vzj /wMA== 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=nPV6o1soFRQwScZ/cmPpfs6ngptDg2dCy4oh2xQ6c14=; b=KDRIl6NmJcasuwivLY9PXQGoooNJoGQ1ajcfNDNxhJN4kGlax2hQJ+FKiEbp/E4kZY tMxwKQUQ7PnvktpEv9nTYOnLoPa8F7Nq+LffBQr7Ac5LgNTQBywkRMi42Wwm6FyC/rfj HEaKrUXbsNYIe4KkYRK1L2jwsxkjuQ+NLrpHFvJad/ODUCk/BNROjalli8K/7/iupSTJ XXS9w+M+91c0C4ngHcxfr1kpgrlihWhyZMGAkmvJu3YKzgiHEPGBfCXu5cu08BaYqAKW En1c/n+GzXhb8MNFt7tVe67OF6J2PAoX5gctFXlHacYr/kSNI5DVqy3TqdDejgLxB7K6 5xAQ== X-Gm-Message-State: AOAM533v73n5RbW9iQw9UaUf0NycEikU4GRDUqvSRxFAEnLOVKf2+TQt IgsPCJ21J25pyku8Y6LcWUL8249RSHY= X-Google-Smtp-Source: ABdhPJwmWBaiY9IQVlx0UQUTXD62xUliXnJHBvmtcxN/uDnxMhs3cKeyCtEUSAzn8MWN6fwVSljLlw== X-Received: by 2002:a17:90a:1546:: with SMTP id y6mr2464875pja.93.1597415760669; Fri, 14 Aug 2020 07:36:00 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b185sm9543931pfg.71.2020.08.14.07.35.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2020 07:36:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Aug 2020 22:35:17 +0800 Message-Id: <1597415717-22817-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1597415717-22817-1-git-send-email-lance.lmwang@gmail.com> References: <1597415717-22817-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpegts: parse for AC-3 descriptor 6A 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/mpegts.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index f71f18a5..72cc72a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2075,16 +2075,57 @@ 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); - if (component_type_flag) { - int component_type = get8(pp, desc_end); - int service_type_mask = 0x38; // 0b00111000 - int service_type = ((component_type & service_type_mask) >> 3); + AVDVBAC3Descriptor desc6a; + uint8_t buf; + + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + + buf = get8(pp, desc_end); + desc6a.component_type_flag = (buf >> 7) & 0x1; + desc6a.bsid_flag = (buf >> 6) & 0x1; + desc6a.mainid_flag = (buf >> 5) & 0x1; + desc6a.asvc_flag = (buf >> 4) & 0x1; + + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, "Stream[0x%x] AC-3(6a):", st->id); + if (desc6a.component_type_flag) { + int service_type; + int number_of_channels; + desc6a.component_type = get8(pp, desc_end); + service_type = ((desc6a.component_type >> 3) & 0x7); 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_log(ts ? ts->stream : fc, AV_LOG_DEBUG, + " disposition: 0x%x", st->disposition); + } + number_of_channels = desc6a.component_type & 0x7; + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, " component_type: 0x%x number_of_channels: %u", + desc6a.component_type, number_of_channels); + } + if (desc6a.bsid_flag) { + if (desc_end - *pp < 1) { + return AVERROR_INVALIDDATA; + } + desc6a.bsid = get8(pp, desc_end); + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, " bsid: %u", desc6a.bsid); + } + if (desc6a.mainid_flag) { + if (desc_end - *pp < 1) { + return AVERROR_INVALIDDATA; + } + desc6a.mainid = get8(pp, desc_end); + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, " mainid: %u", desc6a.mainid); + } + if (desc6a.asvc_flag) { + if (desc_end - *pp < 1) { + return AVERROR_INVALIDDATA; } + desc6a.asvc = get8(pp, desc_end); + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, " asvc: %u", desc6a.asvc); } + if (desc6a.component_type_flag || desc6a.bsid_flag || + desc6a.mainid_flag || desc6a.asvc_flag) + av_log(ts ? ts->stream : fc, AV_LOG_DEBUG, "\n"); } break; case 0x7a: /* enhanced_ac-3_descriptor */