Skip to content

Commit

Permalink
[sample_encode] Add flags for forcing output color format
Browse files Browse the repository at this point in the history 
Issue: MDP-65302
Test: manually
./sample_encode h265 -i in.yuv -o out_y210.h265 -w 1920 -h 1080 -p010 -n 200 -ec::y210
./sample_encode h265 -i in.yuv -o out_nv12.h265 -w 1920 -h 1080 -p010 -n 200 -ec::nv12
and others
  • Loading branch information
@aobolensk @dmitryermilov
aobolensk authored and dmitryermilov committed Jan 21, 2021
1 parent 6f32f07 commit 778c5a4
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 13 deletions.
2 changes: 1 addition & 1 deletion doc/samples/readme-encode_linux.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The following command-line switches are optional:
|---|---|
|[-nv12\|yuy2\|ayuv\|rgb4\|p010\|y210\|y410\|a2rgb10\|p016\|y216]| input color format (by default YUV420 is expected).|
|[-msb10]| 10-bit color format is expected to have data in Most Significant Bits of words. (LSB data placement is expected by default). This option also disables data shifting during file reading.|
| [-ec::p010] | force usage of P010 surfaces for encoder (conversion will be made if necessary). Use for 10 bit HEVC encoding|
| [-ec::p010\|yuy2\|nv12\|rgb4\|ayuv\|uyvy\|y210\|y410\|p016\|y216] | force output color format for encoder (conversion will be made if necessary). Default value: input color format|
|[-tff\|bff]| input stream is interlaced, top\|bottom field first, if not specified progressive is expected|
| [-bref] | arrange B frames in B pyramid reference structure|
| [-nobref] | do not use B-pyramid (by default the decision is made by library)|
Expand Down
64 changes: 52 additions & 12 deletions samples/sample_encode/src/sample_encode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void PrintHelp(msdk_char *strAppName, const msdk_char *strErrorMessage, ...)
#endif
msdk_printf(MSDK_STRING(" [-nv12|yuy2|uyvy|ayuv|rgb4|p010|y210|y410|a2rgb10|p016|y216] - input color format (by default YUV420 is expected).\n"));
msdk_printf(MSDK_STRING(" [-msb10] - 10-bit color format is expected to have data in Most Significant Bits of words.\n (LSB data placement is expected by default).\n This option also disables data shifting during file reading.\n"));
msdk_printf(MSDK_STRING(" [-ec::p010] - force usage of P010 surfaces for encoder (conversion will be made if necessary). Use for 10 bit HEVC encoding\n"));
msdk_printf(MSDK_STRING(" [-ec::p010|yuy2|nv12|rgb4|ayuv|uyvy|y210|y410|p016|y216] - force output color format for encoder (conversion will be made if necessary). Default value: input color format\n"));
msdk_printf(MSDK_STRING(" [-tff|bff] - input stream is interlaced, top|bottom fielf first, if not specified progressive is expected\n"));
msdk_printf(MSDK_STRING(" [-bref] - arrange B frames in B pyramid reference structure\n"));
msdk_printf(MSDK_STRING(" [-nobref] - do not use B-pyramid (by default the decision is made by library)\n"));
Expand Down Expand Up @@ -303,11 +303,49 @@ mfxStatus ParseAdditionalParams(msdk_char *strInput[], mfxU8 nArgNum, mfxU8& i,
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-p016")))
{
pParams->FileInputFourCC = MFX_FOURCC_P016;
pParams->EncodeFourCC = MFX_FOURCC_P016;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-y216")))
{
pParams->FileInputFourCC = MFX_FOURCC_Y216;
}
#endif
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::yuy2")))
{
pParams->EncodeFourCC = MFX_FOURCC_YUY2;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::nv12")))
{
pParams->EncodeFourCC = MFX_FOURCC_NV12;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::rgb4")))
{
pParams->EncodeFourCC = MFX_FOURCC_RGB4;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::ayuv")))
{
pParams->EncodeFourCC = MFX_FOURCC_AYUV;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::uyvy")))
{
pParams->EncodeFourCC = MFX_FOURCC_UYVY;
}
#if (MFX_VERSION >= 1027)
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::y210")))
{
pParams->EncodeFourCC = MFX_FOURCC_Y210;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::y410")))
{
pParams->EncodeFourCC = MFX_FOURCC_Y410;
}
#endif
#if (MFX_VERSION >= 1031)
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::p016")))
{
pParams->EncodeFourCC = MFX_FOURCC_P016;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::y216")))
{
pParams->EncodeFourCC = MFX_FOURCC_Y216;
}
#endif
Expand Down Expand Up @@ -336,7 +374,7 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p
pParams->isV4L2InputEnabled = false;
pParams->nNumFrames = 0;
pParams->FileInputFourCC = MFX_FOURCC_I420;
pParams->EncodeFourCC = MFX_FOURCC_NV12;
pParams->EncodeFourCC = 0;
pParams->nPRefType = MFX_P_REF_DEFAULT;
pParams->QPFileMode = false;
pParams->BitrateLimit = MFX_CODINGOPTION_OFF;
Expand Down Expand Up @@ -445,7 +483,6 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-yuy2")))
{
pParams->FileInputFourCC = MFX_FOURCC_YUY2;
pParams->EncodeFourCC = MFX_FOURCC_YUY2;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-nv12")))
{
Expand All @@ -454,40 +491,32 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-rgb4")))
{
pParams->FileInputFourCC = MFX_FOURCC_RGB4;
pParams->EncodeFourCC = MFX_FOURCC_RGB4;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-p010")))
{
pParams->FileInputFourCC = MFX_FOURCC_P010;
pParams->EncodeFourCC = MFX_FOURCC_P010;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ayuv")))
{
pParams->FileInputFourCC = MFX_FOURCC_AYUV;
pParams->EncodeFourCC = MFX_FOURCC_AYUV;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-uyvy")))
{
pParams->FileInputFourCC = MFX_FOURCC_UYVY;
// use YUY2 to get chroma subsampling 4:2:2 in encoded image
pParams->EncodeFourCC = MFX_FOURCC_YUY2;
}
#if (MFX_VERSION >= 1027)
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-y210")))
{
pParams->FileInputFourCC = MFX_FOURCC_Y210;
pParams->EncodeFourCC = MFX_FOURCC_Y210;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-y410")))
{
pParams->FileInputFourCC = MFX_FOURCC_Y410;
pParams->EncodeFourCC = MFX_FOURCC_Y410;
}
#endif
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-a2rgb10")))
{
pParams->FileInputFourCC = MFX_FOURCC_A2RGB10;
pParams->EncodeFourCC = MFX_FOURCC_A2RGB10;
}
else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-ec::p010")))
{
Expand Down Expand Up @@ -1374,6 +1403,17 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p
return MFX_ERR_UNSUPPORTED;
}

if (!pParams->EncodeFourCC)
{
if (pParams->FileInputFourCC == MFX_FOURCC_UYVY)
// use YUY2 to get chroma subsampling 4:2:2 in encoded image
pParams->EncodeFourCC = MFX_FOURCC_YUY2;
else if (pParams->FileInputFourCC == MFX_FOURCC_I420)
pParams->EncodeFourCC = MFX_FOURCC_NV12;
else
pParams->EncodeFourCC = pParams->FileInputFourCC;
}

if (MFX_CODEC_HEVC != pParams->CodecId && MFX_CODEC_VP9 != pParams->CodecId && (pParams->EncodeFourCC == MFX_FOURCC_P010) )
{
PrintHelp(strInput[0], MSDK_STRING("P010 surfaces are supported only for HEVC and VP9 encoder"));
Expand Down

0 comments on commit 778c5a4

Please sign in to comment.