core: Fix DLNA bitrates using presets

Also cunningly work around bgo#672439 by not providing a preset for
mpeg2enc.

https://bugzilla.gnome.org/show_bug.cgi?id=675234

10 files changed, 74 insertions, 6 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index f8b3e893..244fa068 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,9 @@
+include ../common.am
+
 SUBDIRS = xml icons
 
 sysconf_DATA = rygel.conf
 
-shareddir = $(datadir)/rygel
-
 if BUILD_UI
 dist_shared_DATA = rygel-preferences.ui
 endif
@@ -18,16 +18,24 @@ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
 	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
 # Rule to create the .desktop files
-desktopdir = $(datadir)/applications
 desktop_in_files = rygel.desktop.in rygel-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+preset_DATA = $(srcdir)/presets/ffenc_aac.prs \
+	$(srcdir)/presets/ffenc_mp2.prs \
+	$(srcdir)/presets/ffenc_mpeg2video.prs \
+	$(srcdir)/presets/ffenc_wmav1.prs \
+	$(srcdir)/presets/ffenc_wmv1.prs \
+	$(srcdir)/presets/GstLameMP3Enc.prs \
+	$(srcdir)/presets/GstMP4Mux.prs \
+	$(srcdir)/presets/GstTwoLame.prs \
+	$(srcdir)/presets/GstX264Enc.prs
+
 CLEANFILES = $(dbusservice_DATA) $(desktop_DATA)
 EXTRA_DIST = $(dbusservice_in_files) \
 	     $(desktop_in_files) \
 	     $(sysconf_DATA) \
-	     $(pixmaps_DATA)
-
+	     $(pixmaps_DATA) \
+	     $(presets_DATA)
 
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/presets/GstLameMP3Enc.prs b/data/presets/GstLameMP3Enc.prs
new file mode 100644
index 00000000..15d0b5dd
--- /dev/null
+++ b/data/presets/GstLameMP3Enc.prs
@@ -0,0 +1,7 @@
+[_presets_]
+version=0.10
+element-name=GstLameMP3Enc
+
+[Rygel DLNA preset]
+target=1
+bitrate=256
diff --git a/data/presets/GstMP4Mux.prs b/data/presets/GstMP4Mux.prs
new file mode 100644
index 00000000..8c54280f
--- /dev/null
+++ b/data/presets/GstMP4Mux.prs
@@ -0,0 +1,7 @@
+[_presets_]
+version=0.10
+element-name=GstMP4Mux
+
+[Rygel DLNA preset]
+streamable=true
+faststart=true
diff --git a/data/presets/GstTwoLame.prs b/data/presets/GstTwoLame.prs
new file mode 100644
index 00000000..afe83990
--- /dev/null
+++ b/data/presets/GstTwoLame.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=GstTwoLame
+
+[Rygel DLNA preset]
+bitrate=256
diff --git a/data/presets/GstX264Enc.prs b/data/presets/GstX264Enc.prs
new file mode 100644
index 00000000..5b2383c5
--- /dev/null
+++ b/data/presets/GstX264Enc.prs
@@ -0,0 +1,7 @@
+[_presets_]
+version=0.10
+element-name=GstX264Enc
+
+[Rygel AVC_MP4_BL_CIF15_AAC_520]
+preset=1
+bitrate=1200
diff --git a/data/presets/ffenc_aac.prs b/data/presets/ffenc_aac.prs
new file mode 100644
index 00000000..1afed865
--- /dev/null
+++ b/data/presets/ffenc_aac.prs
@@ -0,0 +1,9 @@
+[_presets_]
+version=0.10
+element-name=ffenc_aac
+
+[Rygel DLNA preset]
+bitrate=64000
+
+[Rygel AAC_ISO_320 preset]
+bitrate=256000
diff --git a/data/presets/ffenc_mp2.prs b/data/presets/ffenc_mp2.prs
new file mode 100644
index 00000000..588af1b9
--- /dev/null
+++ b/data/presets/ffenc_mp2.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=ffenc_mp2
+
+[Rygel DLNA preset]
+bitrate=256000
diff --git a/data/presets/ffenc_mpeg2video.prs b/data/presets/ffenc_mpeg2video.prs
new file mode 100644
index 00000000..e0c415a8
--- /dev/null
+++ b/data/presets/ffenc_mpeg2video.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=ffenc_mpeg2video
+
+[Rygel DLNA preset]
+bitrate=3000000
diff --git a/data/presets/ffenc_wmav1.prs b/data/presets/ffenc_wmav1.prs
new file mode 100644
index 00000000..c28a00e7
--- /dev/null
+++ b/data/presets/ffenc_wmav1.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=ffenc_wmav1
+
+[Rygel DLNA preset]
+bitrate=64000
diff --git a/data/presets/ffenc_wmv1.prs b/data/presets/ffenc_wmv1.prs
new file mode 100644
index 00000000..6434df44
--- /dev/null
+++ b/data/presets/ffenc_wmv1.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=ffenc_wmv1
+
+[Rygel DLNA preset]
+bitrate=1200000