RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

Force alignment of pic->linesize

Browse Source 
Commited in SoC by Vitor Sessak on 2008-02-15 21:05:06

Originally committed as revision 12075 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-02-15 22:00:13 +00:00
parent 4cf48782f8
commit 790a03d701
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/defaults.c
View File

@ -20,14 +20,19 @@
*/ */
#include "avfilter.h" #include "avfilter.h"
#include "imgconvert.h"
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */ /* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
void avfilter_default_free_video_buffer(AVFilterPic *pic) void avfilter_default_free_video_buffer(AVFilterPic *pic)
{ {
avpicture_free((AVPicture *) pic); av_free(pic->data[0]);
av_free(pic); av_free(pic);
} }
#define ALIGN(a) do{ \
(a) = ((a) + 15) & (~15); \
} while(0);
/* TODO: set the buffer's priv member to a context structure for the whole /* TODO: set the buffer's priv member to a context structure for the whole
* filter chain. This will allow for a buffer pool instead of the constant * filter chain. This will allow for a buffer pool instead of the constant
* alloc & free cycle currently implemented. */ * alloc & free cycle currently implemented. */
@ -35,6 +40,8 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms)
{ {
AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic)); AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic));
AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef)); AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef));
int i, tempsize;
char *buf;
ref->pic = pic; ref->pic = pic;
ref->w = link->w; ref->w = link->w;
@ -46,9 +53,14 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms)
pic->refcount = 1; pic->refcount = 1;
pic->format = link->format; pic->format = link->format;
pic->free = avfilter_default_free_video_buffer; pic->free = avfilter_default_free_video_buffer;
avpicture_alloc((AVPicture *)pic, pic->format, ff_fill_linesize((AVPicture *)pic, pic->format, ref->w);
(ref->w + 15) & (~15), // make linesize a multiple of 16
(ref->h + 15) & (~15)); for (i=0; i<4;i++)
ALIGN(pic->linesize[i]);
tempsize = ff_fill_pointer((AVPicture *)pic, NULL, pic->format, ref->h);
buf = av_malloc(tempsize);
ff_fill_pointer((AVPicture *)pic, buf, pic->format, ref->h);
memcpy(ref->data, pic->data, sizeof(pic->data)); memcpy(ref->data, pic->data, sizeof(pic->data));
memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize)); memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize));