Merge "media: Include QC OMX Codecs and fix rank of QC OMX components"
diff --git a/conf_files/kona/media_codecs_performance.xml b/conf_files/kona/media_codecs_performance.xml
index 8a75380..74c9229 100644
--- a/conf_files/kona/media_codecs_performance.xml
+++ b/conf_files/kona/media_codecs_performance.xml
@@ -34,6 +34,9 @@
<Limit name="measured-frame-rate-1920x1080" range="91-104" />
<Limit name="measured-frame-rate-3840x2160" range="37-40" />
</MediaCodec>
+ <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" update="true">
+ <Limit name="measured-frame-rate-320x240" range="340-400" />
+ </MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="303-303" />
<Limit name="measured-frame-rate-352x288" range="259-259" />
diff --git a/conf_files/kona/media_profiles.xml b/conf_files/kona/media_profiles.xml
index 21ef171..a49eedd 100644
--- a/conf_files/kona/media_profiles.xml
+++ b/conf_files/kona/media_profiles.xml
@@ -110,7 +110,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -188,7 +188,7 @@
<EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -214,7 +214,7 @@
<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="24" />
@@ -227,7 +227,7 @@
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -266,7 +266,7 @@
<EncoderProfile quality="vga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -293,7 +293,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -350,7 +350,7 @@
<EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -406,7 +406,7 @@
<EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -434,7 +434,7 @@
<EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="30" />
@@ -447,7 +447,7 @@
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -495,7 +495,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -573,7 +573,7 @@
<EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -599,7 +599,7 @@
<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="24" />
@@ -612,7 +612,7 @@
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -651,7 +651,7 @@
<EncoderProfile quality="vga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -679,7 +679,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -707,7 +707,7 @@
<EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="1200000"
+ bitRate="720000"
width="352"
height="288"
frameRate="30" />
@@ -735,7 +735,7 @@
<EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -791,7 +791,7 @@
<EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -819,7 +819,7 @@
<EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="30" />
@@ -832,7 +832,7 @@
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -880,7 +880,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -958,7 +958,7 @@
<EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -984,7 +984,7 @@
<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="24" />
@@ -997,7 +997,7 @@
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1036,7 +1036,7 @@
<EncoderProfile quality="vga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -1063,7 +1063,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1120,7 +1120,7 @@
<EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -1176,7 +1176,7 @@
<EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -1204,7 +1204,7 @@
<EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="30" />
@@ -1217,7 +1217,7 @@
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1243,7 +1243,7 @@
<EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="1920"
height="1080"
frameRate="120" />
@@ -1257,10 +1257,10 @@
<EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="24000000"
- width="1280"
- height="720"
- frameRate="240" />
+ bitRate="50000000"
+ width="1920"
+ height="1080"
+ frameRate="120" />
<!-- audio setting is ignored -->
<Audio codec="aac"
@@ -1271,7 +1271,7 @@
<EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="24000000"
+ bitRate="55000000"
width="1280"
height="720"
frameRate="240" />
@@ -1285,7 +1285,7 @@
<EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="12000000"
+ bitRate="6400000"
width="640"
height="480"
frameRate="240" />
@@ -1320,7 +1320,7 @@
<EncoderProfile quality="high" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1398,7 +1398,7 @@
<EncoderProfile quality="qhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -1424,7 +1424,7 @@
<EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="24" />
@@ -1437,7 +1437,7 @@
<EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1476,7 +1476,7 @@
<EncoderProfile quality="vga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -1503,7 +1503,7 @@
<EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1560,7 +1560,7 @@
<EncoderProfile quality="timelapsevga" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="2000000"
+ bitRate="1536000"
width="640"
height="480"
frameRate="30" />
@@ -1616,7 +1616,7 @@
<EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="29400000"
width="2560"
height="1440"
frameRate="30" />
@@ -1644,7 +1644,7 @@
<EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="57500000"
width="4096"
height="2160"
frameRate="30" />
@@ -1657,7 +1657,7 @@
<EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="3840"
height="2160"
frameRate="30" />
@@ -1683,7 +1683,7 @@
<EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="42000000"
+ bitRate="50000000"
width="1920"
height="1080"
frameRate="120" />
@@ -1697,10 +1697,10 @@
<EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="24000000"
- width="1280"
- height="720"
- frameRate="240" />
+ bitRate="50000000"
+ width="1920"
+ height="1080"
+ frameRate="120" />
<!-- audio setting is ignored -->
<Audio codec="aac"
@@ -1711,7 +1711,7 @@
<EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="24000000"
+ bitRate="55000000"
width="1280"
height="720"
frameRate="240" />
@@ -1725,7 +1725,7 @@
<EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="12000000"
+ bitRate="6400000"
width="640"
height="480"
frameRate="240" />
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h
index ba9bc64..bb1235e 100644
--- a/mm-core/inc/OMX_QCOMExtns.h
+++ b/mm-core/inc/OMX_QCOMExtns.h
@@ -1506,8 +1506,6 @@
OMX_QTI_VIDC_ExtraData_HDR10HIST = 0x7F100008,
} OMX_QTI_VIDC_EXTRADATATYPE;
-#define OMX_QTI_VIDC_ExtraData_LTRInfo OMX_QTI_VIDC_ExtraData_LTRInfo
-
struct ExtraDataMap {
const char *type;
OMX_QTI_VIDC_EXTRADATATYPE index;
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
index 7f797d2..7ecd92c 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
@@ -3199,11 +3199,11 @@
/**
* alignment factors:
*
- * - stride: 128
- * - scanlines: 32
+ * - stride: 512
+ * - scanlines: 512
*/
- stride = ALIGN(p_img->mWidth, 128);
- scanlines = ALIGN(p_img->mHeight, 32);
+ stride = VENUS_Y_STRIDE(COLOR_FMT_NV12, p_img->mWidth);
+ scanlines = VENUS_Y_SCANLINES(COLOR_FMT_NV12, p_img->mHeight);
p_img->mBitDepth = 8;