[transmageddon] Update xml profiles towards new system, video part still needs work once we get those added to the c
- From: Christian Fredrik Kalager Schaller <uraeus src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [transmageddon] Update xml profiles towards new system, video part still needs work once we get those added to the c
- Date: Sat, 28 May 2011 11:28:36 +0000 (UTC)
commit 00df7ee2a9fcb2f53bbbc296b23e15d10f7031e4
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date: Sat May 28 12:27:50 2011 +0100
Update xml profiles towards new system, video part still needs work
once we get those added to the caps
profiles/krzr-k1v.xml | 44 +-----------------------------------------
profiles/linux-computer.xml | 41 +---------------------------------------
profiles/n770.xml | 32 +------------------------------
profiles/n800.xml | 39 +------------------------------------
profiles/n900.xml | 18 ++--------------
profiles/ps3.xml | 25 ------------------------
profiles/psp.xml | 33 +------------------------------
7 files changed, 11 insertions(+), 221 deletions(-)
---
diff --git a/profiles/krzr-k1v.xml b/profiles/krzr-k1v.xml
index aa631f1..b1cf04e 100644
--- a/profiles/krzr-k1v.xml
+++ b/profiles/krzr-k1v.xml
@@ -11,60 +11,20 @@
<version>1.0</version>
<icon>file://phone.svg</icon>
<default>Normal</default>
-
- <profile>
- <name>Low</name> # This is a low quality output setting
- <container>video/quicktime,variant=iso</container>
- <extension>mp4</extension>
- <audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Low, Profile Low Complexity
- </preset>
- </presets>
- <channels>1, 1</channels>
- <samplerate>44100</samplerate>
- </audio>
- <video>
- <name>video/mpeg,mpegversion=4</name>
- <border>Y</border>
- <passes>0</passes>
- <pixelaspectratio>12/11</pixelaspectratio>
- <presets>
- <preset>
- Quality Low, Profile Simple
- </preset>
- </presets>
- <width>176, 176</width>
- <height>144, 144</height>
- <framerate>1,15</framerate>
- </video>
- </profile>
+
<profile>
<name>Normal</name>
<container>video/quicktime,variant=iso</container>
<extension>mp4</extension>
<audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Low , Profile Low Complexity
- </preset>
- </presets>
+ <name>audio/mpeg,mpegversion=4, base-profile=lc, rate=44100</name>
<channels>1, 2</channels>
- <samplerate>44100</samplerate>
</audio>
<video>
<name>video/mpeg,mpegversion=4</name>
<border>Y</border>
<passes>0</passes>
<pixelaspectratio>12/11</pixelaspectratio>
- <presets>
- <preset>
- Quality Low, Profile Simple
- </preset>
- </presets>
<width>176, 176</width>
<height>144, 144</height>
<framerate>1,15</framerate>
diff --git a/profiles/linux-computer.xml b/profiles/linux-computer.xml
index 7a48939..ba562e3 100644
--- a/profiles/linux-computer.xml
+++ b/profiles/linux-computer.xml
@@ -11,52 +11,19 @@
<version>1.0</version>
<icon>file://computer.svg</icon>
<default>Normal</default>
-
- <profile>
- <name>Low</name>
- <container>application/ogg</container>
- <extension>ogg</extension>
- <audio>
- <name>audio/x-vorbis</name>
- <presets>
- <preset>Quality Low</preset>
- </presets>
- <channels>1, 2</channels>
- <samplerate>44100</samplerate>
- </audio>
- <video>
- <name>video/x-theora</name>
- <border>N</border>
- <passes>0</passes>
- <pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>Quality Low</preset>
- </presets>
- <width>320, 640</width>
- <height>240, 480</height>
- <framerate>1, 25</framerate>
- </video>
- </profile>
<profile>
<name>Normal</name>
<container>application/ogg</container>
<extension>ogg</extension>
<audio>
- <name>audio/x-vorbis</name>
- <presets>
- <preset>Quality Normal</preset>
- </presets>
+ <name>audio/x-vorbis, rate=44100</name>
<channels>1, 2</channels>
- <samplerate>44100</samplerate>
</audio>
<video>
<name>video/x-theora</name>
<border>N</border>
<passes>0</passes>
<pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>Quality Normal</preset>
- </presets>
<width>320, 1920</width>
<height>240, 1080</height>
<framerate>1, 30</framerate>
@@ -74,9 +41,6 @@
</audio>
<video>
<name>video/x-theora</name>
- <presets>
- <preset>Quality Normal</preset>
- </presets>
<width>320, 1920</width>
<height>240, 1080</height>
<framerate>1, 30</framerate>
@@ -97,9 +61,6 @@
<border>N</border>
<passes>0</passes>
<pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>Quality High</preset>
- </presets>
<width>320, 1920</width>
<height>240, 1080</height>
<framerate>1, 60</framerate>
diff --git a/profiles/n770.xml b/profiles/n770.xml
index 1ff6132..56cd393 100644
--- a/profiles/n770.xml
+++ b/profiles/n770.xml
@@ -13,47 +13,17 @@
<default>Normal</default>
<profile>
- <name>Low</name>
- <container>video/x-msvideo</container>
- <extension>avi</extension>
- <audio>
- <name>audio/mpeg,mpegversion=1,layer=3</name>
- <presets>
- <preset>
- CBR Quality Normal, Profile Constant Bitrate
- </preset>
- </presets>
- <channels>1, 2</channels>
- <samplerate>44100</samplerate>
- </audio>
- <video>
- <name>video/mpeg,mpegversion=4</name>
- <border>N</border>
- <passes>0</passes>
- <pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>
- Quality Low, Profile Advanced Simple
- </preset>
- </presets>
- <width>60, 352</width>
- <height>60, 208</height>
- <framerate>1, 15</framerate>
- </video>
- </profile>
- <profile>
<name>Normal</name>
<container>video/x-msvideo</container>
<extension>avi</extension>
<audio>
- <name>audio/mpeg,mpegversion=1,layer=3</name>
+ <name>audio/mpeg,mpegversion=1,layer=3, rate=44100</name>
<presets>
<preset>
CBR Quality Low, Profile Constant Bitrate
</preset>
</presets>
<channels>1, 2</channels>
- <samplerate>44100</samplerate>
</audio>
<video>
<name>video/mpeg,mpegversion=4</name>
diff --git a/profiles/n800.xml b/profiles/n800.xml
index 9e4ac16..cb804ee 100644
--- a/profiles/n800.xml
+++ b/profiles/n800.xml
@@ -11,49 +11,14 @@
<version>1.0</version>
<icon>file://ipod.svg</icon>
<default>Normal</default>
-
- <profile>
- <name>Low</name>
- <container>video/quicktime,variant=iso</container>
- <extension>mp4</extension>
- <audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Low, Profile Low Complexity
- </preset>
- </presets>
- <channels>1, 2</channels>
- <samplerate>44100</samplerate>
- </audio>
- <video>
- <name>video/x-h264</name>
- <border>N</border>
- <passes>0</passes>
- <pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>
- Quality Low, Profile Baseline
- </preset>
- </presets>
- <width>240, 352</width>
- <height>140, 208</height>
- <framerate>1, 22</framerate>
- </video>
- </profile>
+
<profile>
<name>Normal</name>
<container>video/quicktime,variant=iso</container>
<extension>mp4</extension>
<audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Normal, Profile Low Complexity
- </preset>
- </presets>
+ <name>audio/mpeg,mpegversion=4, base-profile=lc, rate=44100</name>
<channels>1, 2</channels>
- <samplerate>44100</samplerate>
</audio>
<video>
<name>video/x-h264</name>
diff --git a/profiles/n900.xml b/profiles/n900.xml
index 1876294..0bcea68 100644
--- a/profiles/n900.xml
+++ b/profiles/n900.xml
@@ -13,18 +13,12 @@
<default>Normal (mpeg4)</default>
<profile>
- <name>Normal (h264)</name>
+ <name>Normal</name>
<container>video/quicktime,variant=iso</container>
<extension>mp4</extension>
<audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Normal, Profile Low Complexity
- </preset>
- </presets>
+ <name>audio/mpeg,mpegversion=4, base-profile=lc, rate=48000</name>
<channels>1, 2</channels>
- <samplerate>48000</samplerate>
</audio>
<video>
<name>video/x-h264</name>
@@ -46,14 +40,8 @@
<container>video/quicktime,variant=iso</container>
<extension>mp4</extension>
<audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>
- Quality Normal, Profile Low Complexity
- </preset>
- </presets>
+ <name>audio/mpeg,mpegversion=4, base-profile=lc, rate=48000</name>
<channels>1, 2</channels>
- <samplerate>48000</samplerate>
</audio>
<video>
<name>video/mpeg,mpegversion=4,systemstream=false,profile=simple</name>
diff --git a/profiles/ps3.xml b/profiles/ps3.xml
index 3d05650..a9afb23 100644
--- a/profiles/ps3.xml
+++ b/profiles/ps3.xml
@@ -13,31 +13,6 @@
<default>Normal</default>
<profile>
- <name>Low</name>
- <container>video/mpegts</container>
- <extension>ts</extension>
- <audio>
- <name>audio/x-ac3</name>
- <presets>
- <preset>BD Quality Low</preset>
- </presets>
- <channels>1, 6</channels>
- <samplerate>44100</samplerate>
- </audio>
- <video>
- <name>video/x-h264</name>
- <border>N</border>
- <passes>0</passes>
- <pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>Quality Low, Profile Baseline</preset>
- </presets>
- <width>320, 720</width>
- <height>240, 480</height>
- <framerate>1, 25</framerate>
- </video>
- </profile>
- <profile>
<name>Normal</name>
<container>video/mpegts</container>
<extension>ts</extension>
diff --git a/profiles/psp.xml b/profiles/psp.xml
index ded2257..cd477f5 100644
--- a/profiles/psp.xml
+++ b/profiles/psp.xml
@@ -11,42 +11,13 @@
<version>1.0</version>
<icon>file://psp.svg</icon>
<default>Normal</default>
-
- <profile>
- <name>Low</name>
- <container>video/quicktime,variant=iso</container>
- <extension>mp4</extension>
- <audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>Quality Low, Profile Low Complexity</preset>
- </presets>
- <samplerate>48000</samplerate>
- <channels>1, 2</channels>
- </audio>
- <video>
- <name>video/x-h264</name>
- <border>N</border>
- <passes>0</passes>
- <pixelaspectratio>0/0</pixelaspectratio>
- <presets>
- <preset>Quality Low, Profile Baseline</preset>
- </presets>
- <width>320</width>
- <height>240</height>
- <framerate>1, 25</framerate>
- </video>
- </profile>
+
<profile>
<name>Normal</name>
<container>video/quicktime,variant=iso</container>
<extension>mp4</extension>
<audio>
- <name>audio/mpeg,mpegversion=4</name>
- <presets>
- <preset>Quality Normal,Profile Low Complexity</preset>
- </presets>
- <samplerate>48000</samplerate>
+ <name>audio/mpeg,mpegversion=4, rate=48000, base-profile=lc</name>
<channels>1, 2</channels>
</audio>
<video>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]