<div dir="ltr"><div><div>Merged, thanks for contributing.<br><br></div>Kind regards,<br><br></div>Jean-Paul Saman<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Mar 19, 2015 at 9:11 PM, Daniel Kamil Kozar <span dir="ltr"><<a href="mailto:dkk089@gmail.com" target="_blank">dkk089@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This patch adds support for the MPEG-4 audio descriptor. aac_profile.h is now<br>
allowed to be included multiple times, since it is also used by dr_1c.h.<br>
---<br>
src/Makefile.am | 2 +<br>
src/descriptors/dr_1c.c | 75 ++++++++++++++++++++++++++++++++++<br>
src/descriptors/dr_1c.h | 80 +++++++++++++++++++++++++++++++++++++<br>
src/descriptors/types/aac_profile.h | 2 -<br>
4 files changed, 157 insertions(+), 2 deletions(-)<br>
create mode 100644 src/descriptors/dr_1c.c<br>
create mode 100644 src/descriptors/dr_1c.h<br>
<br>
diff --git a/src/Makefile.am b/src/Makefile.am<br>
index 0b9a9a0..2974b3d 100644<br>
--- a/src/Makefile.am<br>
+++ b/src/Makefile.am<br>
@@ -40,6 +40,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \<br>
descriptors/dr_13.h \<br>
descriptors/dr_14.h \<br>
descriptors/dr_1b.h \<br>
+ descriptors/dr_1c.h \<br>
descriptors/dr_40.h \<br>
descriptors/dr_41.h \<br>
descriptors/dr_42.h \<br>
@@ -99,6 +100,7 @@ descriptors_src = descriptors/dr_02.c \<br>
descriptors/dr_13.c \<br>
descriptors/dr_14.c \<br>
descriptors/dr_1b.c \<br>
+ descriptors/dr_1c.c \<br>
descriptors/dr_40.c \<br>
descriptors/dr_41.c \<br>
descriptors/dr_42.c \<br>
diff --git a/src/descriptors/dr_1c.c b/src/descriptors/dr_1c.c<br>
new file mode 100644<br>
index 0000000..5541efb<br>
--- /dev/null<br>
+++ b/src/descriptors/dr_1c.c<br>
@@ -0,0 +1,75 @@<br>
+/*<br>
+Copyright (C) 2015 Daniel Kamil Kozar<br>
+<br>
+This library is free software; you can redistribute it and/or<br>
+modify it under the terms of the GNU Lesser General Public<br>
+License as published by the Free Software Foundation; either<br>
+version 2.1 of the License, or (at your option) any later version.<br>
+<br>
+This library is distributed in the hope that it will be useful,<br>
+but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
+Lesser General Public License for more details.<br>
+<br>
+You should have received a copy of the GNU Lesser General Public<br>
+License along with this library; if not, write to the Free Software<br>
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA<br>
+*/<br>
+<br>
+#include "config.h"<br>
+<br>
+#include <stdlib.h><br>
+#include <stdbool.h><br>
+<br>
+#if defined(HAVE_INTTYPES_H)<br>
+#include <inttypes.h><br>
+#elif defined(HAVE_STDINT_H)<br>
+#include <stdint.h><br>
+#endif<br>
+<br>
+#include "../dvbpsi.h"<br>
+#include "../dvbpsi_private.h"<br>
+#include "../descriptor.h"<br>
+<br>
+#include "dr_1c.h"<br>
+<br>
+dvbpsi_mpeg4_audio_dr_t* dvbpsi_DecodeMPEG4AudioDr(<br>
+ dvbpsi_descriptor_t * p_descriptor)<br>
+{<br>
+ dvbpsi_mpeg4_audio_dr_t * p_decoded;<br>
+<br>
+ /* check the tag. */<br>
+ if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x1c))<br>
+ return NULL;<br>
+<br>
+ /* don't decode twice. */<br>
+ if (dvbpsi_IsDescriptorDecoded(p_descriptor))<br>
+ return p_descriptor->p_decoded;<br>
+<br>
+ /* all descriptors of this type have only one byte of payload. */<br>
+ if (p_descriptor->i_length != 1)<br>
+ return NULL;<br>
+<br>
+ p_decoded = (dvbpsi_mpeg4_audio_dr_t*)malloc(sizeof(*p_decoded));<br>
+ if (!p_decoded)<br>
+ return NULL;<br>
+<br>
+ p_decoded->i_mpeg4_audio_profile_and_level = p_descriptor->p_data[0];<br>
+<br>
+ p_descriptor->p_decoded = (void*)p_decoded;<br>
+<br>
+ return p_decoded;<br>
+}<br>
+<br>
+dvbpsi_descriptor_t * dvbpsi_GenMPEG4AudioDr(<br>
+ dvbpsi_mpeg4_audio_dr_t * p_decoded)<br>
+{<br>
+ dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x1c, 1, NULL);<br>
+ if (!p_descriptor)<br>
+ return NULL;<br>
+<br>
+ /* encode the data. */<br>
+ p_descriptor->p_data[0] = p_decoded->i_mpeg4_audio_profile_and_level;<br>
+<br>
+ return p_descriptor;<br>
+}<br>
diff --git a/src/descriptors/dr_1c.h b/src/descriptors/dr_1c.h<br>
new file mode 100644<br>
index 0000000..c1d4525<br>
--- /dev/null<br>
+++ b/src/descriptors/dr_1c.h<br>
@@ -0,0 +1,80 @@<br>
+/*<br>
+Copyright (C) 2015 Daniel Kamil Kozar<br>
+<br>
+This library is free software; you can redistribute it and/or<br>
+modify it under the terms of the GNU Lesser General Public<br>
+License as published by the Free Software Foundation; either<br>
+version 2.1 of the License, or (at your option) any later version.<br>
+<br>
+This library is distributed in the hope that it will be useful,<br>
+but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
+Lesser General Public License for more details.<br>
+<br>
+You should have received a copy of the GNU Lesser General Public<br>
+License along with this library; if not, write to the Free Software<br>
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA<br>
+*/<br>
+<br>
+/*!<br>
+ * \file <dr_1c.h><br>
+ * \author Daniel Kamil Kozar <<a href="mailto:dkk089@gmail.com">dkk089@gmail.com</a>><br>
+ * \brief Application interface for the MPEG-4 audio descriptor decoder and<br>
+ * generator.<br>
+ *<br>
+ * Application interface for the MPEG-4 audio descriptor decoder and generator.<br>
+ * This descriptor's definition can be found in ISO/IEC 13818-1 revision 2014/10<br>
+ * section 2.6.38.<br>
+ */<br>
+<br>
+#ifndef _DVBPSI_DR_1C_H_<br>
+#define _DVBPSI_DR_1C_H_<br>
+<br>
+#include "types/aac_profile.h"<br>
+<br>
+#ifdef __cplusplus<br>
+extern "C" {<br>
+#endif<br>
+<br>
+/*!<br>
+ * \struct dvbpsi_mpeg4_audio_dr_s<br>
+ * \brief MPEG-4 audio descriptor structure.<br>
+ *<br>
+ * This structure is used to store a decoded MPEG-4 audio descriptor. (ISO/IEC<br>
+ * 13818-1 section 2.6.38).<br>
+ */<br>
+<br>
+/*!<br>
+ * \typedef struct dvbpsi_mpeg4_audio_dr_s dvbpsi_mpeg4_audio_dr_t<br>
+ * \brief dvbpsi_mpeg4_audio_dr_t type definition.<br>
+ */<br>
+typedef struct dvbpsi_mpeg4_audio_dr_s<br>
+{<br>
+ /*! MPEG-4_audio_profile_and_level */<br>
+ dvbpsi_aac_profile_and_level_t i_mpeg4_audio_profile_and_level;<br>
+} dvbpsi_mpeg4_audio_dr_t;<br>
+<br>
+/*!<br>
+ * \brief MPEG-4 audio descriptor decoder.<br>
+ * \param p_descriptor pointer to the descriptor structure<br>
+ * \return A pointer to a new MPEG-4 audio descriptor structure which contains<br>
+ * the decoded data.<br>
+ */<br>
+dvbpsi_mpeg4_audio_dr_t* dvbpsi_DecodeMPEG4AudioDr(<br>
+ dvbpsi_descriptor_t * p_descriptor);<br>
+<br>
+/*!<br>
+ * \brief MPEG-4 audio descriptor generator.<br>
+ * \param p_decoded pointer to a decoded MPEG-4 audio descriptor structure.<br>
+ * \return a pointer to a new descriptor structure which contains encoded data.<br>
+ */<br>
+dvbpsi_descriptor_t * dvbpsi_GenMPEG4AudioDr(<br>
+ dvbpsi_mpeg4_audio_dr_t * p_decoded);<br>
+<br>
+#ifdef __cplusplus<br>
+}<br>
+#endif<br>
+<br>
+#else<br>
+#error "Multiple inclusions of dr_1c.h"<br>
+#endif<br>
diff --git a/src/descriptors/types/aac_profile.h b/src/descriptors/types/aac_profile.h<br>
index 1a515f7..f16eedc 100644<br>
--- a/src/descriptors/types/aac_profile.h<br>
+++ b/src/descriptors/types/aac_profile.h<br>
@@ -127,6 +127,4 @@ typedef enum dvbpsi_aac_profile_and_level_s<br>
};<br>
#endif<br>
<br>
-#else<br>
-#error "Multiple inclusions of aac_profile.h"<br>
#endif<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.3.3<br>
<br>
_______________________________________________<br>
libdvbpsi-devel mailing list<br>
<a href="mailto:libdvbpsi-devel@videolan.org">libdvbpsi-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/libdvbpsi-devel" target="_blank">https://mailman.videolan.org/listinfo/libdvbpsi-devel</a><br>
</font></span></blockquote></div><br></div>