RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '75af13a' 

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-17 04:34:21 +01:00
parent b73aae6fe9 75af13a0e4
commit 3ddf9b5b77
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/mpegvideo.c
View File

@ -3025,8 +3025,9 @@ void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]){
/**
* @param h is the normal height, this will be reduced automatically if needed for the last row
*/
void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur,
Picture *last, int y, int h, int picture_structure,
void ff_draw_horiz_band(AVCodecContext *avctx,
AVFrame *cur, AVFrame *last,
int y, int h, int picture_structure,
int first_field, int low_delay)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
@ -3046,15 +3047,15 @@ void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur,
int offset[AV_NUM_DATA_POINTERS];
int i;
if(cur->f.pict_type == AV_PICTURE_TYPE_B || low_delay ||
if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay ||
(avctx->slice_flags & SLICE_FLAG_CODED_ORDER))
src = &cur->f;
src = cur;
else if (last)
src = &last->f;
src = last;
else
return;
if (cur->f.pict_type == AV_PICTURE_TYPE_B &&
if (cur->pict_type == AV_PICTURE_TYPE_B &&
picture_structure == PICT_FRAME &&
avctx->codec_id != AV_CODEC_ID_SVQ3) {
for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
@ -3076,8 +3077,8 @@ void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur,
void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
{
ff_draw_horiz_band(s->avctx, s->current_picture_ptr,
s->last_picture_ptr, y, h, s->picture_structure,
ff_draw_horiz_band(s->avctx, &s->current_picture_ptr->f,
&s->last_picture_ptr->f, y, h, s->picture_structure,
s->first_field, s->low_delay);
}

2
libavcodec/mpegvideo.h
View File

@ -808,7 +808,7 @@ void ff_MPV_common_init_axp(MpegEncContext *s);
void ff_MPV_common_init_arm(MpegEncContext *s);
void ff_MPV_common_init_ppc(MpegEncContext *s);
void ff_clean_intra_table_entries(MpegEncContext *s);
void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur, Picture *last,
void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last,
int y, int h, int picture_structure, int first_field,
int low_delay);
void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h);

4
libavcodec/svq3.c
View File

@ -1298,8 +1298,8 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
(h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
}
ff_draw_horiz_band(avctx, s->cur_pic,
s->last_pic->f.data[0] ? s->last_pic : NULL,
ff_draw_horiz_band(avctx, &s->cur_pic->f,
s->last_pic->f.data[0] ? &s->last_pic->f : NULL,
16 * h->mb_y, 16, h->picture_structure, 0,
h->low_delay);
}