diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-02 20:42:07 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-15 16:10:11 +0100 |
| commit | 54974c62982ae827becdbdb9b620b7ba75d079a0 (patch) | |
| tree | b98128b3369cd366a92bba010358e9548fd356c5 /libavcodec/mpegvideo.h | |
| parent | d9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc (diff) | |
| download | ffmpeg-54974c62982ae827becdbdb9b620b7ba75d079a0.tar.gz | |
error_resilience: decouple ER from MpegEncContext
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index f3f982742b..87e9d1b246 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -30,6 +30,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "error_resilience.h" #include "get_bits.h" #include "put_bits.h" #include "ratecontrol.h" @@ -484,19 +485,6 @@ typedef struct MpegEncContext { int last_bits; ///< temp var used for calculating the above vars /* error concealment / resync */ - int error_count, error_occurred; - uint8_t *error_status_table; ///< table of the error status of each MB -#define VP_START 1 ///< current MB is the first after a resync marker -#define ER_AC_ERROR 2 -#define ER_DC_ERROR 4 -#define ER_MV_ERROR 8 -#define ER_AC_END 16 -#define ER_DC_END 32 -#define ER_MV_END 64 - -#define ER_MB_ERROR (ER_AC_ERROR|ER_DC_ERROR|ER_MV_ERROR) -#define ER_MB_END (ER_AC_END|ER_DC_END|ER_MV_END) - int resync_mb_x; ///< x position of last resync marker int resync_mb_y; ///< y position of last resync marker GetBitContext last_resync_gb; ///< used to search for the next resync marker @@ -701,15 +689,14 @@ typedef struct MpegEncContext { int mpv_flags; ///< flags set by private options int quantizer_noise_shaping; - /* error resilience stuff */ - uint8_t *er_temp_buffer; - /* temp buffers for rate control */ float *cplx_tab, *bits_tab; /* flag to indicate a reinitialization is required, e.g. after * a frame size change */ int context_reinit; + + ERContext er; } MpegEncContext; #define REBASE_PICTURE(pic, new_ctx, old_ctx) \ @@ -787,9 +774,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src const uint8_t *avpriv_mpv_find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state); void ff_set_qscale(MpegEncContext * s, int qscale); -void ff_er_frame_start(MpegEncContext *s); -void ff_er_frame_end(MpegEncContext *s); -void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int endy, int status); +void ff_mpeg_er_frame_start(MpegEncContext *s); int ff_dct_common_init(MpegEncContext *s); void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], |