frames: rename local variables to log messages

Clement Champetier · Clement Champetier · commit 11789bbc7d9e · 2016-11-03T12:13:53.000+01:00
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -113,14 +113,14 @@ void AudioFrame::allocateData()
     if(ret < 0)
     {
         const std::string formatName = getSampleFormatName(_desc._sampleFormat);
-        std::stringstream stream;
-        stream << "Unable to allocate an audio frame of ";
-        stream << "sample rate = " << _frame->sample_rate << ", ";
-        stream << "nb channels = " << _frame->channels << ", ";
-        stream << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";
-        stream << "nb samples = " << _frame->nb_samples << ", ";
-        stream << "sample format = " << (formatName.empty() ? "none" : formatName);
-        LOG_ERROR(stream.str())
+        std::stringstream msg;
+        msg << "Unable to allocate an audio frame of ";
+        msg << "sample rate = " << _frame->sample_rate << ", ";
+        msg << "nb channels = " << _frame->channels << ", ";
+        msg << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";
+        msg << "nb samples = " << _frame->nb_samples << ", ";
+        msg << "sample format = " << (formatName.empty() ? "none" : formatName);
+        LOG_ERROR(msg.str())
         throw std::bad_alloc();
     }
     _dataAllocated = true;
@@ -139,9 +139,9 @@ void AudioFrame::assignBuffer(const unsigned char* ptrValue)
                                            getNbSamplesPerChannel(), getSampleFormat(), align);
     if(ret < 0)
     {
-        std::stringstream os;
-        os << "Unable to assign an audio buffer: " << getDescriptionFromErrorCode(ret);
-        throw std::runtime_error(os.str());
+        std::stringstream msg;
+        msg << "Unable to assign an audio buffer: " << getDescriptionFromErrorCode(ret);
+        throw std::runtime_error(msg.str());
     }
 }
 
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -93,12 +93,12 @@ void VideoFrame::allocateData()
     if(ret < 0)
     {
         const std::string formatName = getPixelFormatName(_desc._pixelFormat);
-        std::stringstream stream;
-        stream << "Unable to allocate an image frame of ";
-        stream << "width = " << _frame->width << ", ";
-        stream << "height = " << _frame->height << ", ";
-        stream << "pixel format = " << (formatName.empty() ? "none" : formatName);
-        LOG_ERROR(stream.str())
+        std::stringstream msg;
+        msg << "Unable to allocate an image frame of ";
+        msg << "width = " << _frame->width << ", ";
+        msg << "height = " << _frame->height << ", ";
+        msg << "pixel format = " << (formatName.empty() ? "none" : formatName);
+        LOG_ERROR(msg.str())
         throw std::bad_alloc();
     }
     _dataAllocated = true;
@@ -116,9 +116,9 @@ void VideoFrame::assignBuffer(const unsigned char* ptrValue)
         avpicture_fill(reinterpret_cast<AVPicture*>(_frame), ptrValue, getPixelFormat(), getWidth(), getHeight());
     if(ret < 0)
     {
-        std::stringstream os;
-        os << "Unable to assign an image buffer of " << getSize() << " bytes: " << getDescriptionFromErrorCode(ret);
-        throw std::runtime_error(os.str());
+        std::stringstream msg;
+        msg << "Unable to assign an image buffer of " << getSize() << " bytes: " << getDescriptionFromErrorCode(ret);
+        throw std::runtime_error(msg.str());
     }
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,12 +93,12 @@ void VideoFrame::allocateData()`
`93`	`93`	`if(ret < 0)`
`94`	`94`	`{`
`95`	`95`	`const std::string formatName = getPixelFormatName(_desc._pixelFormat);`
`96`		`- std::stringstream stream;`
`97`		`- stream << "Unable to allocate an image frame of ";`
`98`		`- stream << "width = " << _frame->width << ", ";`
`99`		`- stream << "height = " << _frame->height << ", ";`
`100`		`- stream << "pixel format = " << (formatName.empty() ? "none" : formatName);`
`101`		`- LOG_ERROR(stream.str())`
	`96`	`+ std::stringstream msg;`
	`97`	`+ msg << "Unable to allocate an image frame of ";`
	`98`	`+ msg << "width = " << _frame->width << ", ";`
	`99`	`+ msg << "height = " << _frame->height << ", ";`
	`100`	`+ msg << "pixel format = " << (formatName.empty() ? "none" : formatName);`
	`101`	`+ LOG_ERROR(msg.str())`
`102`	`102`	`throw std::bad_alloc();`
`103`	`103`	`}`
`104`	`104`	`_dataAllocated = true;`
`@@ -116,9 +116,9 @@ void VideoFrame::assignBuffer(const unsigned char* ptrValue)`
`116`	`116`	`avpicture_fill(reinterpret_cast<AVPicture*>(_frame), ptrValue, getPixelFormat(), getWidth(), getHeight());`
`117`	`117`	`if(ret < 0)`
`118`	`118`	`{`
`119`		`- std::stringstream os;`
`120`		`- os << "Unable to assign an image buffer of " << getSize() << " bytes: " << getDescriptionFromErrorCode(ret);`
`121`		`- throw std::runtime_error(os.str());`
	`119`	`+ std::stringstream msg;`
	`120`	`+ msg << "Unable to assign an image buffer of " << getSize() << " bytes: " << getDescriptionFromErrorCode(ret);`
	`121`	`+ throw std::runtime_error(msg.str());`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`