highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegvideo: allocate edges when encoding.

Browse Source 
Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.
This commit is contained in:
Anton Khirnov
2014-01-01 20:04:53 +01:00
parent f7e85ee996
commit 024db24912
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mpegvideo.c
View File

@@ -422,15 +422,21 @@ fail:
*/ */
static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
{ {
int edges_needed = av_codec_is_encoder(s->avctx->codec);
int r, ret; int r, ret;
pic->tf.f = &pic->f; pic->tf.f = &pic->f;
if (s->codec_id != AV_CODEC_ID_WMV3IMAGE && if (s->codec_id != AV_CODEC_ID_WMV3IMAGE &&
s->codec_id != AV_CODEC_ID_VC1IMAGE && s->codec_id != AV_CODEC_ID_VC1IMAGE &&
s->codec_id != AV_CODEC_ID_MSS2) s->codec_id != AV_CODEC_ID_MSS2) {
if (edges_needed) {
pic->f.width = s->avctx->width + 2 * EDGE_WIDTH;
pic->f.height = s->avctx->height + 2 * EDGE_WIDTH;
}
r = ff_thread_get_buffer(s->avctx, &pic->tf, r = ff_thread_get_buffer(s->avctx, &pic->tf,
pic->reference ? AV_GET_BUFFER_FLAG_REF : 0); pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
else { } else {
pic->f.width = s->avctx->width; pic->f.width = s->avctx->width;
pic->f.height = s->avctx->height; pic->f.height = s->avctx->height;
pic->f.format = s->avctx->pix_fmt; pic->f.format = s->avctx->pix_fmt;
@@ -443,6 +449,18 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
return -1; return -1;
} }
if (edges_needed) {
int i;
for (i = 0; pic->f.data[i]; i++) {
int offset = (EDGE_WIDTH >> (i ? s->chroma_y_shift : 0)) *
pic->f.linesize[i] +
(EDGE_WIDTH >> (i ? s->chroma_x_shift : 0));
pic->f.data[i] += offset;
}
pic->f.width = s->avctx->width;
pic->f.height = s->avctx->height;
}
if (s->avctx->hwaccel) { if (s->avctx->hwaccel) {
assert(!pic->hwaccel_picture_private); assert(!pic->hwaccel_picture_private);
if (s->avctx->hwaccel->priv_data_size) { if (s->avctx->hwaccel->priv_data_size) {