projects
/
platform
/
adaptation
/
intel_mfld
/
mmfw-sysconf-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65dfa9c
)
camera: Disable muxer faststart and default VF/video to 800x600
author
Jussi Saavalainen
<jussi.saavalainen@ixonos.com>
Wed, 2 Jan 2013 14:12:00 +0000
(16:12 +0200)
committer
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Thu, 3 Jan 2013 14:19:32 +0000
(16:19 +0200)
Change-Id: I48c88022d20632c3dcb34de43e0b3b17c3b49ce4
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
patch
|
blob
|
history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
patch
|
blob
|
history
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
patch
|
blob
|
history
packaging/mmfw-sysconf-mfld-blackbay.changes
patch
|
blob
|
history
diff --git
a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
index
a3df8a9
..
c83adce
100644
(file)
--- a/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
+++ b/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder.ini
@@
-106,12
+106,12
@@
PassFirstVideoFrame = 0
[Mux]
;3GP = ffmux_3gp_ext | 0,0
;3GP = ffmux_3gp | 0,0
[Mux]
;3GP = ffmux_3gp_ext | 0,0
;3GP = ffmux_3gp | 0,0
-3GP = 3gppmux | 1,0 | faststart,
1
+3GP = 3gppmux | 1,0 | faststart,
0
;AMR = ffmux_amr_ext | 0,0
AMR = ffmux_amr | 0,0
;MP4 = ffmux_mp4_ext | 0,0
;MP4 = mp4mux | 0,0
;AMR = ffmux_amr_ext | 0,0
AMR = ffmux_amr | 0,0
;MP4 = ffmux_mp4_ext | 0,0
;MP4 = mp4mux | 0,0
-MP4 = qtmux | 1,0 | faststart,
1
+MP4 = qtmux | 1,0 | faststart,
0
OGG = oggmux | 0,0
WAV = wavenc | 0,0
AAC = ffmux_adts |0,0
OGG = oggmux | 0,0
WAV = wavenc | 0,0
AAC = ffmux_adts |0,0
diff --git
a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
index
256b505
..
cebd690
100644
(file)
--- a/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@
-23,10
+23,10
@@
;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
InputIndex = 0,-255 || 0
DeviceName = mt9e013
;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
InputIndex = 0,-255 || 0
DeviceName = mt9e013
-PreviewResolution = 176,144 | 800,600 | 1600,1200 | 1600,940 | 1024,600 | 1280,720 ||
1280,72
0
+PreviewResolution = 176,144 | 800,600 | 1600,1200 | 1600,940 | 1024,600 | 1280,720 ||
800,60
0
CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 | 800,600 | 1024,600 | 1280,720 | 1280,960 | 1920,1080 | 2048,1536 | 3264,1836 | 3264,2448 || 2048,1536
CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 | 800,600 | 1024,600 | 1280,720 | 1280,960 | 1920,1080 | 2048,1536 | 3264,1836 | 3264,2448 || 2048,1536
-DisplayRect = 0,0 | 0,112 || 0,
0
-DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,
1024
+DisplayRect = 0,0 | 0,112 || 0,
112
+DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,
800
FPS = 30 || 30
; PictureForamt - MSL value
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
FPS = 30 || 30
; PictureForamt - MSL value
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
@@
-149,7
+149,7
@@
ProgramMode = 0,2,3,4,-255,-255,-255,-255,-255,5,-255,-255,-255,-255,-255 || 0
;;; No need to convert
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
OutputMode = 0,4,7,8,13 || 0
;;; No need to convert
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
OutputMode = 0,4,7,8,13 || 0
-JpegQuality = 0,100 ||
50
+JpegQuality = 0,100 ||
95
MultishotNumber = 1,255 || 1
SensorEncodedCapture = 0
MultishotNumber = 1,255 || 1
SensorEncodedCapture = 0
diff --git
a/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
b/mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
index
7cdf4f8
..
2925154
100644
(file)
--- a/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/
mmfw-sysconf-simulator/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@
-23,9
+23,12
@@
;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
InputIndex = -255,1 || 1
DeviceName = mt9m114
;;; -1:NONE, 0:CAMERA0, 1:CAMERA1
InputIndex = -255,1 || 1
DeviceName = mt9m114
-PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 |
1280,720 || 1280,72
0
-CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 | 1280,720 | 1280,960 || 1280,960
+PreviewResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 |
800,600 | 1280,720 || 800,60
0
+CaptureResolution = 160,120 | 176,144 | 320,240 | 352,288 | 640,480 |
800,600 |
1280,720 | 1280,960 || 1280,960
FPS = 30 || 30
FPS = 30 || 30
+DisplayRect = 0,0 | 0,112 || 0,112
+DisplayResolution = 480,640 | 580,800 | 600,800 | 600,1024 || 600,800
+
; PictureForamt - MSL value
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
PictureFormat = 0,4,7,8 || 0
; PictureForamt - MSL value
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
PictureFormat = 0,4,7,8 || 0
@@
-152,7
+155,7
@@
DigitalZoom = 100,800 || 100
;;; No need to convert
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
OutputMode = 0,4,7,8,13 || 0
;;; No need to convert
;;; 0:NV12, 1:NV12T, 2:NV16, 3:NV21, 4:YUYV, 5:UYVY, 6:422P, 7:I420, 8:YV12, 9:RGB565, 10:RGB888, 11:RGBA, 12:ARGB, 13:ENCODED
OutputMode = 0,4,7,8,13 || 0
-JpegQuality = 0,100 ||
50
+JpegQuality = 0,100 ||
95
MultishotNumber = 1,255 || 1
SensorEncodedCapture = 0
MultishotNumber = 1,255 || 1
SensorEncodedCapture = 0
diff --git
a/packaging/mmfw-sysconf-mfld-blackbay.changes
b/packaging/mmfw-sysconf-mfld-blackbay.changes
index
6a08de2
..
1712a6d
100644
(file)
--- a/
packaging/mmfw-sysconf-mfld-blackbay.changes
+++ b/
packaging/mmfw-sysconf-mfld-blackbay.changes
@@
-1,3
+1,6
@@
+* Wed Jan 02 2013 Jussi Saavalainen <jussi.saavalainen@ixonos.com> submit/tizen_2.0/20121221.184847@27fb96f
+- camera: Disable muxer faststart and default VF/video to 800x600
+
* 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.
* 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.