[FFmpeg-cvslog] mpegvideo: Move ER functions to a separate file
Vittorio Giovara
git at videolan.org
Fri Jun 12 20:53:55 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Jun 10 14:29:04 2015 +0100| [8b5007a31b8d1ddbe3661bf45a732336450b7d25] | committer: Vittorio Giovara
mpegvideo: Move ER functions to a separate file
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b5007a31b8d1ddbe3661bf45a732336450b7d25
---
libavcodec/mpeg_er.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/mpeg_er.h | 1 +
libavcodec/mpegvideo.c | 68 ++--------------------------------------------
3 files changed, 74 insertions(+), 66 deletions(-)
diff --git a/libavcodec/mpeg_er.c b/libavcodec/mpeg_er.c
index 7a1b6b2..9410b27 100644
--- a/libavcodec/mpeg_er.c
+++ b/libavcodec/mpeg_er.c
@@ -57,3 +57,74 @@ void ff_mpeg_er_frame_start(MpegEncContext *s)
ff_er_frame_start(er);
}
+
+static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
+ int (*mv)[2][4][2], int mb_x, int mb_y,
+ int mb_intra, int mb_skipped)
+{
+ MpegEncContext *s = opaque;
+
+ s->mv_dir = mv_dir;
+ s->mv_type = mv_type;
+ s->mb_intra = mb_intra;
+ s->mb_skipped = mb_skipped;
+ s->mb_x = mb_x;
+ s->mb_y = mb_y;
+ memcpy(s->mv, mv, sizeof(*mv));
+
+ ff_init_block_index(s);
+ ff_update_block_index(s);
+
+ s->bdsp.clear_blocks(s->block[0]);
+
+ s->dest[0] = s->current_picture.f->data[0] +
+ s->mb_y * 16 * s->linesize +
+ s->mb_x * 16;
+ s->dest[1] = s->current_picture.f->data[1] +
+ s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize +
+ s->mb_x * (16 >> s->chroma_x_shift);
+ s->dest[2] = s->current_picture.f->data[2] +
+ s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize +
+ s->mb_x * (16 >> s->chroma_x_shift);
+
+ if (ref)
+ av_log(s->avctx, AV_LOG_DEBUG,
+ "Interlaced error concealment is not fully implemented\n");
+ ff_mpv_decode_mb(s, s->block);
+}
+
+int ff_mpeg_er_init(MpegEncContext *s)
+{
+ ERContext *er = &s->er;
+ int mb_array_size = s->mb_height * s->mb_stride;
+ int i;
+
+ er->avctx = s->avctx;
+
+ er->mb_index2xy = s->mb_index2xy;
+ er->mb_num = s->mb_num;
+ er->mb_width = s->mb_width;
+ er->mb_height = s->mb_height;
+ er->mb_stride = s->mb_stride;
+ er->b8_stride = s->b8_stride;
+
+ er->er_temp_buffer = av_malloc(s->mb_height * s->mb_stride);
+ er->error_status_table = av_mallocz(mb_array_size);
+ if (!er->er_temp_buffer || !er->error_status_table)
+ goto fail;
+
+ er->mbskip_table = s->mbskip_table;
+ er->mbintra_table = s->mbintra_table;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
+ er->dc_val[i] = s->dc_val[i];
+
+ er->decode_mb = mpeg_er_decode_mb;
+ er->opaque = s;
+
+ return 0;
+fail:
+ av_freep(&er->er_temp_buffer);
+ av_freep(&er->error_status_table);
+ return AVERROR(ENOMEM);
+}
diff --git a/libavcodec/mpeg_er.h b/libavcodec/mpeg_er.h
index 1968184..ca1ea90 100644
--- a/libavcodec/mpeg_er.h
+++ b/libavcodec/mpeg_er.h
@@ -21,6 +21,7 @@
#include "mpegvideo.h"
+int ff_mpeg_er_init(MpegEncContext *s);
void ff_mpeg_er_frame_start(MpegEncContext *s);
#endif /* AVCODEC_MPEG_ER_H */
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 0a4f5bb..2e8fb89 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -37,6 +37,7 @@
#include "idctdsp.h"
#include "internal.h"
#include "mathops.h"
+#include "mpeg_er.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mpegvideodata.h"
@@ -266,35 +267,6 @@ static void dct_unquantize_h263_inter_c(MpegEncContext *s,
}
}
-static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
- int (*mv)[2][4][2],
- int mb_x, int mb_y, int mb_intra, int mb_skipped)
-{
- MpegEncContext *s = opaque;
-
- s->mv_dir = mv_dir;
- s->mv_type = mv_type;
- s->mb_intra = mb_intra;
- s->mb_skipped = mb_skipped;
- s->mb_x = mb_x;
- s->mb_y = mb_y;
- memcpy(s->mv, mv, sizeof(*mv));
-
- ff_init_block_index(s);
- ff_update_block_index(s);
-
- s->bdsp.clear_blocks(s->block[0]);
-
- s->dest[0] = s->current_picture.f->data[0] + (s->mb_y * 16 * s->linesize) + s->mb_x * 16;
- s->dest[1] = s->current_picture.f->data[1] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
- s->dest[2] = s->current_picture.f->data[2] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift);
-
- if (ref)
- av_log(s->avctx, AV_LOG_DEBUG,
- "Interlaced error concealment is not fully implemented\n");
- ff_mpv_decode_mb(s, s->block);
-}
-
/* init common dct for both encoder and decoder */
static av_cold int dct_init(MpegEncContext *s)
{
@@ -645,42 +617,6 @@ void ff_mpv_decode_defaults(MpegEncContext *s)
ff_mpv_common_defaults(s);
}
-static int init_er(MpegEncContext *s)
-{
- ERContext *er = &s->er;
- int mb_array_size = s->mb_height * s->mb_stride;
- int i;
-
- er->avctx = s->avctx;
-
- er->mb_index2xy = s->mb_index2xy;
- er->mb_num = s->mb_num;
- er->mb_width = s->mb_width;
- er->mb_height = s->mb_height;
- er->mb_stride = s->mb_stride;
- er->b8_stride = s->b8_stride;
-
- er->er_temp_buffer = av_malloc(s->mb_height * s->mb_stride);
- er->error_status_table = av_mallocz(mb_array_size);
- if (!er->er_temp_buffer || !er->error_status_table)
- goto fail;
-
- er->mbskip_table = s->mbskip_table;
- er->mbintra_table = s->mbintra_table;
-
- for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
- er->dc_val[i] = s->dc_val[i];
-
- er->decode_mb = mpeg_er_decode_mb;
- er->opaque = s;
-
- return 0;
-fail:
- av_freep(&er->er_temp_buffer);
- av_freep(&er->error_status_table);
- return AVERROR(ENOMEM);
-}
-
/**
* Initialize and allocates MpegEncContext fields dependent on the resolution.
*/
@@ -815,7 +751,7 @@ static int init_context_frame(MpegEncContext *s)
FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail);
// Note the + 1 is for a quicker mpeg4 slice_end detection
- return init_er(s);
+ return ff_mpeg_er_init(s);
fail:
return AVERROR(ENOMEM);
}
More information about the ffmpeg-cvslog
mailing list