[FFmpeg-cvslog] Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
Derek Buitenhuis
git at videolan.org
Sat May 7 22:51:01 CEST 2016
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sat May 7 21:38:30 2016 +0100| [f110c624b1f30ac7f817eda128db1265260e57c7] | committer: Derek Buitenhuis
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
intrax8: Keep a reference to the decoder blocks
Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f110c624b1f30ac7f817eda128db1265260e57c7
---
libavcodec/intrax8.c | 31 ++++++++++++++++---------------
libavcodec/intrax8.h | 6 ++++++
libavcodec/vc1dec.c | 1 +
libavcodec/wmv2dec.c | 1 +
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index ff828ee..c953804 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -476,9 +476,8 @@ static void x8_get_prediction(IntraX8Context *const w)
static void x8_ac_compensation(IntraX8Context *const w, const int direction,
const int dc_level)
{
- MpegEncContext *const s = w->s;
int t;
-#define B(x,y) s->block[0][w->idct_permutation[(x) + (y) * 8]]
+#define B(x,y) w->block[0][w->idct_permutation[(x) + (y) * 8]]
#define T(x) ((x) * dc_level + 0x8000) >> 16;
switch (direction) {
case 0:
@@ -522,7 +521,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction,
t = T(1084); // g
B(1, 1) += t;
- s->block_last_index[0] = FFMAX(s->block_last_index[0], 7 * 8);
+ w->block_last_index[0] = FFMAX(w->block_last_index[0], 7 * 8);
break;
case 1:
B(0, 1) -= T(6269);
@@ -530,7 +529,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction,
B(0, 5) -= T(172);
B(0, 7) -= T(73);
- s->block_last_index[0] = FFMAX(s->block_last_index[0], 7 * 8);
+ w->block_last_index[0] = FFMAX(w->block_last_index[0], 7 * 8);
break;
case 2:
B(1, 0) -= T(6269);
@@ -538,7 +537,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction,
B(5, 0) -= T(172);
B(7, 0) -= T(73);
- s->block_last_index[0] = FFMAX(s->block_last_index[0], 7);
+ w->block_last_index[0] = FFMAX(w->block_last_index[0], 7);
break;
}
#undef B
@@ -568,8 +567,6 @@ static const int16_t quant_table[64] = {
static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
{
- MpegEncContext *const s = w->s;
-
uint8_t *scantable;
int final, run, level;
int ac_mode, dc_mode, est_run, dc_level;
@@ -579,7 +576,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
int sign;
av_assert2(w->orient < 12);
- w->bdsp.clear_block(s->block[0]);
+ w->bdsp.clear_block(w->block[0]);
if (chroma)
dc_mode = 2;
@@ -640,12 +637,12 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
if (use_quant_matrix)
level = (level * quant_table[pos]) >> 8;
- s->block[0][scantable[pos]] = level;
+ w->block[0][scantable[pos]] = level;
} while (!final);
- s->block_last_index[0] = pos;
+ w->block_last_index[0] = pos;
} else { // DC only
- s->block_last_index[0] = 0;
+ w->block_last_index[0] = 0;
if (w->flat_dc && ((unsigned) (dc_level + 1)) < 3) { // [-1; 1]
int32_t divide_quant = !chroma ? w->divide_quant_dc_luma
: w->divide_quant_dc_chroma;
@@ -665,9 +662,9 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
zeros_only = (dc_level == 0);
}
if (!chroma)
- s->block[0][0] = dc_level * w->quant;
+ w->block[0][0] = dc_level * w->quant;
else
- s->block[0][0] = dc_level * w->quant_dc_chroma;
+ w->block[0][0] = dc_level * w->quant_dc_chroma;
// there is !zero_only check in the original, but dc_level check is enough
if ((unsigned int) (dc_level + 1) >= 3 && (w->edges & 3) != 3) {
@@ -677,7 +674,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
direction = (0x6A017C >> (w->orient * 2)) & 3;
if (direction != 3) {
// modify block_last[]
- x8_ac_compensation(w, direction, s->block[0][0]);
+ x8_ac_compensation(w, direction, w->block[0][0]);
}
}
@@ -692,7 +689,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
if (!zeros_only)
w->wdsp.idct_add(w->dest[chroma],
w->frame->linesize[!!chroma],
- s->block[0]);
+ w->block[0]);
block_placed:
if (!chroma)
@@ -731,6 +728,8 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame)
av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
+ int16_t (*block)[64],
+ int block_last_index[12],
int mb_width, int mb_height,
MpegEncContext *const s)
{
@@ -742,6 +741,8 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
w->idsp = *idsp;
w->mb_width = mb_width;
w->mb_height = mb_height;
+ w->block = block;
+ w->block_last_index = block_last_index;
w->s = s;
// two rows, 2 blocks per cannon mb
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index c8897fe..a28c7ca 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -40,6 +40,8 @@ typedef struct IntraX8Context {
WMV2DSPContext wdsp;
uint8_t idct_permutation[64];
AVCodecContext *avctx;
+ int *block_last_index; ///< last nonzero coefficient in block
+ int16_t (*block)[64];
//set by the caller codec
MpegEncContext * s;
@@ -80,6 +82,8 @@ typedef struct IntraX8Context {
* @param avctx pointer to AVCodecContext
* @param w pointer to IntraX8Context
* @param idsp pointer to IDCTDSPContext
+ * @param block pointer to block array
+ * @param block_last_index pointer to index array
* @param mb_width macroblock width
* @param mb_height macroblock height
* @param s pointer to MpegEncContext of the parent codec
@@ -87,6 +91,8 @@ typedef struct IntraX8Context {
*/
int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp,
+ int16_t (*block)[64],
+ int block_last_index[12],
int mb_width, int mb_height,
MpegEncContext *const s);
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 89996a1..e78f8cb 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -388,6 +388,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
}
ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,
+ s->block, s->block_last_index,
s->mb_width, s->mb_height,
s);
if (ret < 0)
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 6ee13a4..ab9cfae 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -470,6 +470,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
ff_wmv2_common_init(w);
return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp,
+ w->s.block, w->s.block_last_index,
w->s.mb_width, w->s.mb_height, &w->s);
}
======================================================================
diff --cc libavcodec/intrax8.c
index ff828ee,3bd8807..c953804
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@@ -476,9 -480,8 +476,8 @@@ static void x8_get_prediction(IntraX8Co
static void x8_ac_compensation(IntraX8Context *const w, const int direction,
const int dc_level)
{
- MpegEncContext *const s = w->s;
int t;
- #define B(x,y) s->block[0][w->idct_permutation[(x) + (y) * 8]]
-#define B(x, y) w->block[0][w->idsp.idct_permutation[(x) + (y) * 8]]
++#define B(x,y) w->block[0][w->idct_permutation[(x) + (y) * 8]]
#define T(x) ((x) * dc_level + 0x8000) >> 16;
switch (direction) {
case 0:
@@@ -578,8 -579,8 +575,8 @@@ static int x8_decode_intra_mb(IntraX8Co
int use_quant_matrix;
int sign;
- assert(w->orient < 12);
+ av_assert2(w->orient < 12);
- w->bdsp.clear_block(s->block[0]);
+ w->bdsp.clear_block(w->block[0]);
if (chroma)
dc_mode = 2;
@@@ -690,9 -691,9 +687,9 @@@
w->frame->linesize[!!chroma]);
}
if (!zeros_only)
- w->idsp.idct_add(w->dest[chroma],
+ w->wdsp.idct_add(w->dest[chroma],
w->frame->linesize[!!chroma],
- s->block[0]);
+ w->block[0]);
block_placed:
if (!chroma)
diff --cc libavcodec/intrax8.h
index c8897fe,ebc9a79..a28c7ca
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@@ -37,12 -36,12 +37,14 @@@ typedef struct IntraX8Context
// set by ff_intrax8_common_init
uint8_t *prediction_table; // 2 * (mb_w * 2)
ScanTable scantable[3];
+ WMV2DSPContext wdsp;
+ uint8_t idct_permutation[64];
AVCodecContext *avctx;
+ int *block_last_index; ///< last nonzero coefficient in block
+ int16_t (*block)[64];
- // set by the caller codec
- MpegEncContext *s;
+ //set by the caller codec
+ MpegEncContext * s;
IntraX8DSPContext dsp;
IDCTDSPContext idsp;
BlockDSPContext bdsp;
More information about the ffmpeg-cvslog
mailing list