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

codec/decoder/core/inc/decoder_context.h +3 −3
codec/decoder/core/src/decoder.cpp +10 −4
codec/decoder/plus/src/welsDecoderExt.cpp +1 −1

codec/decoder/core/inc/decoder_context.h+3−3

@@ -168,13 +168,13 @@ SLogContext sLogCtx; · 167 unmodified lines
168	168	// Input
169	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	173	// Configuration
174		−SDecodingParam* pParam;
	174	+SDecodingParam* pParam;
175	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	178	VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
179	179	bool bHaveGotMemory; // global memory for decoder context related ever requested?
180	180

codec/decoder/core/src/decoder.cpp+10−4

@@ -134,7 +134,7 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 133 unmodified lines
134	134
135	135	pCtx->pArgDec = NULL;
136	136
137		− pCtx->iOutputColorFormat = videoFormatI420; // yuv in default
	137	+ pCtx->eOutputColorFormat = videoFormatI420; // yuv in default
138	138	pCtx->bHaveGotMemory = false; // not ever request memory blocks for decoder context related
139	139	pCtx->uiCpuFlag = 0;
140	140
@@ -331,7 +331,7 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 190 unmodified lines
331	331	return 1;
332	332
333	333	memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
334		− pCtx->iOutputColorFormat = pCtx->pParam->iOutputColorFormat;
	334	+ pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;
335	335	pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;
336	336
337	337	if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType \|\|
@@ -589,9 +589,15 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 251 unmodified lines
589	589	int32_t DecoderSetCsp (PWelsDecoderContext pCtx, const int32_t kiColorFormat) {
590	590	WELS_VERIFY_RETURN_IF (1, (NULL == pCtx));
591	591
592		− pCtx->iOutputColorFormat = kiColorFormat;
	592	+ pCtx->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
593	593	if (pCtx->pParam != NULL) {
594		− pCtx->pParam->iOutputColorFormat = kiColorFormat;
	594	+ pCtx->pParam->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
	595	+ }
	596	+
	597	+ //For now, support only videoFormatI420!
	598	+ if (kiColorFormat != (int32_t) videoFormatI420) {
	599	+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "Support I420 output only for now! Change to I420...\n");
	600	+ pCtx->pParam->eOutputColorFormat = pCtx->eOutputColorFormat = videoFormatI420;
595	601	}
596	602
597	603	return 0;

codec/decoder/plus/src/welsDecoderExt.cpp+1−1

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

setget_dataformat_ut

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code