virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

utils: Use data buffers directly instead of an AVPicture

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara
2015-10-14 11:33:27 +02:00
parent ff7956fcbf
commit 3ee2c60cc2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/utils.c
View File

@@ -337,7 +337,8 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_VIDEO: { case AVMEDIA_TYPE_VIDEO: {
AVPicture picture; uint8_t *data[4];
int linesize[4];
int size[4] = { 0 }; int size[4] = { 0 };
int w = frame->width; int w = frame->width;
int h = frame->height; int h = frame->height;
@@ -352,27 +353,27 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
do { do {
// NOTE: do not align linesizes individually, this breaks e.g. assumptions // NOTE: do not align linesizes individually, this breaks e.g. assumptions
// that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2 // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
av_image_fill_linesizes(picture.linesize, avctx->pix_fmt, w); av_image_fill_linesizes(linesize, avctx->pix_fmt, w);
// increase alignment of w for next try (rhs gives the lowest bit set in w) // increase alignment of w for next try (rhs gives the lowest bit set in w)
w += w & ~(w - 1); w += w & ~(w - 1);
unaligned = 0; unaligned = 0;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
unaligned |= picture.linesize[i] % pool->stride_align[i]; unaligned |= linesize[i] % pool->stride_align[i];
} while (unaligned); } while (unaligned);
tmpsize = av_image_fill_pointers(picture.data, avctx->pix_fmt, h, tmpsize = av_image_fill_pointers(data, avctx->pix_fmt, h,
NULL, picture.linesize); NULL, linesize);
if (tmpsize < 0) if (tmpsize < 0)
return -1; return -1;
for (i = 0; i < 3 && picture.data[i + 1]; i++) for (i = 0; i < 3 && data[i + 1]; i++)
size[i] = picture.data[i + 1] - picture.data[i]; size[i] = data[i + 1] - data[i];
size[i] = tmpsize - (picture.data[i] - picture.data[0]); size[i] = tmpsize - (data[i] - data[0]);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
av_buffer_pool_uninit(&pool->pools[i]); av_buffer_pool_uninit(&pool->pools[i]);
pool->linesize[i] = picture.linesize[i]; pool->linesize[i] = linesize[i];
if (size[i]) { if (size[i]) {
pool->pools[i] = av_buffer_pool_init(size[i] + 16, NULL); pool->pools[i] = av_buffer_pool_init(size[i] + 16, NULL);
if (!pool->pools[i]) { if (!pool->pools[i]) {