Piteball/android_hardware_qcom_media
1
0
Fork 0
mirror of https://github.com/followmsi/android_hardware_qcom_media.git synced 2024-10-31 22:47:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

mm-video-v4l2: vdec:Metadata for HDR and ColorAspects

Browse source 
- Set Content Light Level and Mastering Display Color
  Info display metadata on gralloc buffers via
  COLOR_METADATA
- If ColorAspects are present in the extradata, set
  color primaries, full range flag, transfer and
  matrix metadata on gralloc buffers via COLOR_METADATA
  instead of UPDATE_COLOR_SPACE

Depends-on: 1741493
CRs-Fixed: 1081762

Change-Id: I326cc96ffa65f3d5453b172bc42ba70a50a093db
This commit is contained in:
Umesh Pandey 2016-10-25 18:37:21 -07:00 committed by Gerrit - the friendly Code Review server
parent d3fa4d44d9
commit 6d69567372
2 changed files with 141 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
View file

@ -49,6 +49,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstddef>
#include <cutils/atomic.h>
#include <qdMetaData.h>
#include <color_metadata.h>
static ptrdiff_t x;
@ -705,13 +706,21 @@ class omx_vdec: public qc_omx_component
void convert_color_space_info(OMX_U32 primaries, OMX_U32 range,
OMX_U32 transfer, OMX_U32 matrix, ColorSpace_t *color_space,
ColorAspects *aspects);
bool handle_color_space_info(void *data, unsigned int buf_index);
bool handle_color_space_info(void *data,
ColorSpace_t *color_space,
ColorMetaData* color_mdata,
bool& set_color_aspects_only);
void set_colorspace_in_handle(ColorSpace_t color, unsigned int buf_index);
void print_debug_color_aspects(ColorAspects *aspects, const char *prefix);
void print_debug_hdr_color_info(HDRStaticInfo *hdr_info, const char *prefix);
bool handle_content_light_level_info(void* data);
bool handle_mastering_display_color_info(void* data);
void print_debug_hdr_color_info_mdata(ColorMetaData* color_mdata);
bool handle_content_light_level_info(void* data, ContentLightLevel* light_level_mdata);
bool handle_mastering_display_color_info(void* data, MasteringDisplay* mastering_display_mdata);
void print_debug_extradata(OMX_OTHER_EXTRADATATYPE *extra);
void set_colormetadata_in_handle(ColorMetaData *color_mdata, unsigned int buf_index);
void prepare_color_aspects_metadata(OMX_U32 primaries, OMX_U32 range,
OMX_U32 transfer, OMX_U32 matrix,
ColorMetaData *color_mdata);
#ifdef _MSM8974_
void append_interlace_extradata(OMX_OTHER_EXTRADATATYPE *extra,
OMX_U32 interlaced_format_type);
@ -1044,6 +1053,7 @@ class omx_vdec: public qc_omx_component
DescribeHDRStaticInfoParams m_internal_hdr_info;
bool m_change_client_hdr_info;
pthread_mutex_t m_hdr_info_client_lock;
ColorMetaData m_color_mdata;
OMX_U32 operating_frame_rate;
uint8_t m_need_turbo;

147
mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
View file

