From patchwork Tue Jul 28 15:03: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: 21370 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:34cf:0:0:0:0:0 with SMTP id b198csp536849yba; Tue, 28 Jul 2020 08:04:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdf8A3tHDxqSPHgMWlm4LW8Sim09vSoqZPauL/vhhYkLaEE6qOVr3vClJYXXA3zO3C1m7B X-Received: by 2002:a5d:45c9:: with SMTP id b9mr24962195wrs.283.1595948662282; Tue, 28 Jul 2020 08:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595948662; cv=none; d=google.com; s=arc-20160816; b=SYdbA5JQ0oBNP+hDxpLNosHQYZf1vG7hpXZmOUlIKP9CaKavi5v82TKoWLfuKrxwXT u4NboOxbXgxuBcdGswNnX0CQxk5Hzd5IDvfSV3+UK49kJU/I/UHjHiZ5I+oH3ZqOYcY8 XHp8s6aCymYI589/9Ku72GWtRW5g1sfVIOF/h+RWPHogvHiJcCaiU1KICqPv1X3QKKy9 ouwmjcx9w/Tg18dNv1GaSjWcVKmganTZ8fxZoLPjJ09mDFIpPVF0Cm7HUftkCQqSG5Xk DGBXRbclbTT2gnZBuebcgWZcHMUssi3EwIBKGq2J0GKGlkTIABaVeaqb6sFokbXe9zqD Osqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=qnaiQTajv7f4kbQRjaxXz3HLruDjXx/e9YXpXS8L4dw=; b=hDkcXlufrlIOOC3CzZgne44u7+UJojxbE/X+1rOXPXoOhWbzPQPWDFF6ObavwDmKVT 8iYsXgqshpJPuK9T2K08kk47VA2tD17P/WdTrIyBKDtNEUF9woyEc5PSF5Kj64/hY001 ma657YCoK7WIVFp2X7HFI+n0LaFC+u1D2tBAu7L4wzTiKxHUPuB4OLpraq1OeajJnSdj eIJSng2re48Ix/kHroVlskWNOyThEeejJviYWZt06ytz+tnrb2BSX2Y0suQLn6u/IJUK u09Cn7BFaU2puAjyVjvud0PQSj9L12iVca2HbMoTGmxPUxXZC1A4f3+qjKMYdTVss+fF Nc6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uqzyH4FJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g9si2538063wmf.210.2020.07.28.08.04.21; Tue, 28 Jul 2020 08:04:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uqzyH4FJ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3411668B9C6; Tue, 28 Jul 2020 18:04:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0145F68B9A4 for ; Tue, 28 Jul 2020 18:03:55 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id s15so484202pgc.8 for ; Tue, 28 Jul 2020 08:03:54 -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=yQhpVK27Q5JTQaGv+E6i7VLoYlZybwPzJM6ii/dGVec=; b=uqzyH4FJlrS9GX+D7xdrWALkbYO3csY4bVnnQoNfdJjeXIYhUNszSZD8lZdAe5WTH6 md5SX3ITRzR43Gf2xUaJ2dp06kmgLr0jRpoYnUg4ePC4qbjUAW5w3LmgaHOUICxoNgeq lqUP2eJV+g5KivaESGxAoG2GTv2iCGz9n9OyLr2ihXaJx9iyfn25kdeSpQ6qH6zeMoxf s9jkTaxE3Pu8tOoYNyKTYnwTbz7npv5Z8crKwiwRK4ijm2o0AB/Qwm8fBuUe5JL8edXJ W5sWwiVW5LbUYWmEAbbMBG/35d7GuV4dwuqU/NS13MTgYblC1zZ9hO6Ls4YOVEaw6E/0 v9/w== 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=yQhpVK27Q5JTQaGv+E6i7VLoYlZybwPzJM6ii/dGVec=; b=XrHCY0Wxh8Hd46RfqL0jIOKSIwigAwguhwOydd2At7NYs3cfbRKxVx7nrY23h2fW/T OMWlawAJZOnU1NWlHXflzMKfXAFVNYWvcpfWeAWdy15lcvlKLlQNS66SYyV39JlZ6IW8 8gxV9MRVVlhoCVne4tYxtxWxBvW3Xlo2AQlXzJDU6ZY2wKSpOpNZpufXZCqhy36CtZV7 3VwGl8jEx7C4SoKxZJh/qI+jRHKSXpGg5R6mdQXgFABJkrrbugOOeGXzYNpxfvJ+Al/5 pyHdbHa1k0RjnyAqNZliEWnWvmtiWI+kiK3ncLqIedivw9SJz/E9zMQRHcVLFQELZ0JV DHrg== X-Gm-Message-State: AOAM533SpB9hTC5T8Yu0tRUArDP0ENHwNDT46cnnw0ssGdDcvi06hont /C4dqysQxgY51+XsRVKySVLg1LbY X-Received: by 2002:a63:5a54:: with SMTP id k20mr24538989pgm.226.1595948629821; Tue, 28 Jul 2020 08:03:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id m31sm3570005pjb.52.2020.07.28.08.03.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2020 08:03:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:03:33 +0800 Message-Id: <1595948614-10861-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595948614-10861-1-git-send-email-lance.lmwang@gmail.com> References: <1595948614-10861-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat/mpegts: parse and export descriptor 6a side data 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" X-TUID: g/DVsP9RzAM5 Content-Length: 5690 From: Limin Wang Signed-off-by: Limin Wang --- libavformat/mpegts.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- tests/ref/fate/ts-demux | 2 +- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c6fd3e1..b5ea5a1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/dovi_meta.h" +#include "libavutil/mpegts_audio_desc_metadata.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" #include "libavcodec/opus.h" @@ -2073,16 +2074,56 @@ 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 ret; + uint8_t buf; + size_t desc6a_size; + AVDescriptor6A *desc6a; + + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + + desc6a = av_desc6a_alloc(&desc6a_size); + if (!desc6a) + return AVERROR(ENOMEM); + 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; + if (desc6a->component_type_flag) { int service_type_mask = 0x38; // 0b00111000 - int service_type = ((component_type & service_type_mask) >> 3); + int service_type; + + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + desc6a->component_type = get8(pp, desc_end); + service_type = ((desc6a->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); } } + if (desc6a->bsid_flag) { + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + desc6a->bsid = get8(pp, desc_end); + } + if (desc6a->mainid_flag) { + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + desc6a->mainid = get8(pp, desc_end); + } + if (desc6a->asvc_flag) { + if (desc_end - *pp < 1) + return AVERROR_INVALIDDATA; + desc6a->asvc_flag = get8(pp, desc_end); + } + ret = av_stream_add_side_data(st, AV_PKT_DATA_MPEGTS_DESC_6A, + (uint8_t *)desc6a, desc6a_size); + if (ret < 0) { + av_free(desc6a); + return ret; + } } break; case 0x7a: /* enhanced_ac-3_descriptor */ diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index cdf34d6..dfe0374 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -10,7 +10,7 @@ #sample_rate 1: 48000 #channel_layout 1: 60f #channel_layout_name 1: 5.1(side) -1, 0, 0, 2880, 1536, 0x773ffeea, S=1, 1, 0x00bd00bd +1, 0, 0, 2880, 1536, 0x773ffeea, S=2, 1, 0x00bd00bd, 9, 0x00000000 1, 2880, 2880, 2880, 1536, 0x6dc10748 1, 5760, 5760, 2880, 1536, 0xbab5129c 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd