camera: Use libva encoders for video

Change-Id: I41b5fcd61ebb0d8b573ed1e3a2ba7d5097f0aa44

diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index 39374fb..a3df8a9 100644 (file)
--- a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@ -34,7 +34,7 @@ ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 ;VideosrcElement = avsysvideosrc | 3,0 | do-timestamp,1 | use-pad-alloc,1 | num-alloc-buf,5
 ;VideosrcElement = v4l2src | 1,1 | do-timestamp,1 | device,/dev/video0
 ;VideosrcElement = videotestsrc | 0,0
-VideosrcElement = camerasrc | 0,0
+VideosrcElement = camerasrc | 1,0 | do-timestamp,1
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
 UseZeroCopyFormat = 0
@@ -52,7 +52,7 @@ DisplayDevice = 0 || 0
 ; Videosink
 ;;; 0: X surface, 1: Evas surface, 2: GL surface, 3: NULL surface
 Videosink = 0,1,3 || 0
-VideosinkElementX = vaapisink | 2,0 | qos,0 | sync,0
+VideosinkElementX = vaapisink | 1,0 | sync,0
 ;VideosinkElementX = xvimagesink | 5,0 | draw-borders,0 | force-aspect-ratio,0 | enable-last-buffer,0 | qos,0 | sync,0
 ;VideosinkElementEvas = evasimagesink | 0,0
 ;VideosinkElementGL = glimagesink | 0,0
@@ -60,12 +60,13 @@ VideosinkElementNull = fakesink | 2,0 | qos,0 | sync,0
 UseVideoscale = 0
 VideoscaleElement = videoscale | 1,0 | method,1
 UseComplexVideosink = 1
-VideosinkDescription = queue max-size-buffers=2 leaky=2 ! vaapisink sync=false rotation=270
+VideosinkDescription = queue max-size-buffers=4 leaky=2 ! vaapisink sync=false rotation=270 enable-last-buffer=false
 
 [VideoEncoder]
-H263 = emulenc_h263 | 0,0
-MPEG4 = ffenc_mpeg4 | 0,0
+H263 = vaapiencodeh263 | 0,0
+MPEG4 = vaapiencodempeg4 | 0,0
 THEORA = theoraenc | 1,0 | num-bufs,4
+H264 = vaapiencodeh264 | 1,0 | slice-num,2
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
@@ -86,9 +87,9 @@ VideoscaleElement = videoscale | 1,0 | method,1
 UseAudioEncoderQueue = 1
 UseVideoEncoderQueue = 1
 VideoProfile = 0
-VideoAutoAudioConvert = 1
+VideoAutoAudioConvert = 0
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 1
+VideoAutoColorSpace = 0
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
@@ -104,11 +105,13 @@ PassFirstVideoFrame = 0
 
 [Mux]
 ;3GP = ffmux_3gp_ext | 0,0
-3GP = ffmux_3gp | 0,0
+;3GP = ffmux_3gp | 0,0
+3GP = 3gppmux | 1,0 | faststart,1
 ;AMR = ffmux_amr_ext | 0,0
 AMR = ffmux_amr | 0,0
 ;MP4 = ffmux_mp4_ext | 0,0
-MP4 = mp4mux | 0,0
+;MP4 = mp4mux | 0,0
+MP4 = qtmux | 1,0 | faststart,1
 OGG = oggmux | 0,0
 WAV = wavenc | 0,0
 AAC = ffmux_adts |0,0

diff --git a/packaging/mmfw-sysconf-mfld-blackbay.changes b/packaging/mmfw-sysconf-mfld-blackbay.changes
index 7587bdc..6a08de2 100644 (file)
--- a/packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/packaging/mmfw-sysconf-mfld-blackbay.changes
@@ -1,3 +1,9 @@
+* Mon Dec 03 2012 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/trunk/20121130.085128@05ed15e
+- camera: Use libva encoders for video
+- MFLD specific settings in comments fixed.
+- camera: Enable fullscreen 720p viewfinder
+- camera: Use source-end upload for video
+
 * Tue Nov 27 2012 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/trunk/20121122.094540@d462c9e
 - Adding support for MMS resolution 176x144.
 - Exposure value setting not supported