[rygel-gst-0-10-media-engine] Add the presets
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-media-engine] Add the presets
- Date: Tue, 4 Dec 2012 13:13:55 +0000 (UTC)
commit 7cefd941b045379ec4b24ce9a7c942cd2152d8c7
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Dec 4 14:13:49 2012 +0100
Add the presets
.gitignore | 1 +
Makefile.am | 2 +-
configure.ac | 3 ++-
data/Makefile.am | 16 ++++++++++++++++
data/presets/GstFaac.prs | 9 +++++++++
data/presets/GstLameMP3Enc.prs | 7 +++++++
data/presets/GstMP4Mux.prs | 7 +++++++
data/presets/GstTwoLame.prs | 6 ++++++
data/presets/GstX264Enc.prs | 7 +++++++
data/presets/ffenc_aac.prs | 12 ++++++++++++
data/presets/ffenc_mp2.prs | 6 ++++++
data/presets/ffenc_mpeg2video.prs | 6 ++++++
data/presets/ffenc_wmav1.prs | 6 ++++++
data/presets/ffenc_wmv1.prs | 6 ++++++
src/Makefile.am | 5 +++++
15 files changed, 97 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f0622a..0c5db41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,5 @@ po/Makefile.in.in
po/POTFILES
src/rygel-media-engine-gst-0-10.h
src/rygel-media-engine-gst-0-10.vapi
+src/*.c
diff --git a/Makefile.am b/Makefile.am
index 68b9b52..4ffa3c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src data
DISTCHECK_CONFIGURE_FLAGS =
diff --git a/configure.ac b/configure.ac
index ec00d71..5017167 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.64])
-AC_INIT([Rygel],
+AC_INIT([rygel-gst-0-10-media-engine],
[1.7.3],
[http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel],
[rygel],
@@ -77,6 +77,7 @@ AM_SILENT_RULES([yes])
AC_CONFIG_FILES([
Makefile
+data/Makefile
src/Makefile
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..a117cb0
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,16 @@
+shareddir = $(datadir)/rygel-media-engine-gst-0-10
+presetdir = $(shareddir)/presets
+
+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/GstFaac.prs \
+ $(srcdir)/presets/GstLameMP3Enc.prs \
+ $(srcdir)/presets/GstMP4Mux.prs \
+ $(srcdir)/presets/GstTwoLame.prs \
+ $(srcdir)/presets/GstX264Enc.prs
+
+EXTRA_DIST = $(preset_DATA)
+
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/GstLameMP3Enc.prs b/data/presets/GstLameMP3Enc.prs
new file mode 100644
index 0000000..a80a10d
--- /dev/null
+++ b/data/presets/GstLameMP3Enc.prs
@@ -0,0 +1,7 @@
+[_presets_]
+version=0.10
+element-name=GstLameMP3Enc
+
+[Rygel DLNA preset]
+target=1
+bitrate=128
diff --git a/data/presets/GstMP4Mux.prs b/data/presets/GstMP4Mux.prs
new file mode 100644
index 0000000..8c54280
--- /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 0000000..e802529
--- /dev/null
+++ b/data/presets/GstTwoLame.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=GstTwoLame
+
+[Rygel DLNA preset]
+bitrate=192
diff --git a/data/presets/GstX264Enc.prs b/data/presets/GstX264Enc.prs
new file mode 100644
index 0000000..b126d36
--- /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]
+preset=1
+bitrate=1200
diff --git a/data/presets/ffenc_aac.prs b/data/presets/ffenc_aac.prs
new file mode 100644
index 0000000..cd3838e
--- /dev/null
+++ b/data/presets/ffenc_aac.prs
@@ -0,0 +1,12 @@
+[_presets_]
+version=0.10
+element-name=ffenc_aac
+
+[Rygel DLNA preset]
+bitrate=64000
+
+[Rygel AAC_ADTS_320 preset]
+bitrate=256000
+
+[Rygel AVC_MP4_BL_CIF15_AAC_520 preset]
+bitrate=256000
diff --git a/data/presets/ffenc_mp2.prs b/data/presets/ffenc_mp2.prs
new file mode 100644
index 0000000..588af1b
--- /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 0000000..32a14d4
--- /dev/null
+++ b/data/presets/ffenc_mpeg2video.prs
@@ -0,0 +1,6 @@
+[_presets_]
+version=0.10
+element-name=ffenc_mpeg2video
+
+[Rygel DLNA preset]
+bitrate=1500000
diff --git a/data/presets/ffenc_wmav1.prs b/data/presets/ffenc_wmav1.prs
new file mode 100644
index 0000000..c28a00e
--- /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 0000000..6434df4
--- /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
diff --git a/src/Makefile.am b/src/Makefile.am
index 1bea0d2..f301f03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,12 @@
engine_LTLIBRARIES = librygel-media-engine-gst-0-10.la
enginedir = $(libdir)/rygel-2.0/engines
+shareddir = $(datadir)/rygel-media-engine-gst-0-10
+presetdir = $(shareddir)/presets
+
AM_CFLAGS = -DG_LOG_DOMAIN='"MediaEngine-GStreamer-0.10"' \
+ -DPRESET_DIR='"$(presetdir)"' \
+ -include config.h \
$(DEPS_CFLAGS)
librygel_media_engine_gst_0_10_la_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]