[rygel] core: AAC_ISO_320 -> AAC_ADTS_320

[Jens Georg <jensgeorg src gnome org>]

commit 7aeb69c42ab5e08035073de3a944445fc15cd3ef
Author: Jens Georg <mail jensge org>
Date:   Tue May 1 17:29:59 2012 +0200

    core: AAC_ISO_320 -> AAC_ADTS_320
    
    Since muxing into streamable mp4 seems to be a bit broken, move to
    ADTS-framed AAC instead. This is required by DLNA anyway.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675234

 data/Makefile.am                    |    1 +
 data/presets/GstFaac.prs            |    9 +++++++++
 data/presets/ffenc_aac.prs          |    2 +-
 data/rygel.conf                     |    4 ++--
 src/rygel/rygel-aac-transcoder.vala |   10 +++-------
 5 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 244fa06..e03cd54 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,6 +27,7 @@ preset_DATA = $(srcdir)/presets/ffenc_aac.prs \
 	$(srcdir)/presets/ffenc_mpeg2video.prs \
 	$(srcdir)/presets/ffenc_wmav1.prs \
 	$(srcdir)/presets/ffenc_wmv1.prs \
+	$(srcdir)/presets/GstFaac.prs \
 	$(srcdir)/presets/GstLameMP3Enc.prs \
 	$(srcdir)/presets/GstMP4Mux.prs \
 	$(srcdir)/presets/GstTwoLame.prs \
diff --git a/data/presets/GstFaac.prs b/data/presets/GstFaac.prs
new file mode 100644
index 0000000..6989485
--- /dev/null
+++ b/data/presets/GstFaac.prs
@@ -0,0 +1,9 @@
+[_presets_]
+version=0.10
+element-name=GstFaac
+
+[Rygel DLNA preset]
+bitrate=64000
+
+[Rygel AAC_ADTS_320 preset]
+bitrate=256000
diff --git a/data/presets/ffenc_aac.prs b/data/presets/ffenc_aac.prs
index 1afed86..5963f2f 100644
--- a/data/presets/ffenc_aac.prs
+++ b/data/presets/ffenc_aac.prs
@@ -5,5 +5,5 @@ element-name=ffenc_aac
 [Rygel DLNA preset]
 bitrate=64000
 
-[Rygel AAC_ISO_320 preset]
+[Rygel AAC_ADTS_320 preset]
 bitrate=256000
diff --git a/data/rygel.conf b/data/rygel.conf
index aaecf5a..e6e30ce 100644
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -26,8 +26,8 @@ enable-mp2ts-transcoder=true
 # Set it to 'false' if you want to disable WMV transcoding support.
 enable-wmv-transcoder=true
 
-# Set it to 'false' if you want to disable AAC_ISO_320 transcoding support.
-enable-aac-transcoder=false
+# Set it to 'false' if you want to disable AAC_ADTS_320 transcoding support.
+enable-aac-transcoder=true
 
 # Set it to 'false' if you want to disable AVC_MP4 transcoding support.
 enable-avc-transcoder=false
diff --git a/src/rygel/rygel-aac-transcoder.vala b/src/rygel/rygel-aac-transcoder.vala
index 19e672a..c92df8a 100644
--- a/src/rygel/rygel-aac-transcoder.vala
+++ b/src/rygel/rygel-aac-transcoder.vala
@@ -25,15 +25,11 @@
  */
 internal class Rygel.AACTranscoder : Rygel.AudioTranscoder {
     private const int BITRATE = 256;
-    private const string CONTAINER = "application/x-3gp,profile=basic";
     private const string CODEC = "audio/mpeg,mpegversion=4," +
-                                 "framed=true,stream-format=raw," +
-                                 //"level=2," +
-                                 "profile=lc,codec_data=1208,rate=44100," +
-                                 "channels=1";
+                                 "stream-format=adts,rate=44100,base-profile=lc";
 
     public AACTranscoder () {
-        base ("audio/3gpp", "AAC_ISO_320", BITRATE, CONTAINER, CODEC, "3gp");
-        this.preset = "Rygel AAC_ISO_320 preset";
+        base ("audio/vnd.dlna.adts", "AAC_ADTS_320", BITRATE, null, CODEC, "adts");
+        this.preset = "Rygel AAC_ADTS_320 preset";
     }
 }