generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1815 from mstorsjo/test-param-strings

Browse Source 
Store a const char* instead of a std::string in gtest parameter arrays
This commit is contained in:
Ethan Hugg 2015-02-23 13:52:19 -08:00
commit 497b38e341
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/api/encode_decode_api_test.cpp
View File

@ -3401,7 +3401,7 @@ struct EncodeOptionParam {
int uiMaxNalLen; int uiMaxNalLen;
float fFramerate; float fFramerate;
int iThreads; int iThreads;
std::string sFileSave; const char* sFileSave;
}; };
static const EncodeOptionParam kOptionParamArray[] = { static const EncodeOptionParam kOptionParamArray[] = {
@ -3466,8 +3466,8 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) {
srand(1002); srand(1002);
EncodeOptionParam p = GetParam(); EncodeOptionParam p = GetParam();
FILE * pFile = NULL; FILE * pFile = NULL;
if(!p.sFileSave.empty()) { if (p.sFileSave != NULL && strlen(p.sFileSave) > 0) {
pFile = fopen(p.sFileSave.c_str(), "wb"); pFile = fopen(p.sFileSave, "wb");
} }
memset (&param_, 0, sizeof (SEncParamExt)); memset (&param_, 0, sizeof (SEncParamExt));
encoder_->GetDefaultParams (&param_); encoder_->GetDefaultParams (&param_);