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 */