History

Use char instead of str_t

Martin Storsjö committed 12 years ago

Commit f2bd22a1 parent 7b96c6734 files · +131 −135Browse files

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

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+5−5
@@ -74,12 +74,12 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 73 unmodified lines
7474 #endif//REC_FRAME_COUNT
7575
7676 #ifdef OUTPUT_BIT_STREAM
77− str_t strStreamFileName[1024] = { 0 }; //for .264
77+ char strStreamFileName[1024] = { 0 }; //for .264
7878 int32_t iBufferUsed = 0;
7979 int32_t iBufferLeft = 1023;
8080 int32_t iCurUsed;
8181
82− str_t strLenFileName[1024] = { 0 }; //for .len
82+ char strLenFileName[1024] = { 0 }; //for .len
8383 int32_t iBufferUsedSize = 0;
8484 int32_t iBufferLeftSize = 1023;
8585 int32_t iCurUsedSize;
@@ -578,7 +578,7 @@ int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int · 492 unmodified lines
578578 WelsFclose (m_pFileBsSize);
579579 m_pFileBsSize = NULL;
580580 }
581− str_t strStreamFileName[128] = {0};
581+ char strStreamFileName[128] = {0};
582582 int32_t iLen = WelsSnprintf (strStreamFileName, 128, "adj%d_w%d.264", m_iSwitchTimes,
583583 m_pEncContext->pSvcParam->iActualPicWidth);
584584 m_pFileBs = WelsFopen (strStreamFileName, "wb");
@@ -910,7 +910,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 325 unmodified lines
910910 break;
911911 case ENCODER_OPTION_CURRENT_PATH: {
912912 if (m_pEncContext->pSvcParam != NULL) {
913− str_t* path = static_cast<str_t*> (pOption);
913+ char* path = static_cast<char*> (pOption);
914914 m_pEncContext->pSvcParam->pCurPath = path;
915915 }
916916 }
@@ -991,7 +991,7 @@ int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) { · 74 unmodified lines
991991 void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) {
992992 #ifdef DUMP_SRC_PICTURE
993993 FILE* pFile = NULL;
994− str_t strFileName[256] = {0};
994+ char strFileName[256] = {0};
995995 const int32_t iDataLength = m_iMaxPicWidth * m_iMaxPicHeight;
996996
997997 WelsStrncpy (strFileName, 256, "pic_in_"); // confirmed_safe_unsafe_usage

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t