Store a const char* instead of a std::string in gtest parameter arrays

This avoids valgrind warnings about using unintialized data.
This commit is contained in:
Martin Storsjö 2015-02-19 01:08:44 +02:00
parent e29ceca392
commit 7208ed14b1

View File

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