virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'

Browse Source 
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
  intrax8: Use the generic horizband function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-05-07 21:37:28 +01:00
commit c59c792470
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/intrax8.c
View File

@ -30,6 +30,7 @@
#include "intrax8huf.h"
#include "intrax8.h"
#include "intrax8dsp.h"
#include "mpegutils.h"
#define MAX_TABLE_DEPTH(table_bits, max_bits) \
((max_bits + table_bits - 1) / table_bits)
@ -773,7 +774,8 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w)
int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
GetBitContext *gb, int *mb_x, int *mb_y,
int dquant, int quant_offset, int loopfilter)
int dquant, int quant_offset,
int loopfilter, int lowdelay)
{
MpegEncContext *const s = w->s;
int mb_xy;
@ -834,7 +836,9 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
w->dest[0] += 8;
}
if (w->mb_y & 1)
ff_mpeg_draw_horiz_band(s, (w->mb_y - 1) * 8, 16);
ff_draw_horiz_band(w->avctx, w->frame, w->frame,
(w->mb_y - 1) * 8, 16,
PICT_FRAME, 0, lowdelay);
}
error:

3
libavcodec/intrax8.h
View File

@ -113,6 +113,7 @@ void ff_intrax8_common_end(IntraX8Context *w);
*/
int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
GetBitContext *gb, int *mb_x, int *mb_y,
int quant, int halfpq, int loopfilter);
int quant, int halfpq,
int loopfilter, int lowdelay);
#endif /* AVCODEC_INTRAX8_H */

2
libavcodec/vc1_block.c
View File

@ -2934,7 +2934,7 @@ void ff_vc1_decode_blocks(VC1Context *v)
ff_intrax8_decode_picture(&v->x8, &v->s.current_picture,
&v->s.gb, &v->s.mb_x, &v->s.mb_y,
2 * v->pq + v->halfpq, v->pq * !v->pquantizer,
v->s.loop_filter);
v->s.loop_filter, v->s.low_delay);
ff_er_add_slice(&v->s.er, 0, 0,
(v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1,

2
libavcodec/wmv2dec.c
View File

@ -222,7 +222,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s)
ff_intrax8_decode_picture(&w->x8, &s->current_picture,
&s->gb, &s->mb_x, &s->mb_y,
2 * s->qscale, (s->qscale - 1) | 1,
s->loop_filter);
s->loop_filter, s->low_delay);
ff_er_add_slice(&w->s.er, 0, 0,
(w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1,