generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intrax8: Remove mpegvideo dependency

Browse Source
This commit is contained in:
Vittorio Giovara 2016-02-20 02:29:43 -05:00
parent 6ebd06a9b2
commit ca8c759173
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/intrax8.c
View File

@ -24,7 +24,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "mpegvideo.h"
#include "msmpeg4data.h" #include "msmpeg4data.h"
#include "intrax8huf.h" #include "intrax8huf.h"
#include "intrax8.h" #include "intrax8.h"
@ -734,8 +733,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp, IntraX8Context *w, IDCTDSPContext *idsp,
int16_t (*block)[64], int16_t (*block)[64],
int block_last_index[12], int block_last_index[12],
int mb_width, int mb_height, int mb_width, int mb_height)
MpegEncContext *const s)
{ {
int ret = x8_vlc_init(); int ret = x8_vlc_init();
if (ret < 0) if (ret < 0)
@ -747,7 +745,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
w->mb_height = mb_height; w->mb_height = mb_height;
w->block = block; w->block = block;
w->block_last_index = block_last_index; w->block_last_index = block_last_index;
w->s = s;
// two rows, 2 blocks per cannon mb // two rows, 2 blocks per cannon mb
w->prediction_table = av_mallocz(w->mb_width * 2 * 2); w->prediction_table = av_mallocz(w->mb_width * 2 * 2);
@ -777,9 +774,7 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict,
int dquant, int quant_offset, int dquant, int quant_offset,
int loopfilter, int lowdelay) int loopfilter, int lowdelay)
{ {
MpegEncContext *const s = w->s;
int mb_xy; int mb_xy;
assert(s);
w->gb = gb; w->gb = gb;
w->dquant = dquant; w->dquant = dquant;

10
libavcodec/intrax8.h
View File

@ -21,7 +21,6 @@
#include "blockdsp.h" #include "blockdsp.h"
#include "get_bits.h" #include "get_bits.h"
#include "mpegvideo.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "intrax8dsp.h" #include "intrax8dsp.h"
#include "mpegpicture.h" #include "mpegpicture.h"
@ -41,7 +40,6 @@ typedef struct IntraX8Context {
int16_t (*block)[64]; int16_t (*block)[64];
// set by the caller codec // set by the caller codec
MpegEncContext *s;
IntraX8DSPContext dsp; IntraX8DSPContext dsp;
IDCTDSPContext idsp; IDCTDSPContext idsp;
BlockDSPContext bdsp; BlockDSPContext bdsp;
@ -75,7 +73,6 @@ typedef struct IntraX8Context {
/** /**
* Initialize IntraX8 frame decoder. * Initialize IntraX8 frame decoder.
* Requires valid MpegEncContext with valid s->mb_width before calling.
* @param avctx pointer to AVCodecContext * @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
@ -83,15 +80,13 @@ typedef struct IntraX8Context {
* @param block_last_index pointer to index array * @param block_last_index pointer to index array
* @param mb_width macroblock width * @param mb_width macroblock width
* @param mb_height macroblock height * @param mb_height macroblock height
* @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(AVCodecContext *avctx, int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp, IntraX8Context *w, IDCTDSPContext *idsp,
int16_t (*block)[64], int16_t (*block)[64],
int block_last_index[12], int block_last_index[12],
int mb_width, int mb_height, int mb_width, int mb_height);
MpegEncContext *const s);
/** /**
* Destroy IntraX8 frame structure. * Destroy IntraX8 frame structure.
@ -101,9 +96,6 @@ void ff_intrax8_common_end(IntraX8Context *w);
/** /**
* Decode single IntraX8 frame. * Decode single IntraX8 frame.
* The parent codec must call ff_mpv_frame_start() before calling this function.
* The parent codec must call ff_mpv_frame_end() after calling this function.
* This function does not use ff_mpv_decode_mb().
* @param w pointer to IntraX8Context * @param w pointer to IntraX8Context
* @param pict the output Picture containing an AVFrame * @param pict the output Picture containing an AVFrame
* @param gb open bitstream reader * @param gb open bitstream reader

3
libavcodec/vc1dec.c
View File

@ -381,8 +381,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,
s->block, s->block_last_index, s->block, s->block_last_index,
s->mb_width, s->mb_height, s->mb_width, s->mb_height);
s);
if (ret < 0) if (ret < 0)
goto error; goto error;

2
libavcodec/wmv2dec.c
View File

@ -476,7 +476,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp,
w->s.block, w->s.block_last_index, w->s.block, w->s.block_last_index,
w->s.mb_width, w->s.mb_height, &w->s); w->s.mb_width, w->s.mb_height);
} }
static av_cold int wmv2_decode_end(AVCodecContext *avctx) static av_cold int wmv2_decode_end(AVCodecContext *avctx)