opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-23 08:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate avcodec_check_dimensions() in favor of the new function

Browse Source 
av_check_image_size() declared in libavcore/imgutils.h.

Originally committed as revision 24709 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-08-06 09:36:45 +00:00
parent 85fbad4555
commit bf176f58b7
5 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcore/avcore.h
View File

@ -27,7 +27,7 @@
#include <libavutil/avutil.h>
#define LIBAVCORE_VERSION_MAJOR 0
#define LIBAVCORE_VERSION_MINOR 2
#define LIBAVCORE_VERSION_MINOR 3
#define LIBAVCORE_VERSION_MICRO 0
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \

19
libavcore/imgutils.c
View File

@ -95,3 +95,22 @@ int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh
return total_size;
}
typedef struct ImgUtils {
const AVClass *class;
int log_offset;
void *log_ctx;
} ImgUtils;
static const AVClass imgutils_class = { "IMGUTILS", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(ImgUtils, log_offset), offsetof(ImgUtils, log_ctx) };
int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx)
{
ImgUtils imgutils = { &imgutils_class, log_offset, log_ctx };
if((int)w>0 && (int)h>0 && (w+128)*(uint64_t)(h+128) < INT_MAX/8)
return 0;
av_log(&imgutils, AV_LOG_ERROR, "picture size invalid (%ux%u)\n", w, h);
return AVERROR(EINVAL);
}

12
libavcore/imgutils.h
View File

@ -50,4 +50,16 @@ int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt
int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height,
uint8_t *ptr, const int linesizes[4]);
/**
* Check if the given dimension of an image is valid, meaning that all
* bytes of the image can be addressed with a signed int.
*
* @param w the width of the picture
* @param h the height of the picture
* @param log_offset the offset to sum to the log level for logging with log_ctx
* @param log_ctx the parent logging context, it may be NULL
* @return >= 0 if valid, a negative error code otherwise
*/
int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx);
#endif /* AVCORE_IMGUTILS_H */