@@ -26,9 +26,6 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
-#include "encode.h"
-#include "internal.h"
-#include "decode.h"
#include "motion_est.h"
#include "mpegpicture.h"
#include "mpegutils.h"
@@ -124,57 +121,13 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me,
}
/**
- * Allocate a frame buffer
+ * Check the pic's linesize and allocate linesize dependent scratch buffers
*/
-static int alloc_frame_buffer(AVCodecContext *avctx, Picture *pic,
- MotionEstContext *me, ScratchpadContext *sc,
- int chroma_x_shift, int chroma_y_shift,
- int linesize, int uvlinesize)
+static int handle_pic_linesizes(AVCodecContext *avctx, Picture *pic,
+ MotionEstContext *me, ScratchpadContext *sc,
+ int linesize, int uvlinesize)
{
- int edges_needed = av_codec_is_encoder(avctx->codec);
- int r, ret;
-
- pic->tf.f = pic->f;
-
- if (edges_needed) {
- pic->f->width = avctx->width + 2 * EDGE_WIDTH;
- pic->f->height = avctx->height + 2 * EDGE_WIDTH;
-
- r = ff_encode_alloc_frame(avctx, pic->f);
- } else if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE &&
- avctx->codec_id != AV_CODEC_ID_VC1IMAGE &&
- avctx->codec_id != AV_CODEC_ID_MSS2) {
- r = ff_thread_get_ext_buffer(avctx, &pic->tf,
- pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
- } else {
- pic->f->width = avctx->width;
- pic->f->height = avctx->height;
- pic->f->format = avctx->pix_fmt;
- r = avcodec_default_get_buffer2(avctx, pic->f, 0);
- }
-
- if (r < 0 || !pic->f->buf[0]) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed (%d %p)\n",
- r, pic->f->data[0]);
- return -1;
- }
-
- if (edges_needed) {
- int i;
- for (i = 0; pic->f->data[i]; i++) {
- int offset = (EDGE_WIDTH >> (i ? chroma_y_shift : 0)) *
- pic->f->linesize[i] +
- (EDGE_WIDTH >> (i ? chroma_x_shift : 0));
- pic->f->data[i] += offset;
- }
- pic->f->width = avctx->width;
- pic->f->height = avctx->height;
- }
-
- ret = ff_hwaccel_frame_priv_alloc(avctx, &pic->hwaccel_picture_private,
- &pic->hwaccel_priv_buf);
- if (ret < 0)
- return ret;
+ int ret;
if ((linesize && linesize != pic->f->linesize[0]) ||
(uvlinesize && uvlinesize != pic->f->linesize[1])) {
@@ -247,8 +200,7 @@ static int alloc_picture_tables(AVCodecContext *avctx, Picture *pic, int encodin
* The pixels are allocated/set by calling get_buffer() if shared = 0
*/
int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me,
- ScratchpadContext *sc, int encoding,
- int chroma_x_shift, int chroma_y_shift, int out_format,
+ ScratchpadContext *sc, int encoding, int out_format,
int mb_stride, int mb_width, int mb_height, int b8_stride,
ptrdiff_t *linesize, ptrdiff_t *uvlinesize)
{
@@ -259,14 +211,12 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me,
|| pic->alloc_mb_height != mb_height)
free_picture_tables(pic);
- av_assert0(!pic->f->buf[0]);
- if (alloc_frame_buffer(avctx, pic, me, sc,
- chroma_x_shift, chroma_y_shift,
- *linesize, *uvlinesize) < 0)
- return -1;
+ if (handle_pic_linesizes(avctx, pic, me, sc,
+ *linesize, *uvlinesize) < 0)
+ return -1;
- *linesize = pic->f->linesize[0];
- *uvlinesize = pic->f->linesize[1];
+ *linesize = pic->f->linesize[0];
+ *uvlinesize = pic->f->linesize[1];
if (!pic->qscale_table_buf)
ret = alloc_picture_tables(avctx, pic, encoding, out_format,
@@ -82,12 +82,10 @@ typedef struct Picture {
} Picture;
/**
- * Allocate a Picture.
- * The pixels are allocated/set by calling get_buffer() if shared = 0.
+ * Allocate a Picture's accessories, but not the AVFrame's buffer itself.
*/
int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me,
- ScratchpadContext *sc, int encoding,
- int chroma_x_shift, int chroma_y_shift, int out_format,
+ ScratchpadContext *sc, int encoding, int out_format,
int mb_stride, int mb_width, int mb_height, int b8_stride,
ptrdiff_t *linesize, ptrdiff_t *uvlinesize);
@@ -31,6 +31,7 @@
#include "libavutil/video_enc_params.h"
#include "avcodec.h"
+#include "decode.h"
#include "h264chroma.h"
#include "internal.h"
#include "mpegutils.h"
@@ -236,10 +237,36 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
static int alloc_picture(MpegEncContext *s, Picture *pic)
{
- return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0,
- s->chroma_x_shift, s->chroma_y_shift, s->out_format,
+ AVCodecContext *avctx = s->avctx;
+ int ret;
+
+ pic->tf.f = pic->f;
+
+ if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE &&
+ avctx->codec_id != AV_CODEC_ID_VC1IMAGE &&
+ avctx->codec_id != AV_CODEC_ID_MSS2) {
+ ret = ff_thread_get_ext_buffer(avctx, &pic->tf,
+ pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
+ } else {
+ pic->f->width = avctx->width;
+ pic->f->height = avctx->height;
+ pic->f->format = avctx->pix_fmt;
+ ret = avcodec_default_get_buffer2(avctx, pic->f, 0);
+ }
+ if (ret < 0)
+ goto fail;
+
+ ret = ff_hwaccel_frame_priv_alloc(avctx, &pic->hwaccel_picture_private,
+ &pic->hwaccel_priv_buf);
+ if (ret < 0)
+ goto fail;
+
+ return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->out_format,
s->mb_stride, s->mb_width, s->mb_height, s->b8_stride,
&s->linesize, &s->uvlinesize);
+fail:
+ ff_mpeg_unref_picture(avctx, pic);
+ return ret;
}
static void color_frame(AVFrame *frame, int luma)
@@ -1092,8 +1092,26 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src,
static int alloc_picture(MpegEncContext *s, Picture *pic)
{
- return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 1,
- s->chroma_x_shift, s->chroma_y_shift, s->out_format,
+ AVCodecContext *avctx = s->avctx;
+ int ret;
+
+ pic->f->width = avctx->width + 2 * EDGE_WIDTH;
+ pic->f->height = avctx->height + 2 * EDGE_WIDTH;
+
+ ret = ff_encode_alloc_frame(avctx, pic->f);
+ if (ret < 0)
+ return ret;
+
+ for (int 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 = avctx->width;
+ pic->f->height = avctx->height;
+
+ return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 1, s->out_format,
s->mb_stride, s->mb_width, s->mb_height, s->b8_stride,
&s->linesize, &s->uvlinesize);
}
Since at least commit c954cf1e1b766a0d1992d5be0a8be0055a8e1a6a (adding ff_encode_alloc_frame()), a large part of ff_alloc_picture() is completely separate for the two callers. Move the caller-specific parts out to the callers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- I know that the name ff_alloc_picture() (like lots of names in mpegpicture) is no longer appropriate; I will fix this later in rewrite of mpegpicture (soon...). libavcodec/mpegpicture.c | 72 ++++++-------------------------------- libavcodec/mpegpicture.h | 6 ++-- libavcodec/mpegvideo_dec.c | 31 ++++++++++++++-- libavcodec/mpegvideo_enc.c | 22 ++++++++++-- 4 files changed, 62 insertions(+), 69 deletions(-)