@ -779,6 +779,7 @@ omx_vdec::omx_vdec(): m_error_propogated(false),
memset(&m_internal_color_space, 0, sizeof(DescribeColorAspectsParams));
memset(&m_client_hdr_info, 0, sizeof(DescribeHDRStaticInfoParams));
memset(&m_internal_hdr_info, 0, sizeof(DescribeHDRStaticInfoParams));
memset(&m_color_mdata, 0, sizeof(ColorMetaData));
m_demux_entries = 0;
msg_thread_id = 0;
async_thread_id = 0;
@ -10673,13 +10674,32 @@ void omx_vdec::print_debug_color_aspects(ColorAspects *aspects, const char *pref
prefix, aspects->mPrimaries, aspects->mRange, aspects->mTransfer, aspects->mMatrixCoeffs);
}
bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
void omx_vdec::prepare_color_aspects_metadata(OMX_U32 primaries, OMX_U32 range,
OMX_U32 transfer, OMX_U32 matrix,
ColorMetaData *color_mdata)
{
/* ColorAspects in qdMetaData */
color_mdata->colorPrimaries = (enum ColorPrimaries) primaries;
color_mdata->range = (enum ColorRange)range;
color_mdata->transfer = (enum GammaTransfer)transfer;
color_mdata->matrixCoefficients = (enum MatrixCoEfficients)matrix;
}
bool omx_vdec::handle_color_space_info(void *data,
ColorSpace_t *color_space,
ColorMetaData *color_mdata,
bool& set_color_aspects_only)
{
ColorSpace_t color_space = ITU_R_601;
ColorAspects tempAspects;
memset(&tempAspects, 0x0, sizeof(ColorAspects));
ColorAspects *aspects = &tempAspects;
/* Set default ColorAspects */
prepare_color_aspects_metadata(ColorPrimaries_BT601_6_625, Range_Full,
Transfer_SMPTE_170M, MatrixCoEff_BT601_6_625,
color_mdata);
switch(output_capability) {
case V4L2_PIX_FMT_MPEG2:
{
@ -10693,9 +10713,13 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
convert_color_space_info(seqdisp_payload->color_primaries, 1,
seqdisp_payload->transfer_char, seqdisp_payload->matrix_coeffs,
&color_space,aspects);
color_space,aspects);
m_disp_hor_size = seqdisp_payload->disp_width;
m_disp_vert_size = seqdisp_payload->disp_height;
set_color_aspects_only = true;
prepare_color_aspects_metadata(seqdisp_payload->color_primaries, 1,
seqdisp_payload->transfer_char, seqdisp_payload->matrix_coeffs,
color_mdata);
}
}
break;
@ -10713,7 +10737,13 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
display_info_payload->video_full_range_flag,
display_info_payload->transfer_characteristics,
display_info_payload->matrix_coefficients,
&color_space,aspects);
color_space,aspects);
set_color_aspects_only = true;
prepare_color_aspects_metadata(display_info_payload->color_primaries,
display_info_payload->video_full_range_flag,
display_info_payload->transfer_characteristics,
display_info_payload->matrix_coefficients,
color_mdata);
}
}
break;
@ -10733,7 +10763,13 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
1,
vc1_seq_disp_payload->transfer_char,
vc1_seq_disp_payload->matrix_coeffs,
&color_space,aspects);
color_space,aspects);
set_color_aspects_only = true;
prepare_color_aspects_metadata(vc1_seq_disp_payload->color_primaries,
1,
vc1_seq_disp_payload->transfer_char,
vc1_seq_disp_payload->matrix_coeffs,
color_mdata);
}
}
break;
@ -10741,12 +10777,12 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
{
struct msm_vidc_vpx_colorspace_payload *vpx_color_space_payload;
vpx_color_space_payload = (struct msm_vidc_vpx_colorspace_payload*)data;
set_color_aspects_only = false;
/* Refer VP8 Data Format in latest VP8 spec and Decoding Guide November 2011
* to understand this code */
if (vpx_color_space_payload->color_space == 0) {
color_space = ITU_R_601;
*color_space = ITU_R_601;
} else {
DEBUG_PRINT_ERROR("Unsupported Color space for VP8");
break;
@ -10757,7 +10793,7 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
{
struct msm_vidc_vpx_colorspace_payload *vpx_color_space_payload;
vpx_color_space_payload = (struct msm_vidc_vpx_colorspace_payload*)data;
set_color_aspects_only = false;
/* Refer VP9 Spec @ VP9 Bitstream & Decoding Process Specification - v0.6 31st March 2016
* to understand this code */
@ -10769,7 +10805,7 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
aspects->mRange = m_client_color_space.sAspects.mRange;
break;
case MSM_VIDC_CS_BT_709:
color_space = ITU_R_709;
*color_space = ITU_R_709;
aspects->mMatrixCoeffs = ColorAspects::MatrixBT709_5;
aspects->mTransfer = ColorAspects::TransferSMPTE170M;
aspects->mPrimaries = ColorAspects::PrimariesBT709_5;
@ -10813,10 +10849,7 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
default:
break;
}
if (m_enable_android_native_buffers) {
DEBUG_PRINT_HIGH("setMetaData for Color Space = 0x%x (601=%u FR=%u 709=%u)", color_space, ITU_R_601, ITU_R_601_FR, ITU_R_709);
set_colorspace_in_handle(color_space, buf_index);
}
print_debug_color_aspects(aspects, "Bitstream");
if (m_internal_color_space.sAspects.mPrimaries != aspects->mPrimaries ||
@ -10826,6 +10859,11 @@ bool omx_vdec::handle_color_space_info(void *data, unsigned int buf_index)
memcpy(&(m_internal_color_space.sAspects), aspects, sizeof(ColorAspects));
m_internal_color_space.bDataSpaceChanged = OMX_TRUE;
m_color_mdata.colorPrimaries = color_mdata->colorPrimaries;
m_color_mdata.range = color_mdata->range;
m_color_mdata.transfer = color_mdata->transfer;
m_color_mdata.matrixCoefficients = color_mdata->matrixCoefficients;
DEBUG_PRINT_HIGH("Initiating PORT Reconfig due to Color Aspects Change");
print_debug_color_aspects(&(m_internal_color_space.sAspects), "Internal");
print_debug_color_aspects(&(m_client_color_space.sAspects), "Client");
@ -10869,13 +10907,42 @@ void omx_vdec::print_debug_hdr_color_info(HDRStaticInfo *hdr_info, const char *p
}
void omx_vdec::print_debug_hdr_color_info_mdata(ColorMetaData* color_mdata)
{
DEBUG_PRINT_LOW("setMetaData COLOR_METADATA : color_primaries = %u, range = %u, transfer = %u, matrix = %u",
color_mdata->colorPrimaries, color_mdata->range,
color_mdata->transfer, color_mdata->matrixCoefficients);
for(uint8_t i = 0; i < 3; i++) {
for(uint8_t j = 0; j < 2; j++) {
DEBUG_PRINT_LOW("setMetadata COLOR_METADATA : rgbPrimaries[%d][%d] = %d", i, j, color_mdata->masteringDisplayInfo.primaries.rgbPrimaries[i][j]);
}
}
DEBUG_PRINT_LOW("setMetadata COLOR_METADATA : whitepoint[0] = %d whitepoint[1] = %d",
color_mdata->masteringDisplayInfo.primaries.whitePoint[0],
color_mdata->masteringDisplayInfo.primaries.whitePoint[1]);
DEBUG_PRINT_LOW("setMetadata COLOR_METADATA : maxDispLum = %d minDispLum = %d",
color_mdata->masteringDisplayInfo.maxDisplayLuminance,
color_mdata->masteringDisplayInfo.minDisplayLuminance);
DEBUG_PRINT_LOW("setMetadata COLOR_METADATA : maxCLL = %d maxFLL = %d",
color_mdata->contentLightLevel.maxContentLightLevel,
color_mdata->contentLightLevel.minPicAverageLightLevel);
bool omx_vdec::handle_content_light_level_info(void* data)
}
bool omx_vdec::handle_content_light_level_info(void* data, ContentLightLevel* light_level_mdata)
{
struct msm_vidc_content_light_level_sei_payload *light_level_payload =
(msm_vidc_content_light_level_sei_payload*)(data);
light_level_mdata->lightLevelSEIEnabled = true;
light_level_mdata->maxContentLightLevel = light_level_payload->nMaxContentLight;
light_level_mdata->minPicAverageLightLevel = light_level_payload->nMaxPicAverageLight;
if ((m_internal_hdr_info.sInfo.sType1.mMaxContentLightLevel != light_level_payload->nMaxContentLight) ||
(m_internal_hdr_info.sInfo.sType1.mMaxFrameAverageLightLevel != light_level_payload->nMaxPicAverageLight)) {
m_internal_hdr_info.sInfo.sType1.mMaxContentLightLevel = light_level_payload->nMaxContentLight;
@ -10885,14 +10952,24 @@ bool omx_vdec::handle_content_light_level_info(void* data)
return false;
}
bool omx_vdec::handle_mastering_display_color_info(void* data)
bool omx_vdec::handle_mastering_display_color_info(void* data, MasteringDisplay* mastering_display_mdata)
{
struct msm_vidc_mastering_display_colour_sei_payload *mastering_display_payload =
(msm_vidc_mastering_display_colour_sei_payload*)(data);
HDRStaticInfo* hdr_info = &m_internal_hdr_info.sInfo;
bool internal_disp_changed_flag = false;
internal_disp_changed_flag = (hdr_info->sType1.mR.x != mastering_display_payload->nDisplayPrimariesX[0]) ||
mastering_display_mdata->colorVolumeSEIEnabled = true;
for (uint8_t i = 0; i < 3; i++) {
mastering_display_mdata->primaries.rgbPrimaries[i][0] = mastering_display_payload->nDisplayPrimariesX[i];
mastering_display_mdata->primaries.rgbPrimaries[i][1] = mastering_display_payload->nDisplayPrimariesY[i];
}
mastering_display_mdata->primaries.whitePoint[0] = mastering_display_payload->nWhitePointX;
mastering_display_mdata->primaries.whitePoint[1] = mastering_display_payload->nWhitePointY;
mastering_display_mdata->maxDisplayLuminance = mastering_display_payload->nMaxDisplayMasteringLuminance;
mastering_display_mdata->minDisplayLuminance = mastering_display_payload->nMinDisplayMasteringLuminance;
internal_disp_changed_flag |= (hdr_info->sType1.mR.x != mastering_display_payload->nDisplayPrimariesX[0]) ||
(hdr_info->sType1.mR.y != mastering_display_payload->nDisplayPrimariesY[0]);
internal_disp_changed_flag |= (hdr_info->sType1.mG.x != mastering_display_payload->nDisplayPrimariesX[1]) ||
(hdr_info->sType1.mG.y != mastering_display_payload->nDisplayPrimariesY[1]);
@ -10927,6 +11004,19 @@ bool omx_vdec::handle_mastering_display_color_info(void* data)
return internal_disp_changed_flag;
}
void omx_vdec::set_colormetadata_in_handle(ColorMetaData *color_mdata, unsigned int buf_index)
{
private_handle_t *private_handle = NULL;
if (buf_index < drv_ctx.op_buf.actualcount &&
buf_index < MAX_NUM_INPUT_OUTPUT_BUFFERS &&
native_buffer[buf_index].privatehandle) {
private_handle = native_buffer[buf_index].privatehandle;
}
if (private_handle) {
setMetaData(private_handle, COLOR_METADATA, (void*)color_mdata);
}
}
void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
{
OMX_OTHER_EXTRADATATYPE *p_extra = NULL, *p_sei = NULL, *p_vui = NULL, *p_client_extra = NULL;
@ -10940,6 +11030,11 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
int enable = OMX_InterlaceFrameProgressive;
bool internal_hdr_info_changed_flag = false;
bool color_event = false;
ColorMetaData color_mdata;
memset(&color_mdata, 0x0, sizeof(ColorMetaData));
bool set_disp_color_aspects_only = false;
ColorSpace_t color_space = ITU_R_601;
if (output_flush_progress)
return;
@ -11139,7 +11234,7 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
case MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO:
case MSM_VIDC_EXTRADATA_VC1_SEQDISP:
case MSM_VIDC_EXTRADATA_VPX_COLORSPACE_INFO:
color_event = handle_color_space_info((void *)data->data, buf_index);
color_event = handle_color_space_info((void *)data->data, &color_space, &color_mdata, set_disp_color_aspects_only);
break;
case MSM_VIDC_EXTRADATA_S3D_FRAME_PACKING:
struct msm_vidc_s3d_frame_packing_payload *s3d_frame_packing_payload;
@ -11221,10 +11316,13 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
}
break;
case MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI:
internal_hdr_info_changed_flag |= handle_content_light_level_info((void*)data->data);
internal_hdr_info_changed_flag |= handle_content_light_level_info((void*)data->data,
&(color_mdata.contentLightLevel));
break;
case MSM_VIDC_EXTRADATA_MASTERING_DISPLAY_COLOUR_SEI:
internal_hdr_info_changed_flag |= handle_mastering_display_color_info((void*)data->data);
internal_hdr_info_changed_flag |= handle_mastering_display_color_info((void*)data->data,
&(color_mdata.masteringDisplayInfo));
break;
default:
DEBUG_PRINT_LOW("Unrecognized extradata");
@ -11260,6 +11358,7 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
if(internal_hdr_info_changed_flag) {
print_debug_hdr_color_info(&(m_internal_hdr_info.sInfo), "Internal");
print_debug_hdr_color_info(&(m_client_hdr_info.sInfo), "Client");
memcpy(&m_color_mdata, &color_mdata, sizeof(ColorMetaData));
auto_lock lock(m_hdr_info_client_lock);
m_change_client_hdr_info = true;
if(!color_event) {
@ -11270,6 +11369,16 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr)
}
}
if (m_enable_android_native_buffers) {
if (set_disp_color_aspects_only) {
print_debug_hdr_color_info_mdata(&m_color_mdata);
set_colormetadata_in_handle(&m_color_mdata, buf_index);
} else {
DEBUG_PRINT_HIGH("setMetaData for Color Space = 0x%x (601=%u FR=%u 709=%u)", color_space, ITU_R_601, ITU_R_601_FR, ITU_R_709);
set_colorspace_in_handle(color_space, buf_index);
}
}
}
unrecognized_extradata:
if (client_extradata && p_extra) {