Browse Source

sf-omx-il: Add OMX_COLOR_FormatYVU420PackedPlanar for NV21
Signed-off-by: sw.multimedia <sw.multimedia@starfivetech.com>

sw.multimedia 2 years ago
parent
commit
476867c2c8

+ 3 - 1
soft_3rdpart/omx-il/component/image/dec/SF_OMX_Mjpeg_decoder.c

@@ -317,7 +317,7 @@ static OMX_ERRORTYPE SF_OMX_GetParameter(
             portFormat->eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; //NV12
             break;
         case 4:
-            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar; //NV21
+            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar; //NV21
             break;
         default:
             if (index > 0)
@@ -443,6 +443,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
                         pOutputPort->nBufferSize = (width * height * 3) / 2;
                         break;
                     case OMX_COLOR_FormatYVU420PackedSemiPlanar: //NV21
+                    case OMX_COLOR_FormatYVU420PackedPlanar:
                         decConfig->cbcrInterleave = CRCB_INTERLEAVE;
                         decConfig->packedFormat = PACKED_FORMAT_NONE;
                         pOutputPort->nBufferSize = (width * height * 3) / 2;
@@ -488,6 +489,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
             pPort->format.video.eColorFormat = portFormat->eColorFormat;
             break;
         case OMX_COLOR_FormatYVU420PackedSemiPlanar: //NV21
+        case OMX_COLOR_FormatYVU420PackedPlanar:
             decConfig->cbcrInterleave = CRCB_INTERLEAVE;
             decConfig->packedFormat = PACKED_FORMAT_NONE;
             pSfMjpegImplement->frameFormat = FORMAT_420;

+ 4 - 1
soft_3rdpart/omx-il/component/video/dec/SF_OMX_Vdec_decoder.c

@@ -167,6 +167,7 @@ static void OnEventArrived(Component com, unsigned long event, void *data, void
         case OMX_COLOR_FormatYUV420SemiPlanar:
         case OMX_COLOR_FormatYUV420PackedSemiPlanar:
         case OMX_COLOR_FormatYVU420PackedSemiPlanar:
+        case OMX_COLOR_FormatYVU420PackedPlanar:
             if (nWidth && nHeight) {
                 pSfOMXComponent->portDefinition[1].nBufferSize = (nWidth * nHeight * 3) / 2;
             }
@@ -463,7 +464,7 @@ static OMX_ERRORTYPE SF_OMX_GetParameter(
             break;
         case 2:
             portFormat->eCompressionFormat = OMX_VIDEO_CodingUnused;
-            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar;
+            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar;
             portFormat->xFramerate = 30;
             break;
         default:
@@ -565,6 +566,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
                 pPort->format.video.eColorFormat = portFormat->eColorFormat;
                 break;
             case OMX_COLOR_FormatYVU420PackedSemiPlanar: //NV21
+            case OMX_COLOR_FormatYVU420PackedPlanar:
                 pTestDecConfig->cbcrInterleave = TRUE;
                 pTestDecConfig->nv21 = TRUE;
                 pPort->format.video.eColorFormat = portFormat->eColorFormat;
@@ -680,6 +682,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
                     pOutputPort->nBufferSize = (width * height * 3) / 2;
                 break;
             case OMX_COLOR_FormatYVU420PackedSemiPlanar: //NV21
+            case OMX_COLOR_FormatYVU420PackedPlanar:
                 pTestDecConfig->cbcrInterleave = TRUE;
                 pTestDecConfig->nv21 = TRUE;
                 if (width && height)

+ 3 - 1
soft_3rdpart/omx-il/component/video/enc/SF_OMX_Venc_encoder.c

@@ -408,7 +408,7 @@ static OMX_ERRORTYPE SF_OMX_GetParameter(
             break;
         case 2:
             portFormat->eCompressionFormat = OMX_VIDEO_CodingUnused;
-            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar;
+            portFormat->eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar;
             portFormat->xFramerate = 30;
             break;
         default:
@@ -580,6 +580,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
                 pTestEncConfig->nv21 = FALSE;
                 break;
             case OMX_COLOR_FormatYVU420PackedSemiPlanar: //NV21
+            case OMX_COLOR_FormatYVU420PackedPlanar:
                 pTestEncConfig->cbcrInterleave = TRUE;
                 pTestEncConfig->nv21 = TRUE;
                 break;
@@ -612,6 +613,7 @@ static OMX_ERRORTYPE SF_OMX_SetParameter(
             case OMX_COLOR_FormatYUV420SemiPlanar:
             case OMX_COLOR_FormatYUV420PackedSemiPlanar:
             case OMX_COLOR_FormatYVU420PackedSemiPlanar:
+            case OMX_COLOR_FormatYVU420PackedPlanar:
                 if (width && height)
                     pOutputPort->nBufferSize = (width * height * 3) / 2;
                 break;

+ 1 - 1
soft_3rdpart/omx-il/tests/dec_test.c

@@ -333,7 +333,7 @@ int main(int argc, char **argv)
     }
     else if (strstr(decodeTestContext->sOutputFormat, "nv21") != NULL)
     {
-        pOutputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar;
+        pOutputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar;
     }
     else if (strstr(decodeTestContext->sOutputFormat, "i420") != NULL)
     {

+ 1 - 1
soft_3rdpart/omx-il/tests/enc_test.c

@@ -332,7 +332,7 @@ int main(int argc, char **argv)
     }
     else if (strstr(encodeTestContext->sInputFormat, "nv21") != NULL)
     {
-        pInputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar;
+        pInputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar;
     }
     else
     {

+ 1 - 1
soft_3rdpart/omx-il/tests/mjpeg_dec_test.c

@@ -334,7 +334,7 @@ int main(int argc, char **argv)
     }
     else if (strstr(decodeTestContext->sOutputFormat, "nv21") != NULL)
     {
-        pOutputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedSemiPlanar;
+        pOutputPortDefinition.format.video.eColorFormat = OMX_COLOR_FormatYVU420PackedPlanar;
     }
     else if (strstr(decodeTestContext->sOutputFormat, "i420") != NULL)
     {