[FFmpeg-devel] [PATCH 2/5] avutil/mpegts_audio_desc_metadata: add helper function for AC3 descriptor 0x6a

[lance.lmwang at gmail.com]

From: Limin Wang <lance.lmwang at gmail.com>

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
---
 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 <lance.lmwang at gmail.com>
+ *
+ * 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 <lance.lmwang at gmail.com>
+ *
+ * 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 <stdint.h>
+#include <stddef.h>
+
+/* 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 */
-- 
1.8.3.1