decoded data: raise a bad_alloc when faling to allocate the requested space

Clement Champetier · Clement Champetier · commit 5c788e31788e · 2016-10-28T10:36:32.000+02:00
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -110,7 +110,8 @@ void AudioFrame::allocateData()
         os << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";
         os << "nb samples = " << _frame->nb_samples << ", ";
         os << "sample format = " << getSampleFormatName(_desc._sampleFormat);
-        throw std::runtime_error(os.str());
+        LOG_ERROR(os.str())
+        throw std::bad_alloc();
     }
     _dataAllocated = true;
 }
diff --git a/src/AvTranscoder/data/decoded/Frame.cpp b/src/AvTranscoder/data/decoded/Frame.cpp
@@ -40,7 +40,8 @@ void Frame::allocateAVFrame()
 #endif
     if(_frame == NULL)
     {
-        throw std::runtime_error("Unable to allocate an empty Frame.");
+        LOG_ERROR("Unable to allocate an empty Frame.")
+        throw std::bad_alloc();
     }
 }
 
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -93,7 +93,8 @@ void VideoFrame::allocateData()
         os << "width = " << _frame->width << ", ";
         os << "height = " << _frame->height << ", ";
         os << "pixel format = " << getPixelFormatName(_desc._pixelFormat);
-        throw std::runtime_error(os.str());
+        LOG_ERROR(os.str())
+        throw std::bad_alloc();
     }
     _dataAllocated = true;
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ void AudioFrame::allocateData()`
`110`	`110`	`os << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";`
`111`	`111`	`os << "nb samples = " << _frame->nb_samples << ", ";`
`112`	`112`	`os << "sample format = " << getSampleFormatName(_desc._sampleFormat);`
`113`		`- throw std::runtime_error(os.str());`
	`113`	`+ LOG_ERROR(os.str())`
	`114`	`+ throw std::bad_alloc();`
`114`	`115`	`}`
`115`	`116`	`_dataAllocated = true;`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ void Frame::allocateAVFrame()`
`40`	`40`	`#endif`
`41`	`41`	`if(_frame == NULL)`
`42`	`42`	`{`
`43`		`- throw std::runtime_error("Unable to allocate an empty Frame.");`
	`43`	`+ LOG_ERROR("Unable to allocate an empty Frame.")`
	`44`	`+ throw std::bad_alloc();`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ void VideoFrame::allocateData()`
`93`	`93`	`os << "width = " << _frame->width << ", ";`
`94`	`94`	`os << "height = " << _frame->height << ", ";`
`95`	`95`	`os << "pixel format = " << getPixelFormatName(_desc._pixelFormat);`
`96`		`- throw std::runtime_error(os.str());`
	`96`	`+ LOG_ERROR(os.str())`
	`97`	`+ throw std::bad_alloc();`
`97`	`98`	`}`
`98`	`99`	`_dataAllocated = true;`
`99`	`100`	`}`