From e322219b2057053be0cf72278062702df3886aaa Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 21 Nov 2014 12:59:33 +0100
Subject: Place DSE first in AU

---
 libAACenc/src/bitenc.cpp | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'libAACenc/src')

diff --git a/libAACenc/src/bitenc.cpp b/libAACenc/src/bitenc.cpp
index 6f2c151..0823ef2 100644
--- a/libAACenc/src/bitenc.cpp
+++ b/libAACenc/src/bitenc.cpp
@@ -1303,6 +1303,23 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc,
   frameBits = bitMarkUp = alignAnchor;
 
 
+  /* Write DSEs first in case of DAB */
+  for (n = 0; (n < qcOut->nExtensions) && (n < (2+2)); n++)
+  {
+      if ( (syntaxFlags & AC_DAB) &&
+         (qcOut->extension[n].type == EXT_DATA_ELEMENT) ) {
+        FDKaacEnc_writeExtensionData( hTpEnc,
+                                     &qcOut->extension[n],
+                                      0,
+                                      alignAnchor,
+                                      syntaxFlags,
+                                      aot,
+                                      epConfig );
+      }
+
+    /* For EXT_FIL or EXT_FILL_DATA we could do an additional sanity check here */
+  }
+
   /* Channel element loop */
   for (i=0; i<channelMapping->nElements; i++) {
 
@@ -1445,13 +1462,16 @@ AAC_ENCODER_ERROR FDKaacEnc_WriteBitstream(HANDLE_TRANSPORTENC hTpEnc,
   /* Write global extension payload and fill data */
   for (n = 0; (n < qcOut->nExtensions) && (n < (2+2)); n++)
   {
-    FDKaacEnc_writeExtensionData( hTpEnc,
-                                 &qcOut->extension[n],
-                                  0,
-                                  alignAnchor,
-                                  syntaxFlags,
-                                  aot,
-                                  epConfig );
+      if ( (syntaxFlags & AC_DAB) &&
+         (qcOut->extension[n].type != EXT_DATA_ELEMENT) ) {
+        FDKaacEnc_writeExtensionData( hTpEnc,
+                                     &qcOut->extension[n],
+                                      0,
+                                      alignAnchor,
+                                      syntaxFlags,
+                                      aot,
+                                      epConfig );
+      }
 
     /* For EXT_FIL or EXT_FILL_DATA we could do an additional sanity check here */
   }
-- 
cgit v1.2.3