projects / framework / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d198e8e)
[cleansdk-target] Enable hardware codec
authorHyunseok Lee <hs7388.lee@samsung.com>
Thu, 28 Mar 2013 07:18:44 +0000 (16:18 +0900)
committerHyunseok Lee <hs7388.lee@samsung.com>
Thu, 28 Mar 2013 07:18:44 +0000 (16:18 +0900)
Change-Id: I6c80d5d4581dfd0a9d87f6123fe88e3d690b8a19

mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf patch | blob | history
mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini patch | blob | history
mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini patch | blob | history
mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini patch | blob | history
packaging/mmfw-sysconf-cleansdk-e4x12.spec patch | blob | history
packaging/mmfw-sysconf-cleansdk-target.spec patch | blob | history
packaging/mmfw-sysconf-simulator.spec patch | blob | history

diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf b/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf
index 9c0203c..ed6f3db 100644 (file)
--- a/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/gst-openmax.conf
@@ -4,7 +4,7 @@ omx_mpeg4dec,
   component-name=OMX.SEC.MPEG4.Decoder,
   sink="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-divx, divxversion=(int)[4,5], width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-xvid, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max]; video/x-3ivx, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_h264dec,
   type=GstOmxH264Dec,
@@ -12,7 +12,7 @@ omx_h264dec,
   component-name=OMX.SEC.AVC.Decoder,
   sink="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_h263dec,
   type=GstOmxH263Dec,
@@ -20,7 +20,7 @@ omx_h263dec,
   component-name=OMX.SEC.H263.Decoder,
   sink="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_wmvdec,
   type=GstOmxWmvDec,
@@ -28,7 +28,7 @@ omx_wmvdec,
   component-name=OMX.SEC.WMV.Decoder,
   sink="video/x-wmv, wmvversion=(int)3, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-raw-yuv, format=(fourcc){ST12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_mpeg4enc,
   type=GstOmxMpeg4Enc,
@@ -36,7 +36,7 @@ omx_mpeg4enc,
   component-name=OMX.SEC.MPEG4.Encoder,
   sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/mpeg, mpegversion=(int)4, systemstream=false, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_h264enc,
   type=GstOmxH264Enc,
@@ -44,7 +44,7 @@ omx_h264enc,
   component-name=OMX.SEC.AVC.Encoder,
   sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-h264, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0;
+  rank=256;
 
 omx_h263enc,
   type=GstOmxH263Enc,
@@ -52,4 +52,4 @@ omx_h263enc,
   component-name=OMX.SEC.H263.Encoder,
   sink="video/x-raw-yuv, format=(fourcc){ST12, SN12}, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
   src="video/x-h263, variant=(string)itu, width=(int)[16,4096], height=(int)[16,4096], framerate=(fraction)[0,max];",
-  rank=0
+  rank=256;
diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini
index 0fba014..3f988c7 100644 (file)
--- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder.ini
@@ -34,7 +34,7 @@ ConfCtrlFile1 = mmfw_camcorder_dev_video_sec.ini
 VideosrcElement = camerasrc | 2,0 | do-timestamp,1 | num-alloc-buf,7
 UseVideoscale = 0
 VideoscaleElement = videoscale | 3,0 | width,320 | height,240 | method,1
-UseZeroCopyFormat = 0
+UseZeroCopyFormat = 1
 DeviceCount = 2
 
 [AudioInput]
@@ -55,8 +55,9 @@ UseVideoscale = 0
 VideoscaleElement = fimcconvert | 1,0 | rotang,90
 
 [VideoEncoder]
-H263 = ffenc_h263p | 0,0
-MPEG4 = ffenc_mpeg4 | 0,0
+H263 = omx_h263enc | 0,0
+H264 = omx_h264enc | 0,0
+MPEG4 = omx_mpeg4enc | 0,0
 
 [AudioEncoder]
 AMR = amrnbenc | 0,0
@@ -78,7 +79,7 @@ UseVideoEncoderQueue = 1
 VideoProfile = 0
 VideoAutoAudioConvert = 1
 VideoAutoAudioResample = 0
-VideoAutoColorSpace = 1
+VideoAutoColorSpace = 0
 AudioProfile = 1
 AudioAutoAudioConvert = 1
 AudioAutoAudioResample = 0
diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini
index 5e8c3ba..a3d57bf 100644 (file)
--- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_pri.ini
@@ -28,14 +28,14 @@ CaptureResolution = 640,480 | 1280,720 | 1920,1080 | 2048,1536 | 3264,1960 | 326
 FPS = 0,8,15,24,25,30,60,120 || 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
-PictureFormat = 0,4,7 || 7
+PictureFormat = 0,4,7 || 0
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
 RecommendDisplayRotation = 3
 ; Recommend preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 4
+RecommendPreviewFormatCapture = 0
 ; Recommend preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 RecommendPreviewFormatRecord = 0
diff --git a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini
index 28340ea..e82c20d 100644 (file)
--- a/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini
+++ b/mmfw-sysconf-cleansdk-target/usr/etc/mmfw_camcorder_dev_video_sec.ini
@@ -25,17 +25,17 @@ InputIndex = -255,1 || 1
 DeviceName = m4mo_VGA_c210
 PreviewResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
 CaptureResolution = 176,144 | 320,240 | 352,288 | 640,480 || 640,480
-FPS = 0,8,15,25,30 || 15
+FPS = 0,8,15,25,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
-PictureFormat = 0,4,7 || 7
+PictureFormat = 0,4,7 || 0
 Overlay = 0,1 || 1
 ; Recommend display rotation
 ;;; 0:NONE, 1:90, 2:180, 3:270
 RecommendDisplayRotation = 3
 ; Recommend preview format for capture
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
-RecommendPreviewFormatCapture = 4
+RecommendPreviewFormatCapture = 0
 ; Recommend preview format for record
 ;;; 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, 14:INTERLEAVED_JPEG_UYVY
 RecommendPreviewFormatRecord = 0
diff --git a/packaging/mmfw-sysconf-cleansdk-e4x12.spec b/packaging/mmfw-sysconf-cleansdk-e4x12.spec
index 8312adc..5f85e74 100644 (file)
--- a/packaging/mmfw-sysconf-cleansdk-e4x12.spec
+++ b/packaging/mmfw-sysconf-cleansdk-e4x12.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-cleansdk-e4x12
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.61
+Version:    0.1.62
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
diff --git a/packaging/mmfw-sysconf-cleansdk-target.spec b/packaging/mmfw-sysconf-cleansdk-target.spec
index 5dd344a..9ba45b4 100644 (file)
--- a/packaging/mmfw-sysconf-cleansdk-target.spec
+++ b/packaging/mmfw-sysconf-cleansdk-target.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-cleansdk-target
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.61
+Version:    0.1.62
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
diff --git a/packaging/mmfw-sysconf-simulator.spec b/packaging/mmfw-sysconf-simulator.spec
index 6648c39..941759d 100644 (file)
--- a/packaging/mmfw-sysconf-simulator.spec
+++ b/packaging/mmfw-sysconf-simulator.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf-simulator
 Summary:    Multimedia Framework system configuration package
-Version:    0.1.61
+Version:    0.1.62
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
Domain: Multimedia / Uncategorized;