mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a workaround for FFmpeg's color conversion accessing past the end of the buffer

Browse Source 
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
This commit is contained in:
Roman Donchenko 2016-03-16 19:36:53 +03:00
parent 421fcf9e35
commit eb40afa26a
1 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -1229,7 +1229,7 @@ struct CvVideoWriter_FFMPEG
uint8_t * picbuf; uint8_t * picbuf;
AVStream * video_st; AVStream * video_st;
int input_pix_fmt; int input_pix_fmt;
Image_FFMPEG temp_image; unsigned char * aligned_input;
int frame_width, frame_height; int frame_width, frame_height;
int frame_idx; int frame_idx;
bool ok; bool ok;
@ -1306,7 +1306,7 @@ void CvVideoWriter_FFMPEG::init()
picbuf = 0; picbuf = 0;
video_st = 0; video_st = 0;
input_pix_fmt = 0; input_pix_fmt = 0;
memset(&temp_image, 0, sizeof(temp_image)); aligned_input = NULL;
img_convert_ctx = 0; img_convert_ctx = 0;
frame_width = frame_height = 0; frame_width = frame_height = 0;
frame_idx = 0; frame_idx = 0;
@ -1579,51 +1579,37 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
AVCodecContext *c = &(video_st->codec); AVCodecContext *c = &(video_st->codec);
#endif #endif
#if LIBAVFORMAT_BUILD < 5231 // FFmpeg contains SIMD optimizations which can sometimes read data past
// It is not needed in the latest versions of the ffmpeg // the supplied input buffer. To ensure that doesn't happen, we pad the
if( c->codec_id == CV_CODEC(CODEC_ID_RAWVIDEO) && origin != 1 ) // step to a multiple of 32 (that's the minimal alignment for which Valgrind
// doesn't raise any warnings).
const int STEP_ALIGNMENT = 32;
if( step % STEP_ALIGNMENT != 0 )
{ {
if( !temp_image.data ) int aligned_step = (step + STEP_ALIGNMENT - 1) & -STEP_ALIGNMENT;
if( !aligned_input )
{ {
temp_image.step = (width*cn + 3) & -4; aligned_input = (unsigned char*)av_mallocz(aligned_step * height);
temp_image.width = width;
temp_image.height = height;
temp_image.cn = cn;
temp_image.data = (unsigned char*)malloc(temp_image.step*temp_image.height);
}
for( int y = 0; y < height; y++ )
memcpy(temp_image.data + y*temp_image.step, data + (height-1-y)*step, width*cn);
data = temp_image.data;
step = temp_image.step;
}
#else
if( width*cn != step )
{
if( !temp_image.data )
{
temp_image.step = width*cn;
temp_image.width = width;
temp_image.height = height;
temp_image.cn = cn;
temp_image.data = (unsigned char*)malloc(temp_image.step*temp_image.height);
} }
if (origin == 1) if (origin == 1)
for( int y = 0; y < height; y++ ) for( int y = 0; y < height; y++ )
memcpy(temp_image.data + y*temp_image.step, data + (height-1-y)*step, temp_image.step); memcpy(aligned_input + y*aligned_step, data + (height-1-y)*step, step);
else else
for( int y = 0; y < height; y++ ) for( int y = 0; y < height; y++ )
memcpy(temp_image.data + y*temp_image.step, data + y*step, temp_image.step); memcpy(aligned_input + y*aligned_step, data + y*step, step);
data = temp_image.data;
step = temp_image.step;
}
#endif
data = aligned_input;
step = aligned_step;
}
if ( c->pix_fmt != input_pix_fmt ) { if ( c->pix_fmt != input_pix_fmt ) {
assert( input_picture ); assert( input_picture );
// let input_picture point to the raw data buffer of 'image' // let input_picture point to the raw data buffer of 'image'
avpicture_fill((AVPicture *)input_picture, (uint8_t *) data, avpicture_fill((AVPicture *)input_picture, (uint8_t *) data,
(AVPixelFormat)input_pix_fmt, width, height); (AVPixelFormat)input_pix_fmt, width, height);
input_picture->linesize[0] = step;
if( !img_convert_ctx ) if( !img_convert_ctx )
{ {
@ -1648,6 +1634,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
else{ else{
avpicture_fill((AVPicture *)picture, (uint8_t *) data, avpicture_fill((AVPicture *)picture, (uint8_t *) data,
(AVPixelFormat)input_pix_fmt, width, height); (AVPixelFormat)input_pix_fmt, width, height);
picture->linesize[0] = step;
} }
picture->pts = frame_idx; picture->pts = frame_idx;
@ -1734,11 +1721,7 @@ void CvVideoWriter_FFMPEG::close()
/* free the stream */ /* free the stream */
avformat_free_context(oc); avformat_free_context(oc);
if( temp_image.data ) av_freep(&aligned_input);
{
free(temp_image.data);
temp_image.data = 0;
}
init(); init();
} }