s->dest[1] += (16 >> s->chroma_x_shift) - 8;
s->dest[2] += (16 >> s->chroma_x_shift) - 8;
- if (CONFIG_H264_DECODER && s->codec_id == CODEC_ID_H264) {
+ if (CONFIG_H264_DECODER && s->codec_id == AV_CODEC_ID_H264) {
H264Context *h = (void*)s;
h->mb_xy = s->mb_x + s->mb_y * s->mb_stride;
memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));
*/
static void set_mv_strides(MpegEncContext *s, int *mv_step, int *stride)
{
- if (s->codec_id == CODEC_ID_H264) {
+ if (s->codec_id == AV_CODEC_ID_H264) {
H264Context *h = (void*)s;
av_assert0(s->quarter_sample);
*mv_step = 4;
static void guess_mv(MpegEncContext *s)
{
- uint8_t *fixed = av_malloc(s->mb_stride * s->mb_height);
+ uint8_t *fixed = s->er_temp_buffer;
#define MV_FROZEN 3
#define MV_CHANGED 2
#define MV_UNCHANGED 1
decode_mb(s, 0);
}
}
- goto end;
+ return;
}
for (depth = 0; ; depth++) {
pred_count++;
if (!fixed[mb_xy] && 0) {
- if (s->avctx->codec_id == CODEC_ID_H264) {
+ if (s->avctx->codec_id == AV_CODEC_ID_H264) {
// FIXME
} else {
ff_thread_await_progress(&s->last_picture_ptr->f,
}
if (none_left)
- goto end;
+ return;
for (i = 0; i < s->mb_num; i++) {
int mb_xy = s->mb_index2xy[i];
}
// printf(":"); fflush(stdout);
}
-end:
- av_free(fixed);
}
static int is_intra_more_likely(MpegEncContext *s)
undamaged_count++;
}
- if (s->codec_id == CODEC_ID_H264) {
+ if (s->codec_id == AV_CODEC_ID_H264) {
H264Context *h = (void*) s;
if (h->list_count <= 0 || h->ref_count[0] <= 0 ||
!h->ref_list[0][0].f.data[0])
uint8_t *last_mb_ptr = s->last_picture.f.data[0] +
mb_x * 16 + mb_y * 16 * s->linesize;
- if (s->avctx->codec_id == CODEC_ID_H264) {
+ if (s->avctx->codec_id == AV_CODEC_ID_H264) {
// FIXME
} else {
ff_thread_await_progress(&s->last_picture_ptr->f,
if (error & ER_MV_ERROR)
mv_error++;
}
- av_log(s->avctx, AV_LOG_INFO, "concealing %d DC, %d AC, %d MV errors\n",
- dc_error, ac_error, mv_error);
+ av_log(s->avctx, AV_LOG_INFO, "concealing %d DC, %d AC, %d MV errors in %c frame\n",
+ dc_error, ac_error, mv_error, av_get_picture_type_char(s->pict_type));
is_intra_likely = is_intra_more_likely(s);
int time_pp = s->pp_time;
int time_pb = s->pb_time;
- if (s->avctx->codec_id == CODEC_ID_H264) {
+ if (s->avctx->codec_id == AV_CODEC_ID_H264) {
// FIXME
} else {
ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0);