setget_dataformat_ut

huili2 committed 12 years ago

Commit e8fdd4c1 parent d0d68428 files · +57 −20Browse files

Showing the changes to codec/decoder (3 of 8 files). Show all

Unified · Split

3 files

@@ -168,13 +168,13 @@ SLogContext sLogCtx; · 167 unmodified lines
168	// Input	168	// Input
169	void* pArgDec; // structured arguments for decoder, reserved here for extension in the future	169	void* pArgDec; // structured arguments for decoder, reserved here for extension in the future
170		170
171	SDataBuffer sRawData;	171	SDataBuffer sRawData;
172		172
173	// Configuration	173	// Configuration
174	SDecodingParam* pParam;	174	SDecodingParam* pParam;
175	uint32_t uiCpuFlag; // CPU compatibility detected	175	uint32_t uiCpuFlag; // CPU compatibility detected
176		176
177	int32_t iOutputColorFormat; // color space format to be outputed	177	EVideoFormatType eOutputColorFormat; // color space format to be outputed
178	VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.	178	VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
179	bool bHaveGotMemory; // global memory for decoder context related ever requested?	179	bool bHaveGotMemory; // global memory for decoder context related ever requested?
180		180

   pCtx->pArgDec                   = NULL;
-  pCtx->iOutputColorFormat		= videoFormatI420;	// yuv in default
+  pCtx->eOutputColorFormat		= videoFormatI420;	// yuv in default
   pCtx->bHaveGotMemory			= false;	// not ever request memory blocks for decoder context related
   pCtx->uiCpuFlag					= 0;
     return 1;
   memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
-  pCtx->iOutputColorFormat	= pCtx->pParam->iOutputColorFormat;
+  pCtx->eOutputColorFormat	= pCtx->pParam->eOutputColorFormat;
   pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;
   if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType ||
 int32_t DecoderSetCsp (PWelsDecoderContext pCtx, const int32_t kiColorFormat) {
   WELS_VERIFY_RETURN_IF (1, (NULL == pCtx));
-  pCtx->iOutputColorFormat	= kiColorFormat;
+  pCtx->eOutputColorFormat	= (EVideoFormatType) kiColorFormat;
   if (pCtx->pParam != NULL) {
-    pCtx->pParam->iOutputColorFormat	= kiColorFormat;
+    pCtx->pParam->eOutputColorFormat	= (EVideoFormatType) kiColorFormat;
+  }
+  //For now, support only videoFormatI420!
+  if (kiColorFormat != (int32_t) videoFormatI420) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "Support I420 output only for now! Change to I420...\n");
+    pCtx->pParam->eOutputColorFormat = pCtx->eOutputColorFormat = videoFormatI420;
   }
   return 0;

@@ -304,7 +304,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) { · 303 unmodified lines
304	return cmInitParaError;	304	return cmInitParaError;
305		305
306	if (DECODER_OPTION_DATAFORMAT == eOptID) {	306	if (DECODER_OPTION_DATAFORMAT == eOptID) {
307	iVal = m_pDecContext->iOutputColorFormat;	307	iVal = (int32_t) m_pDecContext->eOutputColorFormat;
308	* ((int*)pOption) = iVal;	308	* ((int*)pOption) = iVal;
309	return cmResultSuccess;	309	return cmResultSuccess;
310	} else if (DECODER_OPTION_END_OF_STREAM == eOptID) {	310	} else if (DECODER_OPTION_END_OF_STREAM == eOptID) {

Keyboard shortcuts