change configuration to use vaapi hardware video acceleration, remove

deprecated patches and spec files

1) previous two patches are deprecated since this commit will override the
settings.
2) remove deprecated spec file, which is not actually being used.

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
index cbbb981..f04b0e9 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
@@ -9,7 +9,7 @@ disable segtrap = yes ; same effect with --gst-disable-segtrap
 
 ; set default video sink but, it can be replaced with others selected by application
 ; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink
-videosink element = 2
+videosink element = 6
 
 video converter element = ffmpegcolorspace
 
@@ -22,7 +22,7 @@ skip rescan = yes
 delay before repeat = 50 ; msec
 
 ; comma separated list of tocken which elemnts has it in it's name will not be used 
-element exclude keyword = ffdec_, omx
+element exclude keyword = ffdec_h264, ffdec_mpeg4, omx
 
 async start = yes 
 

diff --git a/packaging/0001-change-video-sink-from-xvimagesink-to-ximagesink-for.patch b/packaging/0001-change-video-sink-from-xvimagesink-to-ximagesink-for.patch
deleted file mode 100644 (file)
index 6089a33..0000000
--- a/packaging/0001-change-video-sink-from-xvimagesink-to-ximagesink-for.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c5f21ea3813093893bc4d4f7adcc99849aa9cf22 Mon Sep 17 00:00:00 2001
-From: Yan Yin <yan.yin@intel.com>
-Date: Tue, 14 Feb 2012 21:57:02 +0800
-Subject: [PATCH] change video sink from xvimagesink to ximagesink for PR3
-
-xvimagesink is not working on PR3, due to missing gfx driver, please
-check below link for details:
-https://tizen.jf.intel.com/index.php?title=Tizen_PR3#Enable_Video_Player
----
- .../usr/etc/mmfw_player.ini                        |    2 +-
- mmfw-sysconf-simulator/usr/etc/mmfw_player.ini     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini
-index fdc2a40..d05d8fb 100644
---- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini
-+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_player.ini
-@@ -9,7 +9,7 @@ disable segtrap = yes ; same effect with --gst-disable-segtrap
- 
- ; set default video sink but, it can be replaced with others selected by application
- ; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink
--videosink element = 2
-+videosink element = 1
- 
- video converter element = ffmpegcolorspace
- 
-diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
-index fdc2a40..d05d8fb 100644
---- a/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
-+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
-@@ -9,7 +9,7 @@ disable segtrap = yes ; same effect with --gst-disable-segtrap
- 
- ; set default video sink but, it can be replaced with others selected by application
- ; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink
--videosink element = 2
-+videosink element = 1
- 
- video converter element = ffmpegcolorspace
- 
--- 
-1.7.0.4
-

diff --git a/packaging/0002-enable-ffdec-for-mfld.patch b/packaging/0002-enable-ffdec-for-mfld.patch
deleted file mode 100644 (file)
index 90dbbed..0000000
--- a/packaging/0002-enable-ffdec-for-mfld.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN mmfw-sysconf-0.1.22.orig/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini mmfw-sysconf-0.1.22/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini
---- mmfw-sysconf-0.1.22.orig/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini    2012-04-06 03:55:08.000000000 -0700
-+++ mmfw-sysconf-0.1.22/mmfw-sysconf-simulator/usr/etc/mmfw_player.ini 2012-05-17 06:45:15.747871189 -0700
-@@ -22,7 +22,7 @@
- delay before repeat = 50 ; msec
- 
- ; comma separated list of tocken which elemnts has it in it's name will not be used 
--element exclude keyword = ffdec_, omx
-+element exclude keyword = omx
- 
- async start = yes 
- 

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
new file mode 100644 (file)
index 0000000..005704d
--- /dev/null
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -0,0 +1,3 @@
+* Thu Jun 21 2012 Yan Yin <yan.yin@intel.com> e44d8a1
+- change configuration to use vaapi hardware video acceleration
+- remove deprecated spec file and patches

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.spec b/packaging/mmfw-sysconf-mfld-blackbay.spec
index 871e8d0..2389f50 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.spec
+++ b/packaging/mmfw-sysconf-mfld-blackbay.spec
@@ -1,13 +1,11 @@
 Name:       mmfw-sysconf-mfld-blackbay
 Summary:    Multimedia Framework system configuration package
 Version:    0.1.22
-Release:    1
+Release:    2
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    mmfw-sysconf-%{version}.tar.gz
 Source1:    asound.conf
-Patch0:     0001-change-video-sink-from-xvimagesink-to-ximagesink-for.patch
-Patch1:     0002-enable-ffdec-for-mfld.patch 
 BuildArch:  noarch
 
 %description
@@ -16,8 +14,6 @@ Multimedia Framework system configuration package
 
 %prep
 %setup -q  -n mmfw-sysconf-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
deleted file mode 100644 (file)
index 92a72a1..0000000
--- a/packaging/mmfw-sysconf.spec
+++ /dev/null
@@ -1,71 +0,0 @@
-Name:       mmfw-sysconf
-Summary:    Multimedia Framework system configuration package
-Version:    0.1.22
-Release:    3
-Group:      TO_BE/FILLED_IN
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-
-%description
-Multimedia Framework system configuration package
-
-%ifarch %{arm}
-%package -n mmfw-sysconf-cleansdk-target
-Summary:    Multimedia Framework system configuration package for clean SDK target binary
-Group:      TO_BE/FILLED_IN
-
-%description -n mmfw-sysconf-cleansdk-target
-Multimedia Framework system configuration package for clean SDK target binary
-
-%else
-
-%package -n mmfw-sysconf-simulator
-Summary:    Multimedia Framework system configuration package for simulator
-Group:      TO_BE/FILLED_IN
-
-%description -n mmfw-sysconf-simulator
-Multimedia Framework system configuration package for simulator
-%endif
-
-
-
-%prep
-%setup -q 
-
-%build
-
-%install
-rm -rf %{buildroot}
-
-%ifarch %{arm}
-       mkdir -p %{buildroot}/opt/etc/mmfw-sysconf
-       cp -arf mmfw-sysconf-cleansdk-target/* %{buildroot}
-%else
-       mkdir -p %{buildroot}/opt/etc/mmfw-sysconf
-       cp -arf mmfw-sysconf-simulator/* %{buildroot}
-%endif
-
-%post 
-
-%postun 
-
-%ifarch %{arm}
-%files -n mmfw-sysconf-cleansdk-target
-%defattr(-,root,root,-)
-/etc/asound.conf
-/etc/pulse/*
-/usr/etc/*.ini
-/usr/share/pulseaudio/alsa-mixer/paths/*.conf
-/usr/share/pulseaudio/alsa-mixer/paths/*.common
-/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
-%else
-
-%files -n mmfw-sysconf-simulator
-%defattr(-,root,root,-)
-/etc/asound.conf
-/etc/pulse/*
-/usr/etc/*.ini
-/usr/share/pulseaudio/alsa-mixer/paths/*.conf
-/usr/share/pulseaudio/alsa-mixer/paths/*.common
-/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
-%endif