virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avfilter/vf_tile: remove limit of max tile size

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-10-10 21:18:03 +02:00
parent 6a50a8f340
commit 1f24b33d9a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_tile.c
View File

@ -23,6 +23,7 @@
* tile video filter
*/
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
@ -44,8 +45,6 @@ typedef struct TileContext {
uint8_t rgba_color[4];
} TileContext;
#define REASONABLE_SIZE 1024
#define OFFSET(x) offsetof(TileContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
@ -68,12 +67,21 @@ static av_cold int init(AVFilterContext *ctx)
{
TileContext *tile = ctx->priv;
if (tile->w > REASONABLE_SIZE || tile->h > REASONABLE_SIZE) {
if (tile->w > UINT_MAX / tile->h) {
av_log(ctx, AV_LOG_ERROR, "Tile size %ux%u is insane.\n",
tile->w, tile->h);
return AVERROR(EINVAL);
}
if (tile->padding) {
if ((tile->w - 1 > (UINT32_MAX - 2 * tile->margin) / tile->padding) ||
(tile->h - 1 > (UINT32_MAX - 2 * tile->margin) / tile->padding)) {
av_log(ctx, AV_LOG_ERROR, "Combination of Tile size %ux%u, padding %d and margin %d overflows.\n",
tile->w, tile->h, tile->padding, tile->margin);
return AVERROR(EINVAL);
}
}
if (tile->nb_frames == 0) {
tile->nb_frames = tile->w * tile->h;
} else if (tile->nb_frames > tile->w * tile->h) {
@ -142,6 +150,7 @@ static void draw_blank_frame(AVFilterContext *ctx, AVFrame *out_buf)
x0, y0, inlink->w, inlink->h);
tile->current++;
}
static int end_last_frame(AVFilterContext *ctx)
{
TileContext *tile = ctx->priv;