From patchwork Wed Jul 22 15:27:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21229 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 10CFE44B303 for ; Wed, 22 Jul 2020 18:51:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3B4A68B722; Wed, 22 Jul 2020 18:51:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3053968B6B1 for ; Wed, 22 Jul 2020 18:51:52 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id 12so2282639oir.4 for ; Wed, 22 Jul 2020 08:51:52 -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=gM6mprQa65Fv5xdFgO6fSb/mWCbB3ZmuseR2pW2MrUA=; b=vhbhh992LZRcCiyDdOJ8r6IKF9G1xH6v23mw4o3KgMUv5kx4jLywJTADr9j2F0pFul mJncoGuaODpKuSNrN4QrEc4LhBl3+7Xon4dZj2RbunIL+D8LNUMJeOq3QXoaw3uQtQV9 hodX7SuYQfdCLofVKjoBI4Qf/L49ZF0d/kLDooL5Cqy8dVpCKikf+KbTuEteEBnFzlKD PPSJmirkPCUW1OwrOYpEJLqUNu0ZII0Qo/e0OtYrPxOodPcuDhaWmy/UWIZixUCTGPw1 Zbsm7JLGas7sXA/QgLdiRC4Ef0rhqCX3MWRpNuXZIJB3YAJneh4pEQtdmc+4RtcGj/dW KqHA== 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=gM6mprQa65Fv5xdFgO6fSb/mWCbB3ZmuseR2pW2MrUA=; b=Hi2Lb1mu10N/3QNnwB/L9Hohx/DPtwgzCl0KQZX2uVBq/d2NaDYP+nDByeKcE6Cyk3 vsDC+JGoKm6aCn3040+LjPn6IwxJjcVLF/MOCs3MeHe8xX638IJE6ktob05qsm1ME0h8 q/VOfbLjoTJXQtI3zX0Ji1xeHcYhZvPV+CbZEoL1RHSS/iYBanH23ar6fcmbQBFxTbr4 XMCGruAjTHC8+OF/eGer3ewZ1abavDxjXMLQynUhN7MfZnhHD6H+YOj+KBqPlWPQ7JnV AisccdYNkBLozcfa2YqRqNSQYrU3v/XVVEintkHolM6v4mhjH6XMB9J8Q0N616aQZM8p T5OQ== X-Gm-Message-State: AOAM531Ruk7XQai+lNM34D9c1Zx4f68eXHcHctcs60sL3+/JfIQrHZDE DrPJKBtECg7h69ywSvrkHDXNAWMb X-Google-Smtp-Source: ABdhPJx92parcWz1MGZMviu+sdVywKWZx68GHLUVF+0aB8H5F5nLu/R+5RXcnNQmXEZKFXBHsc47Ew== X-Received: by 2002:a17:90a:1a02:: with SMTP id 2mr10032223pjk.150.1595431674384; Wed, 22 Jul 2020 08:27:54 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w71sm233889pfd.6.2020.07.22.08.27.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2020 08:27:53 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jul 2020 23:27:33 +0800 Message-Id: <1595431659-664-2-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 2/8] avformat/mpegts: decode and export ATSC AC-3 descriptor 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 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 1ed7eaf..d450507 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1990,6 +1990,48 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type st->request_probe = 50; } break; + case 0x81: /* ATSC AC-3 descriptor */ + { + uint8_t buf; + uint8_t sample_rate_code, bsid,bitrate_code,surround_mode, bsmod; + uint8_t num_channels, full_svc, mainid, priority, asvcflags; + + if (desc_len < 4) + return AVERROR_INVALIDDATA; + + buf = get8(pp, desc_end); + sample_rate_code = (buf >> 5 ) & 0x07; + bsid = buf & 0x1F; + av_dict_set_int(&st->metadata, "atsc.ac3_desc.sample_rate_code", sample_rate_code, 0); + av_dict_set_int(&st->metadata, "atsc.ac3_desc.bsid", bsid, 0); + + buf = get8(pp, desc_end); + bitrate_code = (buf >> 2 ) & 0x1F; + surround_mode = buf & 0x03; + av_dict_set_int(&st->metadata, "atsc.ac3_desc.bitrate_code", bitrate_code, 0); + av_dict_set_int(&st->metadata, "atsc.ac3_desc.surround_mode", surround_mode, 0); + + buf = get8(pp, desc_end); + bsmod = (buf >> 5) & 0x07; + num_channels = (buf >> 1) & 0x0F; + full_svc = buf & 0x01; + av_dict_set_int(&st->metadata, "atsc.ac3_desc.bsmod", bsmod, 0); + av_dict_set_int(&st->metadata, "atsc.ac3_desc.num_channels", num_channels, 0); + av_dict_set_int(&st->metadata, "atsc.ac3_desc.full_svc", full_svc, 0); + + buf = get8(pp, desc_end); + if (bsmod < 2) { + mainid = (buf >> 5) & 0x7; + priority = (buf >> 3) & 0x3; + av_dict_set_int(&st->metadata, "atsc.ac3_desc.mainid", mainid, 0); + av_dict_set_int(&st->metadata, "atsc.ac3_desc.priority", priority, 0); + } else { + asvcflags = buf; + av_dict_set_int(&st->metadata, "atsc.ac3_desc.asvc", asvcflags, 0); + } + /* other field in standard will be skipped */ + } + break; case 0x52: /* stream identifier descriptor */ st->stream_identifier = 1 + get8(pp, desc_end); break;