Video/Audio frames: fix message logged when failing to allocate data

Clement Champetier · Clement Champetier · commit 50d46ad39d20 · 2016-10-31T11:36:38.000+01:00
* "os" is the name of the variable in LOG_* defines, so rename it to
"stream".
* Print "none" when the format is no found.
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -110,14 +110,15 @@ void AudioFrame::allocateData()
         av_samples_alloc(_frame->data, _frame->linesize, _frame->channels, _frame->nb_samples, _desc._sampleFormat, align);
     if(ret < 0)
     {
-        std::stringstream os;
-        os << "Unable to allocate an audio frame of ";
-        os << "sample rate = " << _frame->sample_rate << ", ";
-        os << "nb channels = " << _frame->channels << ", ";
-        os << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";
-        os << "nb samples = " << _frame->nb_samples << ", ";
-        os << "sample format = " << getSampleFormatName(_desc._sampleFormat);
-        LOG_ERROR(os.str())
+        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())
         throw std::bad_alloc();
     }
     _dataAllocated = true;
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -90,12 +90,13 @@ void VideoFrame::allocateData()
     const int ret = avpicture_alloc(reinterpret_cast<AVPicture*>(_frame), _desc._pixelFormat, _desc._width, _desc._height);
     if(ret < 0)
     {
-        std::stringstream os;
-        os << "Unable to allocate an image frame of ";
-        os << "width = " << _frame->width << ", ";
-        os << "height = " << _frame->height << ", ";
-        os << "pixel format = " << getPixelFormatName(_desc._pixelFormat);
-        LOG_ERROR(os.str())
+        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())
         throw std::bad_alloc();
     }
     _dataAllocated = true;
