[FFmpeg-cvslog] h264: move *_samples_available into the per-slice context
Anton Khirnov
git at videolan.org
Sat Mar 21 14:14:42 CET 2015
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jan 17 22:28:46 2015 +0100| [64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e] | committer: Anton Khirnov
h264: move *_samples_available into the per-slice context
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e
---
libavcodec/h264.c | 17 +++++++++--------
libavcodec/h264.h | 12 +++++++-----
libavcodec/h264_cabac.c | 4 ++--
libavcodec/h264_cavlc.c | 4 ++--
libavcodec/h264_mb.c | 6 +++---
libavcodec/h264_mvpred.h | 34 +++++++++++++++++-----------------
libavcodec/svq3.c | 22 +++++++++++-----------
7 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a5f64b2..8de0673 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -135,7 +135,7 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl)
};
int i;
- if (!(h->top_samples_available & 0x8000)) {
+ if (!(sl->top_samples_available & 0x8000)) {
for (i = 0; i < 4; i++) {
int status = top[sl->intra4x4_pred_mode_cache[scan8[0] + i]];
if (status < 0) {
@@ -149,10 +149,10 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl)
}
}
- if ((h->left_samples_available & 0x8888) != 0x8888) {
+ if ((sl->left_samples_available & 0x8888) != 0x8888) {
static const int mask[4] = { 0x8000, 0x2000, 0x80, 0x20 };
for (i = 0; i < 4; i++)
- if (!(h->left_samples_available & mask[i])) {
+ if (!(sl->left_samples_available & mask[i])) {
int status = left[sl->intra4x4_pred_mode_cache[scan8[0] + 8 * i]];
if (status < 0) {
av_log(h->avctx, AV_LOG_ERROR,
@@ -172,7 +172,8 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl)
* Check if the top & left blocks are available if needed and
* change the dc mode so it only uses the available blocks.
*/
-int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
+int ff_h264_check_intra_pred_mode(H264Context *h, H264SliceContext *sl,
+ int mode, int is_chroma)
{
static const int8_t top[4] = { LEFT_DC_PRED8x8, 1, -1, -1 };
static const int8_t left[5] = { TOP_DC_PRED8x8, -1, 2, -1, DC_128_PRED8x8 };
@@ -184,7 +185,7 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
return AVERROR_INVALIDDATA;
}
- if (!(h->top_samples_available & 0x8000)) {
+ if (!(sl->top_samples_available & 0x8000)) {
mode = top[mode];
if (mode < 0) {
av_log(h->avctx, AV_LOG_ERROR,
@@ -194,12 +195,12 @@ int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma)
}
}
- if ((h->left_samples_available & 0x8080) != 0x8080) {
+ if ((sl->left_samples_available & 0x8080) != 0x8080) {
mode = left[mode];
- if (is_chroma && (h->left_samples_available & 0x8080)) {
+ if (is_chroma && (sl->left_samples_available & 0x8080)) {
// mad cow disease mode, aka MBAFF + constrained_intra_pred
mode = ALZHEIMER_DC_L0T_PRED8x8 +
- (!(h->left_samples_available & 0x8000)) +
+ (!(sl->left_samples_available & 0x8000)) +
2 * (mode == DC_128_PRED8x8);
}
if (mode < 0) {
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e8e81fe..308ca93 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -336,6 +336,11 @@ typedef struct H264SliceContext {
const uint8_t *left_block;
int topleft_partition;
+
+ unsigned int topleft_samples_available;
+ unsigned int top_samples_available;
+ unsigned int topright_samples_available;
+ unsigned int left_samples_available;
} H264SliceContext;
/**
@@ -374,10 +379,6 @@ typedef struct H264Context {
int8_t(*intra4x4_pred_mode);
H264PredContext hpc;
- unsigned int topleft_samples_available;
- unsigned int top_samples_available;
- unsigned int topright_samples_available;
- unsigned int left_samples_available;
uint8_t (*top_borders[2])[(16 * 3) * 2];
/**
@@ -794,7 +795,8 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl);
* Check if the top & left blocks are available if needed & change the
* dc mode so it only uses the available blocks.
*/
-int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma);
+int ff_h264_check_intra_pred_mode(H264Context *h, H264SliceContext *sl,
+ int mode, int is_chroma);
void ff_h264_hl_decode_mb(H264Context *h, H264SliceContext *sl);
int ff_h264_decode_extradata(H264Context *h);
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 38defe4..5c64699 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -2058,14 +2058,14 @@ decode_intra_mb:
write_back_intra_pred_mode(h, sl);
if (ff_h264_check_intra4x4_pred_mode(h, sl) < 0 ) return -1;
} else {
- sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl->intra16x16_pred_mode, 0);
+ sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, sl->intra16x16_pred_mode, 0);
if (sl->intra16x16_pred_mode < 0) return -1;
}
if(decode_chroma){
h->chroma_pred_mode_table[mb_xy] =
pred_mode = decode_cabac_mb_chroma_pre_mode(h, sl);
- pred_mode= ff_h264_check_intra_pred_mode( h, pred_mode, 1 );
+ pred_mode= ff_h264_check_intra_pred_mode(h, sl, pred_mode, 1 );
if( pred_mode < 0 ) return -1;
sl->chroma_pred_mode = pred_mode;
} else {
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index b8f588d..1a89ad9 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -814,12 +814,12 @@ decode_intra_mb:
if (ff_h264_check_intra4x4_pred_mode(h, sl) < 0)
return -1;
}else{
- sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl->intra16x16_pred_mode, 0);
+ sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, sl->intra16x16_pred_mode, 0);
if (sl->intra16x16_pred_mode < 0)
return -1;
}
if(decode_chroma){
- pred_mode= ff_h264_check_intra_pred_mode(h, get_ue_golomb_31(&h->gb), 1);
+ pred_mode= ff_h264_check_intra_pred_mode(h, sl, get_ue_golomb_31(&h->gb), 1);
if(pred_mode < 0)
return -1;
sl->chroma_pred_mode = pred_mode;
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index 7839830..13640c2 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -636,8 +636,8 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
h->hpc.pred8x8l_add[dir](ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
} else {
const int nnz = h->non_zero_count_cache[scan8[i + p * 16]];
- h->hpc.pred8x8l[dir](ptr, (h->topleft_samples_available << i) & 0x8000,
- (h->topright_samples_available << i) & 0x4000, linesize);
+ h->hpc.pred8x8l[dir](ptr, (sl->topleft_samples_available << i) & 0x8000,
+ (sl->topright_samples_available << i) & 0x4000, linesize);
if (nnz) {
if (nnz == 1 && dctcoef_get(h->mb, pixel_shift, i * 16 + p * 256))
idct_dc_add(ptr, h->mb + (i * 16 + p * 256 << pixel_shift), linesize);
@@ -665,7 +665,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
int nnz, tr;
uint64_t tr_high;
if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
- const int topright_avail = (h->topright_samples_available << i) & 0x8000;
+ const int topright_avail = (sl->topright_samples_available << i) & 0x8000;
assert(h->mb_y || linesize <= block_offset[i]);
if (!topright_avail) {
if (pixel_shift) {
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h
index 4f3bb55..6c29bb7 100644
--- a/libavcodec/h264_mvpred.h
+++ b/libavcodec/h264_mvpred.h
@@ -465,47 +465,47 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type
if (!IS_SKIP(mb_type)) {
if (IS_INTRA(mb_type)) {
int type_mask = h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1;
- h->topleft_samples_available =
- h->top_samples_available =
- h->left_samples_available = 0xFFFF;
- h->topright_samples_available = 0xEEEA;
+ sl->topleft_samples_available =
+ sl->top_samples_available =
+ sl->left_samples_available = 0xFFFF;
+ sl->topright_samples_available = 0xEEEA;
if (!(top_type & type_mask)) {
- h->topleft_samples_available = 0xB3FF;
- h->top_samples_available = 0x33FF;
- h->topright_samples_available = 0x26EA;
+ sl->topleft_samples_available = 0xB3FF;
+ sl->top_samples_available = 0x33FF;
+ sl->topright_samples_available = 0x26EA;
}
if (IS_INTERLACED(mb_type) != IS_INTERLACED(left_type[LTOP])) {
if (IS_INTERLACED(mb_type)) {
if (!(left_type[LTOP] & type_mask)) {
- h->topleft_samples_available &= 0xDFFF;
- h->left_samples_available &= 0x5FFF;
+ sl->topleft_samples_available &= 0xDFFF;
+ sl->left_samples_available &= 0x5FFF;
}
if (!(left_type[LBOT] & type_mask)) {
- h->topleft_samples_available &= 0xFF5F;
- h->left_samples_available &= 0xFF5F;
+ sl->topleft_samples_available &= 0xFF5F;
+ sl->left_samples_available &= 0xFF5F;
}
} else {
int left_typei = h->cur_pic.mb_type[left_xy[LTOP] + h->mb_stride];
assert(left_xy[LTOP] == left_xy[LBOT]);
if (!((left_typei & type_mask) && (left_type[LTOP] & type_mask))) {
- h->topleft_samples_available &= 0xDF5F;
- h->left_samples_available &= 0x5F5F;
+ sl->topleft_samples_available &= 0xDF5F;
+ sl->left_samples_available &= 0x5F5F;
}
}
} else {
if (!(left_type[LTOP] & type_mask)) {
- h->topleft_samples_available &= 0xDF5F;
- h->left_samples_available &= 0x5F5F;
+ sl->topleft_samples_available &= 0xDF5F;
+ sl->left_samples_available &= 0x5F5F;
}
}
if (!(topleft_type & type_mask))
- h->topleft_samples_available &= 0x7FFF;
+ sl->topleft_samples_available &= 0x7FFF;
if (!(topright_type & type_mask))
- h->topright_samples_available &= 0xFBFF;
+ sl->topright_samples_available &= 0xFBFF;
if (IS_INTRA4x4(mb_type)) {
if (IS_INTRA4x4(top_type)) {
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index ffedbad..d48677e 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -490,9 +490,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
const int mb_xy = h->mb_xy;
const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride;
- h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
- h->topright_samples_available = 0xFFFF;
+ sl->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ sl->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ sl->topright_samples_available = 0xFFFF;
if (mb_type == 0) { /* SKIP */
if (h->pict_type == AV_PICTURE_TYPE_P ||
@@ -603,7 +603,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
for (i = 0; i < 4; i++)
sl->intra4x4_pred_mode_cache[scan8[0] - 1 + i * 8] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - 1] + 6 - i];
if (sl->intra4x4_pred_mode_cache[scan8[0] - 1] == -1)
- h->left_samples_available = 0x5F5F;
+ sl->left_samples_available = 0x5F5F;
}
if (h->mb_y > 0) {
sl->intra4x4_pred_mode_cache[4 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 0];
@@ -612,7 +612,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
sl->intra4x4_pred_mode_cache[7 + 8 * 0] = sl->intra4x4_pred_mode[h->mb2br_xy[mb_xy - h->mb_stride] + 3];
if (sl->intra4x4_pred_mode_cache[4 + 8 * 0] == -1)
- h->top_samples_available = 0x33FF;
+ sl->top_samples_available = 0x33FF;
}
/* decode prediction codes for luma blocks */
@@ -646,14 +646,14 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
if (mb_type == 8) {
ff_h264_check_intra4x4_pred_mode(h, sl);
- h->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
- h->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
+ sl->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF;
+ sl->left_samples_available = (h->mb_x == 0) ? 0x5F5F : 0xFFFF;
} else {
for (i = 0; i < 4; i++)
memset(&sl->intra4x4_pred_mode_cache[scan8[0] + 8 * i], DC_128_PRED, 4);
- h->top_samples_available = 0x33FF;
- h->left_samples_available = 0x5F5F;
+ sl->top_samples_available = 0x33FF;
+ sl->left_samples_available = 0x5F5F;
}
mb_type = MB_TYPE_INTRA4x4;
@@ -661,7 +661,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
dir = i_mb_type_info[mb_type - 8].pred_mode;
dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1;
- if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, dir, 0)) < 0) {
+ if ((sl->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h, sl, dir, 0)) < 0) {
av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n");
return sl->intra16x16_pred_mode;
}
@@ -765,7 +765,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
h->cur_pic.mb_type[mb_xy] = mb_type;
if (IS_INTRA(mb_type))
- sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, DC_PRED8x8, 1);
+ sl->chroma_pred_mode = ff_h264_check_intra_pred_mode(h, sl, DC_PRED8x8, 1);
return 0;
}
More information about the ffmpeg-cvslog
mailing list