#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "libavutil/motion_vector.h"
-#include "libavutil/timer.h"
#include "avcodec.h"
#include "blockdsp.h"
#include "h264chroma.h"
ff_init_scantable(s->idsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
}
-static int alloc_picture(MpegEncContext *s, Picture *pic, int shared)
+static int alloc_picture(MpegEncContext *s, Picture *pic)
{
- return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, shared, 0,
+ return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, 0,
s->chroma_x_shift, s->chroma_y_shift, s->out_format,
s->mb_stride, s->mb_width, s->mb_height, s->b8_stride,
&s->linesize, &s->uvlinesize);
return 0;
fail:
- return -1; // free() through ff_mpv_common_end()
+ return AVERROR(ENOMEM); // free() through ff_mpv_common_end()
}
static void free_duplicate_context(MpegEncContext *s)
MpegEncContext bak;
int i, ret;
// FIXME copy only needed parts
- // START_TIMER
backup_duplicate_context(&bak, dst);
memcpy(dst, src, sizeof(MpegEncContext));
backup_duplicate_context(dst, &bak);
"scratch buffers.\n");
return ret;
}
- // STOP_TIMER("update_duplicate_context")
- // about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads
return 0;
}
if (s->avctx->pix_fmt == AV_PIX_FMT_NONE) {
av_log(s->avctx, AV_LOG_ERROR,
"decoding to AV_PIX_FMT_NONE is not supported.\n");
- return -1;
+ return AVERROR(EINVAL);
}
if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) {
if ((s->width || s->height) &&
av_image_check_size(s->width, s->height, 0, s->avctx))
- return -1;
+ return AVERROR(EINVAL);
dct_init(s);
return ret;
FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
- MAX_PICTURE_COUNT * sizeof(Picture), fail);
+ MAX_PICTURE_COUNT * sizeof(Picture), fail_nomem);
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
s->picture[i].f = av_frame_alloc();
if (!s->picture[i].f)
- goto fail;
+ goto fail_nomem;
}
s->next_picture.f = av_frame_alloc();
if (!s->next_picture.f)
- goto fail;
+ goto fail_nomem;
s->last_picture.f = av_frame_alloc();
if (!s->last_picture.f)
- goto fail;
+ goto fail_nomem;
s->current_picture.f = av_frame_alloc();
if (!s->current_picture.f)
- goto fail;
+ goto fail_nomem;
s->new_picture.f = av_frame_alloc();
if (!s->new_picture.f)
- goto fail;
+ goto fail_nomem;
- if (init_context_frame(s))
- goto fail;
+ if ((ret = init_context_frame(s)))
+ goto fail_nomem;
s->parse_context.state = -1;
if (i) {
s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
if (!s->thread_context[i])
- goto fail;
+ goto fail_nomem;
}
- if (init_duplicate_context(s->thread_context[i]) < 0)
+ if ((ret = init_duplicate_context(s->thread_context[i])) < 0)
goto fail;
s->thread_context[i]->start_mb_y =
(s->mb_height * (i) + nb_slices / 2) / nb_slices;
(s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
}
} else {
- if (init_duplicate_context(s) < 0)
+ if ((ret = init_duplicate_context(s)) < 0)
goto fail;
s->start_mb_y = 0;
s->end_mb_y = s->mb_height;
// }
return 0;
+ fail_nomem:
+ ret = AVERROR(ENOMEM);
fail:
ff_mpv_common_end(s);
- return -1;
+ return ret;
}
/**
pic->f->coded_picture_number = s->coded_picture_number++;
- if (alloc_picture(s, pic, 0) < 0)
+ if (alloc_picture(s, pic) < 0)
return -1;
s->current_picture_ptr = pic;
s->last_picture_ptr->f->key_frame = 0;
s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
- if (alloc_picture(s, s->last_picture_ptr, 0) < 0) {
+ if (alloc_picture(s, s->last_picture_ptr) < 0) {
s->last_picture_ptr = NULL;
return -1;
}
s->next_picture_ptr->f->key_frame = 0;
s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
- if (alloc_picture(s, s->next_picture_ptr, 0) < 0) {
+ if (alloc_picture(s, s->next_picture_ptr) < 0) {
s->next_picture_ptr = NULL;
return -1;
}