Add support for OMX_COLOR_FormatYCbYCr
diff --git a/nodes/pvomxencnode/include/pvmf_omx_enc_port.h b/nodes/pvomxencnode/include/pvmf_omx_enc_port.h
index cee3de2..59979d0 100644
--- a/nodes/pvomxencnode/include/pvmf_omx_enc_port.h
+++ b/nodes/pvomxencnode/include/pvmf_omx_enc_port.h
@@ -204,14 +204,18 @@
{
if (pv_mime_strcmp(aKvp->value.pChar_value, PVMF_MIME_YUV420) == 0)
{
- return 4;
+ return 5;
}
else if (pv_mime_strcmp(aKvp->value.pChar_value, PVMF_MIME_YUV422) == 0)
{
- return 3;
+ return 4;
}
else if (pv_mime_strcmp(aKvp->value.pChar_value, PVMF_MIME_YUV422_INTERLEAVED_UYVY) == 0)
{
+ return 3;
+ }
+ else if (pv_mime_strcmp(aKvp->value.pChar_value, PVMF_MIME_YUV422_INTERLEAVED_YUYV) == 0)
+ {
return 2;
}
else if (pv_mime_strcmp(aKvp->value.pChar_value, PVMF_MIME_RGB12) == 0)
diff --git a/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp b/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp
index 5ff2bc9..cbe5aae 100644
--- a/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp
+++ b/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp
@@ -708,6 +708,7 @@
iCapability.iInputFormatCapability.push_back(PVMF_MIME_YUV420);
iCapability.iInputFormatCapability.push_back(PVMF_MIME_YUV422);
iCapability.iInputFormatCapability.push_back(PVMF_MIME_YUV422_INTERLEAVED_UYVY);
+ iCapability.iInputFormatCapability.push_back(PVMF_MIME_YUV422_INTERLEAVED_YUYV);
iCapability.iInputFormatCapability.push_back(PVMF_MIME_RGB24);
iCapability.iInputFormatCapability.push_back(PVMF_MIME_RGB12);
@@ -2079,6 +2080,10 @@
{
DesiredPortColorFormat = OMX_COLOR_FormatCbYCrY;
}
+ else if (iInFormat == PVMF_MIME_YUV422_INTERLEAVED_YUYV)
+ {
+ DesiredPortColorFormat = OMX_COLOR_FormatYCbYCr;
+ }
else
{
PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
@@ -2154,6 +2159,11 @@
iOMXComponentInputBufferSize = iVideoInputFormat.iFrameWidth * iVideoInputFormat.iFrameHeight * 2;
iParamPort.format.video.eColorFormat = OMX_COLOR_FormatCbYCrY;
}
+ else if (iInFormat == PVMF_MIME_YUV422_INTERLEAVED_YUYV)
+ {
+ iOMXComponentInputBufferSize = iVideoInputFormat.iFrameWidth * iVideoInputFormat.iFrameHeight * 2;
+ iParamPort.format.video.eColorFormat = OMX_COLOR_FormatYCbYCr;
+ }
else
{
PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE,
diff --git a/pvmi/pvmf/include/pvmf_format_type.h b/pvmi/pvmf/include/pvmf_format_type.h
index 96090d4..03739f2 100644
--- a/pvmi/pvmf/include/pvmf_format_type.h
+++ b/pvmi/pvmf/include/pvmf_format_type.h
@@ -86,6 +86,7 @@
#define PVMF_MIME_YUV422_SEMIPLANAR "X-YUV-422-SEMIPLANAR"
#define PVMF_MIME_YUV422_PACKEDSEMIPLANAR "X-YUV-422-PACKEDSEMIPLANAR"
#define PVMF_MIME_YUV422_INTERLEAVED_UYVY "X-YUV-422-INTERLEAVED-UYVY"
+#define PVMF_MIME_YUV422_INTERLEAVED_YUYV "X-YUV-422-INTERLEAVED-YUYV"
#define PVMF_MIME_YUV420_SEMIPLANAR_YVU "X-YUV-420-SEMIPLANAR-YUV"
// MIME strings for compressed audio formats
diff --git a/pvmi/pvmf/src/pvmf_format_type.cpp b/pvmi/pvmf/src/pvmf_format_type.cpp
index 59da2c4..1cdca7b 100644
--- a/pvmi/pvmf/src/pvmf_format_type.cpp
+++ b/pvmi/pvmf/src/pvmf_format_type.cpp
@@ -37,6 +37,7 @@
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV420) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422_INTERLEAVED_UYVY) == 0) ||
+ (pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422_INTERLEAVED_YUYV) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB8) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB12) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB16) == 0) ||
@@ -94,6 +95,7 @@
if ((pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV420) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422_INTERLEAVED_UYVY) == 0) ||
+ (pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_YUV422_INTERLEAVED_YUYV) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB8) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB12) == 0) ||
(pv_mime_strcmp(iMimeStr.c_str(), PVMF_MIME_RGB16) == 0) ||
