Rename public interface methods to avoid two overloaded methods with the same name

This is required to make the order in the C++ virtual table consistent in MSVC - previously the overloaded methods were ordered differently in the vtable compared to the interface declaration.

Martin Storsjö committed 12 years ago

Commit dd0db821 parent efaa1538 files · +17 −17Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 8 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+4−4

@@ -353,10 +353,10 @@ int CWelsH264SVCEncoder::Initialize (SVCEncodingParam* argv, const INIT_TYPE iIn · 352 unmodified lines
353	353
354	354	m_iSrcListSize = 1;
355	355
356		− return Initialize ((void*)&sConfig, INIT_TYPE_CONFIG_BASED);
	356	+ return Initialize2 ((void*)&sConfig, INIT_TYPE_CONFIG_BASED);
357	357	}
358	358
359		−int CWelsH264SVCEncoder::Initialize (void* argv, const INIT_TYPE iInitType) {
	359	+int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) {
360	360	if (INIT_TYPE_CONFIG_BASED != iInitType \|\| NULL == argv) {
361	361	WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid iInitType= %d, argv= 0x%p.\n",
362	362	iInitType, (void*)argv);
@@ -602,7 +602,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* p · 239 unmodified lines
602	602	int32_t uiFrameType = videoFrameTypeInvalid;
603	603
604	604	if (RawData2SrcPic ((uint8_t*)pSrc) == 0) {
605		− uiFrameType = EncodeFrame (const_cast<const SSourcePicture**> (m_pSrcPicList), 1, pBsInfo);
	605	+ uiFrameType = EncodeFrame2 (const_cast<const SSourcePicture**> (m_pSrcPicList), 1, pBsInfo);
606	606	}
607	607
608	608	#ifdef REC_FRAME_COUNT
@@ -619,7 +619,7 @@ int CWelsH264SVCEncoder::EncodeFrame (const unsigned char* pSrc, SFrameBSInfo* p · 10 unmodified lines
619	619	}
620	620
621	621
622		−int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture** pSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) {
	622	+int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int nSrcPicNum, SFrameBSInfo* pBsInfo) {
623	623	if (! (pSrcPicList && m_pEncContext && m_bInitialFlag)) {
624	624	return videoFrameTypeInvalid;
625	625	}

Rename public interface methods to avoid two overloaded methods with the same name

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code