#include "avcodec.h"
#include "mpegutils.h"
#include "h264.h"
-#include "h264_mvpred.h"
#include "h264data.h"
#include "golomb.h"
#include "hpeldsp.h"
*/
typedef struct SVQ3Context {
- H264Context h;
+ AVCodecContext *avctx;
H264DSPContext h264dsp;
H264PredContext hpc;
H264Picture *next_pic;
H264Picture *last_pic;
GetBitContext gb;
+ GetBitContext gb_slice;
uint8_t *slice_buf;
int slice_size;
int halfpel_flag;
int slice_num;
int qscale;
int cbp;
+ int frame_num;
+ int frame_num_offset;
+ int prev_frame_num_offset;
+ int prev_frame_num;
enum AVPictureType pict_type;
+ int low_delay;
int mb_x, mb_y;
int mb_xy;
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];
+ int block_offset[2 * (16 * 3)];
} SVQ3Context;
#define FULLPEL_MODE 1
int mx, int my, int dxy,
int thirdpel, int dir, int avg)
{
- H264Context *h = &s->h;
const H264Picture *pic = (dir == 0) ? s->last_pic : s->next_pic;
uint8_t *src, *dest;
int i, emu = 0;
: s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, linesize,
height);
- if (!(h->flags & AV_CODEC_FLAG_GRAY)) {
+ if (!(s->avctx->flags & AV_CODEC_FLAG_GRAY)) {
mx = mx + (mx < (int) x) >> 1;
my = my + (my < (int) y) >> 1;
width = width >> 1;
int dir, int avg)
{
int i, j, k, mx, my, dx, dy, x, y;
- H264Context *h = &s->h;
const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1);
const int part_height = 16 >> ((unsigned)(size + 1) / 3);
const int extra_width = (mode == PREDICT_MODE) ? -16 * 6 : 0;
my = s->next_pic->motion_val[0][b_xy][1] << 1;
if (dir == 0) {
- mx = mx * h->frame_num_offset /
- h->prev_frame_num_offset + 1 >> 1;
- my = my * h->frame_num_offset /
- h->prev_frame_num_offset + 1 >> 1;
+ mx = mx * s->frame_num_offset /
+ s->prev_frame_num_offset + 1 >> 1;
+ my = my * s->frame_num_offset /
+ s->prev_frame_num_offset + 1 >> 1;
} else {
- mx = mx * (h->frame_num_offset - h->prev_frame_num_offset) /
- h->prev_frame_num_offset + 1 >> 1;
- my = my * (h->frame_num_offset - h->prev_frame_num_offset) /
- h->prev_frame_num_offset + 1 >> 1;
+ mx = mx * (s->frame_num_offset - s->prev_frame_num_offset) /
+ s->prev_frame_num_offset + 1 >> 1;
+ my = my * (s->frame_num_offset - s->prev_frame_num_offset) /
+ s->prev_frame_num_offset + 1 >> 1;
}
}
if (mode == PREDICT_MODE) {
dx = dy = 0;
} else {
- dy = svq3_get_se_golomb(&h->gb);
- dx = svq3_get_se_golomb(&h->gb);
+ dy = svq3_get_se_golomb(&s->gb_slice);
+ dx = svq3_get_se_golomb(&s->gb_slice);
if (dx == INVALID_VLC || dy == INVALID_VLC) {
- av_log(h->avctx, AV_LOG_ERROR, "invalid MV vlc\n");
+ av_log(s->avctx, AV_LOG_ERROR, "invalid MV vlc\n");
return -1;
}
}
}
static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s,
- const H264Context *h,
int mb_type,
const int *block_offset,
int linesize,
}
}
-static void hl_decode_mb(SVQ3Context *s, const H264Context *h)
+static void hl_decode_mb(SVQ3Context *s)
{
const int mb_x = s->mb_x;
const int mb_y = s->mb_y;
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;
+ const int *block_offset = &s->block_offset[0];
+ const int block_h = 16 >> 1;
linesize = s->cur_pic->f->linesize[0];
uvlinesize = s->cur_pic->f->linesize[1];
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, mb_type, block_offset, linesize, dest_y);
+ hl_decode_mb_predict_luma(s, mb_type, block_offset, linesize, dest_y);
}
hl_decode_mb_idct_luma(s, mb_type, block_offset, linesize, dest_y);
static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
{
- H264Context *h = &s->h;
int i, j, k, m, dir, mode;
int cbp = 0;
uint32_t vlc;
mb_type = MB_TYPE_16x16;
}
} else if (mb_type < 8) { /* INTER */
- if (s->thirdpel_flag && s->halfpel_flag == !get_bits1(&h->gb))
+ if (s->thirdpel_flag && s->halfpel_flag == !get_bits1(&s->gb_slice))
mode = THIRDPEL_MODE;
else if (s->halfpel_flag &&
- s->thirdpel_flag == !get_bits1(&h->gb))
+ s->thirdpel_flag == !get_bits1(&s->gb_slice))
mode = HALFPEL_MODE;
else
mode = FULLPEL_MODE;
/* decode prediction codes for luma blocks */
for (i = 0; i < 16; i += 2) {
- vlc = svq3_get_ue_golomb(&h->gb);
+ vlc = svq3_get_ue_golomb(&s->gb_slice);
if (vlc >= 25U) {
- av_log(h->avctx, AV_LOG_ERROR,
+ av_log(s->avctx, AV_LOG_ERROR,
"luma prediction:%"PRIu32"\n", vlc);
return -1;
}
left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];
if (left[1] == -1 || left[2] == -1) {
- av_log(h->avctx, AV_LOG_ERROR, "weird prediction\n");
+ av_log(s->avctx, AV_LOG_ERROR, "weird prediction\n");
return -1;
}
}
if (mb_type == 8) {
ff_h264_check_intra4x4_pred_mode(s->intra4x4_pred_mode_cache,
- h->avctx, s->top_samples_available,
+ s->avctx, s->top_samples_available,
s->left_samples_available);
s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
dir = ff_h264_i_mb_type_info[mb_type - 8].pred_mode;
dir = (dir >> 1) ^ 3 * (dir & 1) ^ 1;
- if ((s->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(h->avctx, s->top_samples_available,
+ if ((s->intra16x16_pred_mode = ff_h264_check_intra_pred_mode(s->avctx, s->top_samples_available,
s->left_samples_available, dir, 0)) < 0) {
- av_log(h->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n");
+ av_log(s->avctx, AV_LOG_ERROR, "ff_h264_check_intra_pred_mode < 0\n");
return s->intra16x16_pred_mode;
}
if (!IS_INTRA16x16(mb_type) &&
(!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);
+ if ((vlc = svq3_get_ue_golomb(&s->gb_slice)) >= 48U){
+ av_log(s->avctx, AV_LOG_ERROR, "cbp_vlc=%"PRIu32"\n", vlc);
return -1;
}
}
if (IS_INTRA16x16(mb_type) ||
(s->pict_type != AV_PICTURE_TYPE_I && s->adaptive_quant && cbp)) {
- s->qscale += svq3_get_se_golomb(&h->gb);
+ s->qscale += svq3_get_se_golomb(&s->gb_slice);
if (s->qscale > 31u) {
- av_log(h->avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
+ av_log(s->avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
return -1;
}
}
if (IS_INTRA16x16(mb_type)) {
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,
+ if (svq3_decode_block(&s->gb_slice, s->mb_luma_dc[0], 0, 1)) {
+ av_log(s->avctx, AV_LOG_ERROR,
"error while decoding intra luma dc\n");
return -1;
}
: (4 * i + j);
s->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&h->gb, &s->mb[16 * k], index, type)) {
- av_log(h->avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&s->gb_slice, &s->mb[16 * k], index, type)) {
+ av_log(s->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, &s->mb[16 * 16 * i], 0, 3)) {
- av_log(h->avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&s->gb_slice, &s->mb[16 * 16 * i], 0, 3)) {
+ av_log(s->avctx, AV_LOG_ERROR,
"error while decoding chroma dc block\n");
return -1;
}
k = 16 * i + j;
s->non_zero_count_cache[scan8[k]] = 1;
- if (svq3_decode_block(&h->gb, &s->mb[16 * k], 1, 1)) {
- av_log(h->avctx, AV_LOG_ERROR,
+ if (svq3_decode_block(&s->gb_slice, &s->mb[16 * k], 1, 1)) {
+ av_log(s->avctx, AV_LOG_ERROR,
"error while decoding chroma ac block\n");
return -1;
}
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,
+ s->chroma_pred_mode = ff_h264_check_intra_pred_mode(s->avctx, s->top_samples_available,
s->left_samples_available, DC_PRED8x8, 1);
return 0;
static int svq3_decode_slice_header(AVCodecContext *avctx)
{
SVQ3Context *s = avctx->priv_data;
- H264Context *h = &s->h;
const int mb_xy = s->mb_xy;
int i, header;
unsigned slice_id;
memcpy(s->slice_buf, s->gb.buffer + s->gb.index / 8, slice_bytes);
- init_get_bits(&h->gb, s->slice_buf, slice_bits);
+ init_get_bits(&s->gb_slice, s->slice_buf, slice_bits);
if (s->watermark_key) {
- uint32_t header = AV_RL32(&h->gb.buffer[1]);
- AV_WL32(&h->gb.buffer[1], header ^ s->watermark_key);
+ uint32_t header = AV_RL32(&s->gb_slice.buffer[1]);
+ AV_WL32(&s->gb_slice.buffer[1], header ^ s->watermark_key);
}
if (length > 0) {
memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1);
skip_bits_long(&s->gb, slice_bytes * 8);
}
- if ((slice_id = svq3_get_ue_golomb(&h->gb)) >= 3) {
- av_log(h->avctx, AV_LOG_ERROR, "illegal slice type %u \n", slice_id);
+ if ((slice_id = svq3_get_ue_golomb(&s->gb_slice)) >= 3) {
+ av_log(s->avctx, AV_LOG_ERROR, "illegal slice type %u \n", slice_id);
return -1;
}
if ((header & 0x9F) == 2) {
i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1));
- get_bits(&h->gb, i);
+ get_bits(&s->gb_slice, i);
} else {
- skip_bits1(&h->gb);
+ skip_bits1(&s->gb_slice);
}
- s->slice_num = get_bits(&h->gb, 8);
- s->qscale = get_bits(&h->gb, 5);
- s->adaptive_quant = get_bits1(&h->gb);
+ s->slice_num = get_bits(&s->gb_slice, 8);
+ s->qscale = get_bits(&s->gb_slice, 5);
+ s->adaptive_quant = get_bits1(&s->gb_slice);
/* unknown fields */
- skip_bits1(&h->gb);
+ skip_bits1(&s->gb_slice);
if (s->has_watermark)
- skip_bits1(&h->gb);
+ skip_bits1(&s->gb_slice);
- skip_bits1(&h->gb);
- skip_bits(&h->gb, 2);
+ skip_bits1(&s->gb_slice);
+ skip_bits(&s->gb_slice, 2);
- if (skip_1stop_8data_bits(&h->gb) < 0)
+ if (skip_1stop_8data_bits(&s->gb_slice) < 0)
return AVERROR_INVALIDDATA;
/* reset intra predictors and invalidate motion vector references */
static av_cold int svq3_decode_init(AVCodecContext *avctx)
{
SVQ3Context *s = avctx->priv_data;
- H264Context *h = &s->h;
int m, x, y;
unsigned char *extradata;
unsigned char *extradata_end;
if (!s->cur_pic->f || !s->last_pic->f || !s->next_pic->f)
return AVERROR(ENOMEM);
- if ((ret = ff_h264_decode_init(avctx)) < 0)
- goto fail;
-
- // we will overwrite it later during decoding
- av_frame_free(&h->cur_pic.f);
-
- av_frame_free(&h->last_pic_for_ec.f);
-
ff_h264dsp_init(&s->h264dsp, 8, 1);
- av_assert0(h->sps.bit_depth_chroma == 0);
ff_h264_pred_init(&s->hpc, AV_CODEC_ID_SVQ3, 8, 1);
ff_videodsp_init(&s->vdsp, 8);
avctx->bits_per_raw_sample = 8;
- h->sps.bit_depth_luma = 8;
- h->chroma_format_idc = 1;
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_tpeldsp_init(&s->tdsp);
- h->flags = avctx->flags;
- 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->chroma_x_shift = h->chroma_y_shift = 1;
-
+ s->avctx = avctx;
s->halfpel_flag = 1;
s->thirdpel_flag = 1;
s->has_watermark = 0;
unk2 = get_bits1(&gb);
unk3 = get_bits1(&gb);
- h->low_delay = get_bits1(&gb);
+ s->low_delay = get_bits1(&gb);
/* unknown field */
unk4 = get_bits1(&gb);
}
s->has_watermark = get_bits1(&gb);
- avctx->has_b_frames = !h->low_delay;
+ avctx->has_b_frames = !s->low_delay;
if (s->has_watermark) {
#if CONFIG_ZLIB
unsigned watermark_width = svq3_get_ue_golomb(&gb);
int *got_frame, AVPacket *avpkt)
{
SVQ3Context *s = avctx->priv_data;
- H264Context *h = &s->h;
int buf_size = avpkt->size;
int left;
uint8_t *buf;
/* special case for last picture */
if (buf_size == 0) {
- if (s->next_pic->f->data[0] && !h->low_delay && !s->last_frame_output) {
+ if (s->next_pic->f->data[0] && !s->low_delay && !s->last_frame_output) {
ret = av_frame_ref(data, s->next_pic->f);
if (ret < 0)
return ret;
return ret;
for (i = 0; i < 16; i++) {
- 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);
+ s->block_offset[i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * s->cur_pic->f->linesize[0] * ((scan8[i] - scan8[0]) >> 3);
+ s->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 * 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 * s->cur_pic->f->linesize[1] * ((scan8[i] - scan8[0]) >> 3);
+ s->block_offset[16 + i] =
+ s->block_offset[32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 4 * s->cur_pic->f->linesize[1] * ((scan8[i] - scan8[0]) >> 3);
+ s->block_offset[48 + 16 + i] =
+ s->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7)) + 8 * s->cur_pic->f->linesize[1] * ((scan8[i] - scan8[0]) >> 3);
}
if (s->pict_type != AV_PICTURE_TYPE_I) {
}
if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(h->avctx, AV_LOG_DEBUG,
+ av_log(s->avctx, AV_LOG_DEBUG,
"%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
av_get_picture_type_char(s->pict_type),
s->halfpel_flag, s->thirdpel_flag,
}
if (s->pict_type == AV_PICTURE_TYPE_B) {
- h->frame_num_offset = s->slice_num - h->prev_frame_num;
+ s->frame_num_offset = s->slice_num - s->prev_frame_num;
- if (h->frame_num_offset < 0)
- h->frame_num_offset += 256;
- if (h->frame_num_offset == 0 ||
- h->frame_num_offset >= h->prev_frame_num_offset) {
- av_log(h->avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
+ if (s->frame_num_offset < 0)
+ s->frame_num_offset += 256;
+ if (s->frame_num_offset == 0 ||
+ s->frame_num_offset >= s->prev_frame_num_offset) {
+ av_log(s->avctx, AV_LOG_ERROR, "error in B-frame picture id\n");
return -1;
}
} else {
- h->prev_frame_num = h->frame_num;
- h->frame_num = s->slice_num;
- h->prev_frame_num_offset = h->frame_num - h->prev_frame_num;
+ s->prev_frame_num = s->frame_num;
+ s->frame_num = s->slice_num;
+ s->prev_frame_num_offset = s->frame_num - s->prev_frame_num;
- if (h->prev_frame_num_offset < 0)
- h->prev_frame_num_offset += 256;
+ if (s->prev_frame_num_offset < 0)
+ s->prev_frame_num_offset += 256;
}
for (m = 0; m < 2; m++) {
unsigned mb_type;
s->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
- if ((get_bits_left(&h->gb)) <= 7) {
- if (((get_bits_count(&h->gb) & 7) == 0 ||
- show_bits(&h->gb, get_bits_left(&h->gb) & 7) == 0)) {
+ if ((get_bits_left(&s->gb_slice)) <= 7) {
+ if (((get_bits_count(&s->gb_slice) & 7) == 0 ||
+ show_bits(&s->gb_slice, get_bits_left(&s->gb_slice) & 7) == 0)) {
if (svq3_decode_slice_header(avctx))
return -1;
/* TODO: support s->mb_skip_run */
}
- mb_type = svq3_get_ue_golomb(&h->gb);
+ mb_type = svq3_get_ue_golomb(&s->gb_slice);
if (s->pict_type == AV_PICTURE_TYPE_I)
mb_type += 8;
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,
+ av_log(s->avctx, AV_LOG_ERROR,
"error while decoding MB %d %d\n", s->mb_x, s->mb_y);
return -1;
}
if (mb_type != 0 || s->cbp)
- hl_decode_mb(s, h);
+ hl_decode_mb(s);
- if (s->pict_type != AV_PICTURE_TYPE_B && !h->low_delay)
+ if (s->pict_type != AV_PICTURE_TYPE_B && !s->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,
s->last_pic->f->data[0] ? s->last_pic->f : NULL,
- 16 * s->mb_y, 16, h->picture_structure, 0,
- h->low_delay);
+ 16 * s->mb_y, 16, PICT_FRAME, 0,
+ s->low_delay);
}
- left = buf_size*8 - get_bits_count(&h->gb);
+ left = buf_size*8 - get_bits_count(&s->gb_slice);
- if (s->mb_y != h->mb_height || s->mb_x != h->mb_width) {
+ if (s->mb_y != s->mb_height || s->mb_x != s->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 (s->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
+ if (s->pict_type == AV_PICTURE_TYPE_B || s->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);
return ret;
/* Do not output the last pic after seeking. */
- if (s->last_pic->f->data[0] || h->low_delay)
+ if (s->last_pic->f->data[0] || s->low_delay)
*got_frame = 1;
if (s->pict_type != AV_PICTURE_TYPE_B) {
static av_cold int svq3_decode_end(AVCodecContext *avctx)
{
SVQ3Context *s = avctx->priv_data;
- H264Context *h = &s->h;
free_picture(avctx, s->cur_pic);
free_picture(avctx, s->next_pic);
av_freep(&s->edge_emu_buffer);
av_freep(&s->mb2br_xy);
- ff_h264_free_context(h);
av_freep(&s->buf);
s->buf_size = 0;
projects / ffmpeg / blobdiff