From patchwork Tue Jul 28 15:03:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21343 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 30A7A44B96F for ; Tue, 28 Jul 2020 18:31:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B2FF68B9A4; Tue, 28 Jul 2020 18:31:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36EA668B99A for ; Tue, 28 Jul 2020 18:31:32 +0300 (EEST) Received: by mail-il1-f194.google.com with SMTP id i138so10613877ild.9 for ; Tue, 28 Jul 2020 08:31:32 -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=7KN3knDm/R06dPJJqO60yNmsnvQXo8YQrt4Q3+aRSio=; b=HWnZrUEdMYRLPJZd7jPTuRXUpK7JgyHesJB8/pxKeOxMJXP5eVQWBTeVnLFsAUtOEQ iD0VQ6sjlycNFV2tk4ToMMTQeYD/4KpHTmG4KNKdUi7WcP9OwcHl+8eA54RgbH62s7wN Mxbn2oLPTldY55FB5Z9RUiKHYmY446t8LXATJZaJALQUT+Myo5eb2E+3PnJL2j6kKm01 GuSj7ktSQcAqY8SOMUcZXqRuV84iIsPFPsH37zXgvYmKRDlPTpFC45iBdKsLpiV8dpO2 8J4xyl4uqA8jjsF1q5NayD8+qtjuZRxhHo7W6XykFluBkd4ReJYdQlyrN1A1mPXZIrVz tgig== 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=7KN3knDm/R06dPJJqO60yNmsnvQXo8YQrt4Q3+aRSio=; b=eGJuancry/Zudr8tJxv2m331Unv3EdJgFzo6zHdmJU+XC1nr6v0rAwZS+LCEERrKnC r10RwlRXLfftlKWzfGB32wgK0sNhhTVm2QqkyV1FSmKKb4EExftIk+4p/Khb7r0xJZvT vc0tyR0pJs+aDDbNFLCgZvfdc7WdR4zNgnY55ywvNDQ/ZycaCeNp5lGmNyNVOrOjZrRu zjd79BnJC1vaEMCzGEBRSwDbVNhK5xsX0EgOUl/AVkt0MoJtYyBaa8GunHrMSqjkIuOP SE+f4BIKlFedS23PQ9tDI/8yIlWR1+1AhdxIBqXb72bOWrqQL4oK73J6qlmAje9H7J9k IcfA== X-Gm-Message-State: AOAM533LyftddtkVc8PE5hkCoB6npBGZdf6jPX7MNX/PCLp9Y7lYfHej ek8Iv0lLeyPKEwhffH2Rh6yACB06 X-Google-Smtp-Source: ABdhPJzhy/ZjlCKg3o8YjIkF2RCyy9iNPTziiv7WPiZjGFd1zQ7i/tDro/NaZDD36jJ4uXXGIFHbnw== X-Received: by 2002:a65:408b:: with SMTP id t11mr24552652pgp.407.1595948626851; Tue, 28 Jul 2020 08:03:46 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id m31sm3570005pjb.52.2020.07.28.08.03.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2020 08:03:46 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:03:31 +0800 Message-Id: <1595948614-10861-2-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 2/5] avutil/mpegts_audio_desc_metadata: add helper function for AC3 descriptor 0x6a 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 --- libavutil/Makefile | 2 ++ libavutil/mpegts_audio_desc_metadata.c | 33 ++++++++++++++++++++ libavutil/mpegts_audio_desc_metadata.h | 57 ++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 libavutil/mpegts_audio_desc_metadata.c create mode 100644 libavutil/mpegts_audio_desc_metadata.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 9b08372..4b4aa68 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -57,6 +57,7 @@ HEADERS = adler32.h \ md5.h \ mem.h \ motion_vector.h \ + mpegts_audio_desc_metadata.h \ murmur3.h \ opt.h \ parseutils.h \ @@ -140,6 +141,7 @@ OBJS = adler32.o \ mastering_display_metadata.o \ md5.o \ mem.o \ + mpegts_audio_desc_metadata.o \ murmur3.o \ opt.o \ parseutils.o \ diff --git a/libavutil/mpegts_audio_desc_metadata.c b/libavutil/mpegts_audio_desc_metadata.c new file mode 100644 index 0000000..14d9100 --- /dev/null +++ b/libavutil/mpegts_audio_desc_metadata.c @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2020 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "mpegts_audio_desc_metadata.h" +#include "mem.h" + +AVDescriptor6A *av_desc6a_alloc(size_t *size) +{ + AVDescriptor6A *desc6a = (AVDescriptor6A*)av_mallocz(sizeof(*desc6a)); + + if (!desc6a) + return NULL; + if (size) + *size = sizeof(*desc6a); + return desc6a; + +} diff --git a/libavutil/mpegts_audio_desc_metadata.h b/libavutil/mpegts_audio_desc_metadata.h new file mode 100644 index 0000000..58beee4 --- /dev/null +++ b/libavutil/mpegts_audio_desc_metadata.h @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * MPEGTS audio stream descriptor + */ + +#ifndef AVUTIL_MPEGTS_AUDIO_DESC_METADATA_H +#define AVUTIL_MPEGTS_AUDIO_DESC_METADATA_H +#include +#include + +/* ETSI 300 468 descriptor 0x6A(AC-3) + * Refer to: ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems) + * + * @note The struct must be allocated with av_desc6a_alloc() and + * its size is not a part of the public ABI. + */ +typedef struct AVDescriptor6A { + 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; +} AVDescriptor6A; + +/** + * Allocate a AVDescriptor6A structure and initialize its + * fields to default values. + * + * @return the newly allocated struct or NULL on failure + */ +AVDescriptor6A *av_desc6a_alloc(size_t *size); + +#endif /* AVUTIL_MPEGTS_AUDIO_DESC_METADATA_H */