Merge "mm-video-v4l2: Add support of capture and CVP frame rate controls"
diff --git a/conf_files/kona/media_profiles.xml b/conf_files/kona/media_profiles.xml
index bb9cd1f..924afcd 100644
--- a/conf_files/kona/media_profiles.xml
+++ b/conf_files/kona/media_profiles.xml
@@ -476,6 +476,88 @@
<ImageEncoding quality="70" />
<ImageDecoding memCap="20000000" />
+ <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="6400000"
+ width="640"
+ height="480"
+ frameRate="240" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="120000000"
+ width="3840"
+ height="2160"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed2160p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="120000000"
+ width="3840"
+ height="2160"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="50000000"
+ width="1920"
+ height="1080"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="88000000"
+ width="1280"
+ height="720"
+ frameRate="480" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="6400000"
+ width="640"
+ height="480"
+ frameRate="240" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
</CamcorderProfiles>
<!-- Front Camera -->
<CamcorderProfiles cameraId="1">
@@ -856,6 +938,88 @@
channels="2" />
</EncoderProfile>
+ <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="6400000"
+ width="640"
+ height="480"
+ frameRate="240" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="120000000"
+ width="3840"
+ height="2160"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed2160p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="120000000"
+ width="3840"
+ height="2160"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="50000000"
+ width="1920"
+ height="1080"
+ frameRate="120" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="88000000"
+ width="1280"
+ height="720"
+ frameRate="480" />
+
+ <!-- audio setting is ignored -->
+ <Audio codec="aac"
+ bitRate="96000"
+ sampleRate="48000"
+ channels="1" />
+ </EncoderProfile>
+
+ <EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
+ <Video codec="h264"
+ bitRate="6400000"
+ width="640"
+ height="480"
+ frameRate="240" />
+
+ <Audio codec="aac"
+ bitRate="156000"
+ sampleRate="48000"
+ channels="2" />
+ </EncoderProfile>
+
<ImageEncoding quality="95" />
<ImageEncoding quality="80" />
<ImageEncoding quality="70" />
diff --git a/conf_files/lito/media_codecs_vendor.xml b/conf_files/lito/media_codecs_vendor.xml
index 7da517d..f0535b0 100644
--- a/conf_files/lito/media_codecs_vendor.xml
+++ b/conf_files/lito/media_codecs_vendor.xml
@@ -188,7 +188,7 @@
<Quirk name="requires-loaded-to-idle-after-allocation" />
<Limit name="size" min="512x512" max="512x512" />
<Limit name="frame-rate" range="1-20" />
- <Limit name="concurrent-instances" max="6" />
+ <Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
</MediaCodec>
diff --git a/conf_files/lito/media_codecs_vendor_v1.xml b/conf_files/lito/media_codecs_vendor_v1.xml
index b4e4f62..a8963e3 100644
--- a/conf_files/lito/media_codecs_vendor_v1.xml
+++ b/conf_files/lito/media_codecs_vendor_v1.xml
@@ -196,7 +196,7 @@
<Quirk name="requires-loaded-to-idle-after-allocation" />
<Limit name="size" min="512x512" max="8192x8192" />
<Limit name="frame-rate" range="1-20" />
- <Limit name="concurrent-instances" max="6" />
+ <Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
</MediaCodec>
diff --git a/conf_files/lito/media_profiles.xml b/conf_files/lito/media_profiles.xml
index a7ff232..56a2286 100644
--- a/conf_files/lito/media_profiles.xml
+++ b/conf_files/lito/media_profiles.xml
@@ -111,7 +111,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -281,7 +281,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -470,7 +470,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -633,7 +633,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -1120,7 +1120,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -1290,7 +1290,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -1480,7 +1480,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -1650,7 +1650,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -1840,7 +1840,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
@@ -2010,7 +2010,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
bitRate="42000000"
- width="4096"
+ width="3840"
height="2160"
frameRate="30" />
diff --git a/mm-core/Android.mk b/mm-core/Android.mk
index 075169d..9415c87 100644
--- a/mm-core/Android.mk
+++ b/mm-core/Android.mk
@@ -97,7 +97,7 @@
ifneq (,$(filter lito bengal kona $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES += src/registry_table_android.c
else
-LOCAL_SRC_FILES += src/qc_registry_table_android.c
+LOCAL_SRC_FILES += src/default/qc_registry_table_android.c
endif
include $(BUILD_SHARED_LIBRARY)
@@ -140,7 +140,7 @@
ifneq (,$(filter lito bengal kona $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/registry_table.c
else
-LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/qc_registry_table.c
+LOCAL_SRC_FILES += src/$(MM_CORE_TARGET)/default/qc_registry_table.c
endif
include $(BUILD_SHARED_LIBRARY)