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

intrax8: Reference the current AVCodecContext 

It will be needed to initialize BlockDSP in the next commit.
This commit is contained in:
Vittorio Giovara 2016-02-20 00:43:22 -05:00
parent 8072345e9f
commit 1eaae7abb8
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/intrax8.c
View File

@ -737,13 +737,15 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame, int mb_y)
w->dest[2] += (mb_y & (~1)) * uvlinesize << 2; w->dest[2] += (mb_y & (~1)) * uvlinesize << 2;
} }
av_cold int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp, av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
MpegEncContext *const s) MpegEncContext *const s)
{ {
int ret = x8_vlc_init(); int ret = x8_vlc_init();
if (ret < 0) if (ret < 0)
return ret; return ret;
w->avctx = avctx;
w->idsp = *idsp; w->idsp = *idsp;
w->s = s; w->s = s;

5
libavcodec/intrax8.h
View File

@ -35,6 +35,7 @@ typedef struct IntraX8Context {
// set by ff_intrax8_common_init // set by ff_intrax8_common_init
uint8_t *prediction_table; // 2 * (mb_w * 2) uint8_t *prediction_table; // 2 * (mb_w * 2)
ScanTable scantable[3]; ScanTable scantable[3];
AVCodecContext *avctx;
// set by the caller codec // set by the caller codec
MpegEncContext *s; MpegEncContext *s;
@ -67,12 +68,14 @@ typedef struct IntraX8Context {
/** /**
* Initialize IntraX8 frame decoder. * Initialize IntraX8 frame decoder.
* Requires valid MpegEncContext with valid s->mb_width before calling. * Requires valid MpegEncContext with valid s->mb_width before calling.
* @param avctx pointer to AVCodecContext
* @param w pointer to IntraX8Context * @param w pointer to IntraX8Context
* @param idsp pointer to IDCTDSPContext * @param idsp pointer to IDCTDSPContext
* @param s pointer to MpegEncContext of the parent codec * @param s pointer to MpegEncContext of the parent codec
* @return 0 on success, a negative AVERROR value on error * @return 0 on success, a negative AVERROR value on error
*/ */
int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp, int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
MpegEncContext *const s); MpegEncContext *const s);
/** /**

2
libavcodec/vc1dec.c
View File

@ -379,7 +379,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
} }
} }
ret = ff_intrax8_common_init(&v->x8, &s->idsp, s); ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s);
if (ret < 0) if (ret < 0)
goto error; goto error;

2
libavcodec/wmv2dec.c
View File

@ -473,7 +473,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
ff_wmv2_common_init(w); ff_wmv2_common_init(w);
return ff_intrax8_common_init(&w->x8, &w->s.idsp, &w->s); return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, &w->s);
} }
static av_cold int wmv2_decode_end(AVCodecContext *avctx) static av_cold int wmv2_decode_end(AVCodecContext *avctx)