int h_edge_pos;
int v_edge_pos;
int last_frame_output;
+ int slice_num;
+ int qscale;
+ int cbp;
+
+ enum AVPictureType pict_type;
int mb_x, mb_y;
int mb_xy;
DECLARE_ALIGNED(16, int16_t, mv_cache)[2][5 * 8][2];
DECLARE_ALIGNED(8, int8_t, ref_cache)[2][5 * 8];
+ DECLARE_ALIGNED(16, int16_t, mb)[16 * 48 * 2];
+ DECLARE_ALIGNED(16, int16_t, mb_luma_dc)[3][16 * 2];
+ DECLARE_ALIGNED(8, uint8_t, non_zero_count_cache)[15 * 8];
uint32_t dequant4_coeff[QP_MAX_NUM + 1][16];
} SVQ3Context;
int thirdpel, int dir, int avg)
{
H264Context *h = &s->h;
- H264SliceContext *sl = &h->slice_ctx[0];
const H264Picture *pic = (dir == 0) ? s->last_pic : s->next_pic;
uint8_t *src, *dest;
int i, emu = 0;
int blocksize = 2 - (width >> 3); // 16->0, 8->1, 4->2
+ int linesize = s->cur_pic->f->linesize[0];
+ int uvlinesize = s->cur_pic->f->linesize[1];
mx += x;
my += y;
}
/* form component predictions */
- dest = h->cur_pic.f->data[0] + x + y * sl->linesize;
- src = pic->f->data[0] + mx + my * sl->linesize;
+ dest = s->cur_pic->f->data[0] + x + y * linesize;
+ src = pic->f->data[0] + mx + my * linesize;
if (emu) {
s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src,
- sl->linesize, sl->linesize,
+ linesize, linesize,
width + 1, height + 1,
mx, my, s->h_edge_pos, s->v_edge_pos);
src = s->edge_emu_buffer;
}
if (thirdpel)
(avg ? s->tdsp.avg_tpel_pixels_tab
- : s->tdsp.put_tpel_pixels_tab)[dxy](dest, src, sl->linesize,
+ : s->tdsp.put_tpel_pixels_tab)[dxy](dest, src, linesize,
width, height);
else
(avg ? s->hdsp.avg_pixels_tab
- : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, sl->linesize,
+ : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, linesize,
height);
if (!(h->flags & AV_CODEC_FLAG_GRAY)) {
blocksize++;
for (i = 1; i < 3; i++) {
- dest = h->cur_pic.f->data[i] + (x >> 1) + (y >> 1) * sl->uvlinesize;
- src = pic->f->data[i] + mx + my * sl->uvlinesize;
+ dest = s->cur_pic->f->data[i] + (x >> 1) + (y >> 1) * uvlinesize;
+ src = pic->f->data[i] + mx + my * uvlinesize;
if (emu) {
s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src,
- sl->uvlinesize, sl->uvlinesize,
+ uvlinesize, uvlinesize,
width + 1, height + 1,
mx, my, (s->h_edge_pos >> 1),
s->v_edge_pos >> 1);
if (thirdpel)
(avg ? s->tdsp.avg_tpel_pixels_tab
: s->tdsp.put_tpel_pixels_tab)[dxy](dest, src,
- sl->uvlinesize,
+ uvlinesize,
width, height);
else
(avg ? s->hdsp.avg_pixels_tab
: s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src,
- sl->uvlinesize,
+ uvlinesize,
height);
}
}
}
/* write back motion vectors */
- fill_rectangle(h->cur_pic.motion_val[dir][b_xy],
+ fill_rectangle(s->cur_pic->motion_val[dir][b_xy],
part_width >> 2, part_height >> 2, s->b_stride,
pack16to32(mx, my), 4);
}
return 0;
}
-static av_always_inline void hl_decode_mb_idct_luma(const H264Context *h, H264SliceContext *sl,
+static av_always_inline void hl_decode_mb_idct_luma(SVQ3Context *s,
int mb_type, const int *block_offset,
int linesize, uint8_t *dest_y)
{
int i;
if (!IS_INTRA4x4(mb_type)) {
for (i = 0; i < 16; i++)
- if (sl->non_zero_count_cache[scan8[i]] || sl->mb[i * 16]) {
+ if (s->non_zero_count_cache[scan8[i]] || s->mb[i * 16]) {
uint8_t *const ptr = dest_y + block_offset[i];
- svq3_add_idct_c(ptr, sl->mb + i * 16, linesize,
- sl->qscale, IS_INTRA(mb_type) ? 1 : 0);
+ svq3_add_idct_c(ptr, s->mb + i * 16, linesize,
+ s->qscale, IS_INTRA(mb_type) ? 1 : 0);
}
}
}
static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s,
const H264Context *h,
- H264SliceContext *sl,
int mb_type,
const int *block_offset,
int linesize,
uint8_t *dest_y)
{
int i;
- int qscale = sl->qscale;
+ int qscale = s->qscale;
if (IS_INTRA4x4(mb_type)) {
for (i = 0; i < 16; i++) {
topright = NULL;
s->hpc.pred4x4[dir](ptr, topright, linesize);
- nnz = sl->non_zero_count_cache[scan8[i]];
+ nnz = s->non_zero_count_cache[scan8[i]];
if (nnz) {
- svq3_add_idct_c(ptr, sl->mb + i * 16, linesize, qscale, 0);
+ svq3_add_idct_c(ptr, s->mb + i * 16, linesize, qscale, 0);
}
}
} else {
s->hpc.pred16x16[s->intra16x16_pred_mode](dest_y, linesize);
- svq3_luma_dc_dequant_idct_c(sl->mb, sl->mb_luma_dc[0], qscale);
+ svq3_luma_dc_dequant_idct_c(s->mb, s->mb_luma_dc[0], qscale);
}
}
-static void hl_decode_mb(SVQ3Context *s, const H264Context *h, H264SliceContext *sl)
+static void hl_decode_mb(SVQ3Context *s, const H264Context *h)
{
const int mb_x = s->mb_x;
const int mb_y = s->mb_y;
const int mb_xy = s->mb_xy;
- const int mb_type = h->cur_pic.mb_type[mb_xy];
+ const int mb_type = s->cur_pic->mb_type[mb_xy];
uint8_t *dest_y, *dest_cb, *dest_cr;
int linesize, uvlinesize;
int i, j;
const int *block_offset = &h->block_offset[0];
const int block_h = 16 >> h->chroma_y_shift;
- dest_y = h->cur_pic.f->data[0] + (mb_x + mb_y * sl->linesize) * 16;
- dest_cb = h->cur_pic.f->data[1] + mb_x * 8 + mb_y * sl->uvlinesize * block_h;
- dest_cr = h->cur_pic.f->data[2] + mb_x * 8 + mb_y * sl->uvlinesize * block_h;
+ linesize = s->cur_pic->f->linesize[0];
+ uvlinesize = s->cur_pic->f->linesize[1];
- s->vdsp.prefetch(dest_y + (s->mb_x & 3) * 4 * sl->linesize + 64, sl->linesize, 4);
- s->vdsp.prefetch(dest_cb + (s->mb_x & 7) * sl->uvlinesize + 64, dest_cr - dest_cb, 2);
+ dest_y = s->cur_pic->f->data[0] + (mb_x + mb_y * linesize) * 16;
+ dest_cb = s->cur_pic->f->data[1] + mb_x * 8 + mb_y * uvlinesize * block_h;
+ dest_cr = s->cur_pic->f->data[2] + mb_x * 8 + mb_y * uvlinesize * block_h;
- linesize = sl->mb_linesize = sl->linesize;
- uvlinesize = sl->mb_uvlinesize = sl->uvlinesize;
+ s->vdsp.prefetch(dest_y + (s->mb_x & 3) * 4 * linesize + 64, linesize, 4);
+ s->vdsp.prefetch(dest_cb + (s->mb_x & 7) * uvlinesize + 64, dest_cr - dest_cb, 2);
if (IS_INTRA(mb_type)) {
s->hpc.pred8x8[s->chroma_pred_mode](dest_cb, uvlinesize);
s->hpc.pred8x8[s->chroma_pred_mode](dest_cr, uvlinesize);
- hl_decode_mb_predict_luma(s, h, sl, mb_type, block_offset, linesize, dest_y);
+ hl_decode_mb_predict_luma(s, h, mb_type, block_offset, linesize, dest_y);
}
- hl_decode_mb_idct_luma(h, sl, mb_type, block_offset, linesize, dest_y);
+ hl_decode_mb_idct_luma(s, mb_type, block_offset, linesize, dest_y);
- if (sl->cbp & 0x30) {
+ if (s->cbp & 0x30) {
uint8_t *dest[2] = { dest_cb, dest_cr };
- s->h264dsp.h264_chroma_dc_dequant_idct(sl->mb + 16 * 16 * 1,
- s->dequant4_coeff[sl->chroma_qp[0]][0]);
- s->h264dsp.h264_chroma_dc_dequant_idct(sl->mb + 16 * 16 * 2,
- s->dequant4_coeff[sl->chroma_qp[1]][0]);
+ s->h264dsp.h264_chroma_dc_dequant_idct(s->mb + 16 * 16 * 1,
+ s->dequant4_coeff[4][0]);
+ s->h264dsp.h264_chroma_dc_dequant_idct(s->mb + 16 * 16 * 2,
+ s->dequant4_coeff[4][0]);
for (j = 1; j < 3; j++) {
for (i = j * 16; i < j * 16 + 4; i++)
- if (sl->non_zero_count_cache[scan8[i]] || sl->mb[i * 16]) {
+ if (s->non_zero_count_cache[scan8[i]] || s->mb[i * 16]) {
uint8_t *const ptr = dest[j - 1] + block_offset[i];
- svq3_add_idct_c(ptr, sl->mb + i * 16,
- uvlinesize, ff_h264_chroma_qp[0][sl->qscale + 12] - 12, 2);
+ svq3_add_idct_c(ptr, s->mb + i * 16,
+ uvlinesize, ff_h264_chroma_qp[0][s->qscale + 12] - 12, 2);
}
}
}
static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
{
H264Context *h = &s->h;
- H264SliceContext *sl = &h->slice_ctx[0];
int i, j, k, m, dir, mode;
int cbp = 0;
uint32_t vlc;
s->topright_samples_available = 0xFFFF;
if (mb_type == 0) { /* SKIP */
- if (h->pict_type == AV_PICTURE_TYPE_P ||
+ if (s->pict_type == AV_PICTURE_TYPE_P ||
s->next_pic->mb_type[mb_xy] == -1) {
svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
0, 0, 0, 0, 0, 0);
- if (h->pict_type == AV_PICTURE_TYPE_B)
+ if (s->pict_type == AV_PICTURE_TYPE_B)
svq3_mc_dir_part(s, 16 * s->mb_x, 16 * s->mb_y, 16, 16,
0, 0, 0, 0, 1, 1);
if (s->mb_x > 0 && s->intra4x4_pred_mode[s->mb2br_xy[mb_xy - 1] + 6] != -1) {
for (i = 0; i < 4; i++)
AV_COPY32(s->mv_cache[m][scan8[0] - 1 + i * 8],
- h->cur_pic.motion_val[m][b_xy - 1 + i * s->b_stride]);
+ s->cur_pic->motion_val[m][b_xy - 1 + i * s->b_stride]);
} else {
for (i = 0; i < 4; i++)
AV_ZERO32(s->mv_cache[m][scan8[0] - 1 + i * 8]);
}
if (s->mb_y > 0) {
memcpy(s->mv_cache[m][scan8[0] - 1 * 8],
- h->cur_pic.motion_val[m][b_xy - s->b_stride],
+ s->cur_pic->motion_val[m][b_xy - s->b_stride],
4 * 2 * sizeof(int16_t));
memset(&s->ref_cache[m][scan8[0] - 1 * 8],
(s->intra4x4_pred_mode[s->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1, 4);
if (s->mb_x < s->mb_width - 1) {
AV_COPY32(s->mv_cache[m][scan8[0] + 4 - 1 * 8],
- h->cur_pic.motion_val[m][b_xy - s->b_stride + 4]);
+ s->cur_pic->motion_val[m][b_xy - s->b_stride + 4]);
s->ref_cache[m][scan8[0] + 4 - 1 * 8] =
(s->intra4x4_pred_mode[s->mb2br_xy[mb_xy - s->mb_stride + 1] + 6] == -1 ||
s->intra4x4_pred_mode[s->mb2br_xy[mb_xy - s->mb_stride]] == -1) ? PART_NOT_AVAILABLE : 1;
s->ref_cache[m][scan8[0] + 4 - 1 * 8] = PART_NOT_AVAILABLE;
if (s->mb_x > 0) {
AV_COPY32(s->mv_cache[m][scan8[0] - 1 - 1 * 8],
- h->cur_pic.motion_val[m][b_xy - s->b_stride - 1]);
+ s->cur_pic->motion_val[m][b_xy - s->b_stride - 1]);
s->ref_cache[m][scan8[0] - 1 - 1 * 8] =
(s->intra4x4_pred_mode[s->mb2br_xy[mb_xy - s->mb_stride - 1] + 3] == -1) ? PART_NOT_AVAILABLE : 1;
} else
memset(&s->ref_cache[m][scan8[0] - 1 * 8 - 1],
PART_NOT_AVAILABLE, 8);
- if (h->pict_type != AV_PICTURE_TYPE_B)
+ if (s->pict_type != AV_PICTURE_TYPE_B)
break;
}
/* decode motion vector(s) and form prediction(s) */
- if (h->pict_type == AV_PICTURE_TYPE_P) {
+ if (s->pict_type == AV_PICTURE_TYPE_P) {
if (svq3_mc_dir(s, mb_type - 1, mode, 0, 0) < 0)
return -1;
} else { /* AV_PICTURE_TYPE_B */
return -1;
} else {
for (i = 0; i < 4; i++)
- memset(h->cur_pic.motion_val[0][b_xy + i * s->b_stride],
+ memset(s->cur_pic->motion_val[0][b_xy + i * s->b_stride],
0, 4 * 2 * sizeof(int16_t));
}
if (mb_type != 1) {
return -1;
} else {
for (i = 0; i < 4; i++)
- memset(h->cur_pic.motion_val[1][b_xy + i * s->b_stride],
+ memset(s->cur_pic->motion_val[1][b_xy + i * s->b_stride],
0, 4 * 2 * sizeof(int16_t));
}
}
mb_type = MB_TYPE_INTRA16x16;
}
- if (!IS_INTER(mb_type) && h->pict_type != AV_PICTURE_TYPE_I) {
+ if (!IS_INTER(mb_type) && s->pict_type != AV_PICTURE_TYPE_I) {
for (i = 0; i < 4; i++)
- memset(h->cur_pic.motion_val[0][b_xy + i * s->b_stride],
+ memset(s->cur_pic->motion_val[0][b_xy + i * s->b_stride],
0, 4 * 2 * sizeof(int16_t));
- if (h->pict_type == AV_PICTURE_TYPE_B) {
+ if (s->pict_type == AV_PICTURE_TYPE_B) {
for (i = 0; i < 4; i++)
- memset(h->cur_pic.motion_val[1][b_xy + i * s->b_stride],
+ memset(s->cur_pic->motion_val[1][b_xy + i * s->b_stride],
0, 4 * 2 * sizeof(int16_t));
}
}
if (!IS_INTRA4x4(mb_type)) {
memset(s->intra4x4_pred_mode + s->mb2br_xy[mb_xy], DC_PRED, 8);
}
- if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) {
- memset(sl->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t));
+ if (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B) {
+ memset(s->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t));
}
if (!IS_INTRA16x16(mb_type) &&
- (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B)) {
+ (!IS_SKIP(mb_type) || s->pict_type == AV_PICTURE_TYPE_B)) {
if ((vlc = svq3_get_ue_golomb(&h->gb)) >= 48U){
av_log(h->avctx, AV_LOG_ERROR, "cbp_vlc=%"PRIu32"\n", vlc);
return -1;
: ff_h264_golomb_to_inter_cbp[vlc];
}
if (IS_INTRA16x16(mb_type) ||
- (h->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
- sl->qscale += svq3_get_se_golomb(&h->gb);
+ (s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
+ s->qscale += svq3_get_se_golomb(&h->gb);
- if (sl->qscale > 31u) {
- av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", sl->qscale);
+ if (s->qscale > 31u) {
+ av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
return -1;
}
}
if (IS_INTRA16x16(mb_type)) {
- AV_ZERO128(sl->mb_luma_dc[0] + 0);
- AV_ZERO128(sl->mb_luma_dc[0] + 8);
- if (svq3_decode_block(&h->gb, sl->mb_luma_dc[0], 0, 1)) {
+ AV_ZERO128(s->mb_luma_dc[0] + 0);
+ AV_ZERO128(s->mb_luma_dc[0] + 8);
+ if (svq3_decode_block(&h->gb, s->mb_luma_dc[0], 0, 1)) {
av_log(h->avctx, AV_LOG_ERROR,
"error while decoding intra luma dc\n");
return -1;
if (cbp) {
const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
- const int type = ((sl->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
+ const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
for (i = 0; i < 4; i++)
if ((cbp & (1 << i))) {
k = index ? (1 * (j & 1) + 2 * (i & 1) +
2 * (j & 2) + 4 * (i & 2))
: (4 * i + j);
- sl->non_zero_count_cache[scan8[k]] = 1;
+ s->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&h->gb, &sl->mb[16 * k], index, type)) {
+ if (svq3_decode_block(&h->gb, &s->mb[16 * k], index, type)) {
av_log(h->avctx, AV_LOG_ERROR,
"error while decoding block\n");
return -1;
if ((cbp & 0x30)) {
for (i = 1; i < 3; ++i)
- if (svq3_decode_block(&h->gb, &sl->mb[16 * 16 * i], 0, 3)) {
+ if (svq3_decode_block(&h->gb, &s->mb[16 * 16 * i], 0, 3)) {
av_log(h->avctx, AV_LOG_ERROR,
"error while decoding chroma dc block\n");
return -1;
for (i = 1; i < 3; i++) {
for (j = 0; j < 4; j++) {
k = 16 * i + j;
- sl->non_zero_count_cache[scan8[k]] = 1;
+ s->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&h->gb, &sl->mb[16 * k], 1, 1)) {
+ if (svq3_decode_block(&h->gb, &s->mb[16 * k], 1, 1)) {
av_log(h->avctx, AV_LOG_ERROR,
"error while decoding chroma ac block\n");
return -1;
}
}
- sl->cbp = cbp;
- h->cur_pic.mb_type[mb_xy] = mb_type;
+ s->cbp = cbp;
+ s->cur_pic->mb_type[mb_xy] = mb_type;
if (IS_INTRA(mb_type))
s->chroma_pred_mode = ff_h264_check_intra_pred_mode(h->avctx, s->top_samples_available,
{
SVQ3Context *s = avctx->priv_data;
H264Context *h = &s->h;
- H264SliceContext *sl = &h->slice_ctx[0];
const int mb_xy = s->mb_xy;
int i, header;
unsigned slice_id;
return -1;
}
- sl->slice_type = ff_h264_golomb_to_pict_type[slice_id];
+ s->pict_type = ff_h264_golomb_to_pict_type[slice_id];
if ((header & 0x9F) == 2) {
- i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
- sl->mb_skip_run = get_bits(&h->gb, i) -
- (s->mb_y * s->mb_width + s->mb_x);
+ i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
+ get_bits(&h->gb, i);
} else {
skip_bits1(&h->gb);
- sl->mb_skip_run = 0;
}
- sl->slice_num = get_bits(&h->gb, 8);
- sl->qscale = get_bits(&h->gb, 5);
+ s->slice_num = get_bits(&h->gb, 8);
+ s->qscale = get_bits(&h->gb, 5);
s->adaptive_quant = get_bits1(&h->gb);
/* unknown fields */
{
SVQ3Context *s = avctx->priv_data;
H264Context *h = &s->h;
- H264SliceContext *sl;
int m, x, y;
unsigned char *extradata;
unsigned char *extradata_end;
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_tpeldsp_init(&s->tdsp);
- sl = h->slice_ctx;
-
h->flags = avctx->flags;
- sl->is_complex = 1;
h->sps.chroma_format_idc = 1;
h->picture_structure = PICT_FRAME;
avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
avctx->color_range = AVCOL_RANGE_JPEG;
- h->slice_ctx[0].chroma_qp[0] = h->slice_ctx[0].chroma_qp[1] = 4;
h->chroma_x_shift = h->chroma_y_shift = 1;
s->halfpel_flag = 1;
static int get_buffer(AVCodecContext *avctx, H264Picture *pic)
{
SVQ3Context *s = avctx->priv_data;
- H264Context *h = &s->h;
- H264SliceContext *sl = &h->slice_ctx[0];
const int big_mb_num = s->mb_stride * (s->mb_height + 1) + 1;
const int mb_array_size = s->mb_stride * s->mb_height;
const int b4_stride = s->mb_width * 4 + 1;
pic->ref_index[i] = pic->ref_index_buf[i]->data;
}
}
- pic->reference = !(h->pict_type == AV_PICTURE_TYPE_B);
+ pic->reference = !(s->pict_type == AV_PICTURE_TYPE_B);
ret = ff_get_buffer(avctx, pic->f,
pic->reference ? AV_GET_BUFFER_FLAG_REF : 0);
return AVERROR(ENOMEM);
}
- sl->linesize = pic->f->linesize[0];
- sl->uvlinesize = pic->f->linesize[1];
-
return 0;
fail:
free_picture(avctx, pic);
{
SVQ3Context *s = avctx->priv_data;
H264Context *h = &s->h;
- H264SliceContext *sl = &h->slice_ctx[0];
int buf_size = avpkt->size;
int left;
uint8_t *buf;
return 0;
}
- sl->mb_x = sl->mb_y = sl->mb_xy = 0;
+ s->mb_x = s->mb_y = s->mb_xy = 0;
if (s->watermark_key) {
av_fast_padded_malloc(&s->buf, &s->buf_size, buf_size);
if (svq3_decode_slice_header(avctx))
return -1;
- h->pict_type = sl->slice_type;
-
- if (h->pict_type != AV_PICTURE_TYPE_B)
+ if (s->pict_type != AV_PICTURE_TYPE_B)
FFSWAP(H264Picture*, s->next_pic, s->last_pic);
av_frame_unref(s->cur_pic->f);
/* for skipping the frame */
- s->cur_pic->f->pict_type = h->pict_type;
- s->cur_pic->f->key_frame = (h->pict_type == AV_PICTURE_TYPE_I);
+ s->cur_pic->f->pict_type = s->pict_type;
+ s->cur_pic->f->key_frame = (s->pict_type == AV_PICTURE_TYPE_I);
ret = get_buffer(avctx, s->cur_pic);
if (ret < 0)
return ret;
- h->cur_pic_ptr = s->cur_pic;
- h->cur_pic = *s->cur_pic;
-
for (i = 0; i < 16; i++) {
- h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * sl->linesize * ((scan8[i] - scan8[0]) >> 3);
- h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * sl->linesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * s->cur_pic->f->linesize[0] * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * s->cur_pic->f->linesize[0] * ((scan8[i] - scan8[0]) >> 3);
}
for (i = 0; i < 16; i++) {
h->block_offset[16 + i] =
- h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * sl->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * s->cur_pic->f->linesize[1] * ((scan8[i] - scan8[0]) >> 3);
h->block_offset[48 + 16 + i] =
- h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * sl->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
+ h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * s->cur_pic->f->linesize[1] * ((scan8[i] - scan8[0]) >> 3);
}
- if (h->pict_type != AV_PICTURE_TYPE_I) {
+ if (s->pict_type != AV_PICTURE_TYPE_I) {
if (!s->last_pic->f->data[0]) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
av_frame_unref(s->last_pic->f);
s->last_pic->f->linesize[2]);
}
- if (h->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f->data[0]) {
+ if (s->pict_type == AV_PICTURE_TYPE_B && !s->next_pic->f->data[0]) {
av_log(avctx, AV_LOG_ERROR, "Missing reference frame.\n");
av_frame_unref(s->next_pic->f);
ret = get_buffer(avctx, s->next_pic);
if (avctx->debug & FF_DEBUG_PICT_INFO)
av_log(h->avctx, AV_LOG_DEBUG,
"%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
- av_get_picture_type_char(h->pict_type),
+ av_get_picture_type_char(s->pict_type),
s->halfpel_flag, s->thirdpel_flag,
- s->adaptive_quant, h->slice_ctx[0].qscale, sl->slice_num);
+ s->adaptive_quant, s->qscale, s->slice_num);
- if (avctx->skip_frame >= AVDISCARD_NONREF && h->pict_type == AV_PICTURE_TYPE_B ||
- avctx->skip_frame >= AVDISCARD_NONKEY && h->pict_type != AV_PICTURE_TYPE_I ||
+ if (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B ||
+ avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I ||
avctx->skip_frame >= AVDISCARD_ALL)
return 0;
if (s->next_p_frame_damaged) {
- if (h->pict_type == AV_PICTURE_TYPE_B)
+ if (s->pict_type == AV_PICTURE_TYPE_B)
return 0;
else
s->next_p_frame_damaged = 0;
}
- if (h->pict_type == AV_PICTURE_TYPE_B) {
- h->frame_num_offset = sl->slice_num - h->prev_frame_num;
+ if (s->pict_type == AV_PICTURE_TYPE_B) {
+ h->frame_num_offset = s->slice_num - h->prev_frame_num;
if (h->frame_num_offset < 0)
h->frame_num_offset += 256;
}
} else {
h->prev_frame_num = h->frame_num;
- h->frame_num = sl->slice_num;
+ h->frame_num = s->slice_num;
h->prev_frame_num_offset = h->frame_num - h->prev_frame_num;
if (h->prev_frame_num_offset < 0)
mb_type = svq3_get_ue_golomb(&h->gb);
- if (h->pict_type == AV_PICTURE_TYPE_I)
+ if (s->pict_type == AV_PICTURE_TYPE_I)
mb_type += 8;
- else if (h->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
+ else if (s->pict_type == AV_PICTURE_TYPE_B && mb_type >= 4)
mb_type += 4;
if (mb_type > 33 || svq3_decode_mb(s, mb_type)) {
av_log(h->avctx, AV_LOG_ERROR,
return -1;
}
- if (mb_type != 0 || sl->cbp)
- hl_decode_mb(s, h, &h->slice_ctx[0]);
+ if (mb_type != 0 || s->cbp)
+ hl_decode_mb(s, h);
- if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
- h->cur_pic.mb_type[s->mb_x + s->mb_y * s->mb_stride] =
- (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
+ if (s->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
+ s->cur_pic->mb_type[s->mb_x + s->mb_y * s->mb_stride] =
+ (s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1;
}
ff_draw_horiz_band(avctx, s->cur_pic->f,
left = buf_size*8 - get_bits_count(&h->gb);
- if (sl->mb_y != h->mb_height || sl->mb_x != h->mb_width) {
- av_log(avctx, AV_LOG_INFO, "frame num %d incomplete pic x %d y %d left %d\n", avctx->frame_number, sl->mb_y, sl->mb_x, left);
+ if (s->mb_y != h->mb_height || s->mb_x != h->mb_width) {
+ av_log(avctx, AV_LOG_INFO, "frame num %d incomplete pic x %d y %d left %d\n", avctx->frame_number, s->mb_y, s->mb_x, left);
//av_hex_dump(stderr, buf+buf_size-8, 8);
}
return -1;
}
- if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
+ if (s->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
ret = av_frame_ref(data, s->cur_pic->f);
else if (s->last_pic->f->data[0])
ret = av_frame_ref(data, s->last_pic->f);
if (s->last_pic->f->data[0] || h->low_delay)
*got_frame = 1;
- if (h->pict_type != AV_PICTURE_TYPE_B) {
+ if (s->pict_type != AV_PICTURE_TYPE_B) {
FFSWAP(H264Picture*, s->cur_pic, s->next_pic);
} else {
av_frame_unref(s->cur_pic->f);
av_freep(&s->edge_emu_buffer);
av_freep(&s->mb2br_xy);
- memset(&h->cur_pic, 0, sizeof(h->cur_pic));
-
ff_h264_free_context(h);
av_freep(&s->buf);
projects / ffmpeg / blobdiff