MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec: Rename ff_mpv_decode_mb() to ff_mpv_reconstruct_mb

Browse Source 
The new name more accuratly describes what the function does

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-06-18 20:15:05 +02:00
parent b9d0a5fc21
commit f670c13f13
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -3948,7 +3948,7 @@ typedef struct AVHWAccel {
/**
* Called for every Macroblock in a slice.
*
* XvMC uses it to replace the ff_mpv_decode_mb().
* XvMC uses it to replace the ff_mpv_reconstruct_mb().
* Instead of decoding to raw picture, MB parameters are
* stored in an array provided by the video driver.
*

4
libavcodec/h261dec.c
View File

@ -223,7 +223,7 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2)
s->current_picture.motion_val[0][b_xy][1] = s->mv[0][0][1];
}
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
}
return 0;
@ -466,7 +466,7 @@ intra:
s->block_last_index[i] = -1;
}
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
return SLICE_OK;
}

4
libavcodec/h263dec.c
View File

@ -261,7 +261,7 @@ static int decode_slice(MpegEncContext *s)
if (ret < 0) {
const int xy = s->mb_x + s->mb_y * s->mb_stride;
if (ret == SLICE_END) {
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
if (s->loop_filter)
ff_h263_loop_filter(s);
@ -294,7 +294,7 @@ static int decode_slice(MpegEncContext *s)
return AVERROR_INVALIDDATA;
}
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
if (s->loop_filter)
ff_h263_loop_filter(s);
}

2
libavcodec/mpeg12dec.c
View File

@ -1867,7 +1867,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
s->dest[1] +=(16 >> lowres) >> s->chroma_x_shift;
s->dest[2] +=(16 >> lowres) >> s->chroma_x_shift;
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
if (++s->mb_x >= s->mb_width) {
const int mb_size = 16 >> s->avctx->lowres;

2
libavcodec/mpeg_er.c
View File

@ -91,7 +91,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
if (ref)
av_log(s->avctx, AV_LOG_DEBUG,
"Interlaced error concealment is not fully implemented\n");
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
}
int ff_mpeg_er_init(MpegEncContext *s)

12
libavcodec/mpegvideo.c
View File

@ -2471,7 +2471,7 @@ void ff_clean_intra_table_entries(MpegEncContext *s)
s->interlaced_dct : true if interlaced dct used (mpeg2)
*/
static av_always_inline
void mpv_decode_mb_internal(MpegEncContext *s, int16_t block[12][64],
void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64],
int lowres_flag, int is_mpeg12)
{
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
@ -2719,16 +2719,16 @@ skip_idct:
}
}
void ff_mpv_decode_mb(MpegEncContext *s, int16_t block[12][64])
void ff_mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64])
{
#if !CONFIG_SMALL
if(s->out_format == FMT_MPEG1) {
if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 1);
else mpv_decode_mb_internal(s, block, 0, 1);
if(s->avctx->lowres) mpv_reconstruct_mb_internal(s, block, 1, 1);
else mpv_reconstruct_mb_internal(s, block, 0, 1);
} else
#endif
if(s->avctx->lowres) mpv_decode_mb_internal(s, block, 1, 0);
else mpv_decode_mb_internal(s, block, 0, 0);
if(s->avctx->lowres) mpv_reconstruct_mb_internal(s, block, 1, 0);
else mpv_reconstruct_mb_internal(s, block, 0, 0);
}
void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)

2
libavcodec/mpegvideo.h
View File

@ -680,7 +680,7 @@ void ff_mpv_common_end(MpegEncContext *s);
void ff_mpv_decode_defaults(MpegEncContext *s);
void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx);
void ff_mpv_decode_mb(MpegEncContext *s, int16_t block[12][64]);
void ff_mpv_reconstruct_mb(MpegEncContext *s, int16_t block[12][64]);
void ff_mpv_report_decode_progress(MpegEncContext *s);
int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx);

6
libavcodec/mpegvideo_enc.c
View File

@ -2774,7 +2774,7 @@ static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegE
}
if(s->avctx->mb_decision == FF_MB_DECISION_RD){
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
score *= s->lambda2;
score += sse_mb(s) << FF_LAMBDA_SHIFT;
@ -3479,7 +3479,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
} else {
int motion_x = 0, motion_y = 0;
s->mv_type=MV_TYPE_16X16;
@ -3598,7 +3598,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
s->out_format == FMT_H263 && s->pict_type!=AV_PICTURE_TYPE_B)
ff_h263_update_motion_val(s);
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
}
/* clean the MV table in IPS frames for direct mode in B-frames */

2
libavcodec/mpegvideo_xvmc.c
View File

@ -182,7 +182,7 @@ static void ff_xvmc_decode_mb(struct MpegEncContext *s)
return;
}
// from ff_mpv_decode_mb(), update DC predictors for P macroblocks
// from ff_mpv_reconstruct_mb(), update DC predictors for P macroblocks
if (!s->mb_intra) {
s->last_dc[0] =
s->last_dc[1] =

2
libavcodec/rv10.c
View File

@ -670,7 +670,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf,
}
if (s->pict_type != AV_PICTURE_TYPE_B)
ff_h263_update_motion_val(s);
ff_mpv_decode_mb(s, s->block);
ff_mpv_reconstruct_mb(s, s->block);
if (s->loop_filter)
ff_h263_loop_filter(s);