ca6b85aa4e
Patch 1 to Patch 3 is an initial implementation of 8x8 intra prediction modes, here are with the following assumptions: a. 8x8 has 4 prediction modes DC, H, V and TM b. UV 4x4 block use the same mode as corresponding 8x8 area c. i8x8 modes are enabled for key frame only for now Patch 4: d. removed debug code from previous patches Patch 5: e. added stats code to collect entropy stats and further cleaned up Patch 6: f. changed mode stats code to collect finer stats of modes Patch 7: g. normalized i8x8 modes distribution to total at 256 (8bits). Patch 8: h. fixed a bug in decoder and removed debug printf output. Patch 9: i. more cleanups to address paul's comment Patch 10: j. messy rebase/merges to bring the commit up to date. Tests on HD clips encoded with all key frame showing consistent gain on all clips and all metrics:~0.5%(psnr) and 0.6%(ssim): http://www.corp.google.com/~yaowu/no_crawl/i8x8hd_allkey_fixedq.html To build and test, configure with: --enable-experimental --enable-i8x8 Change-Id: I9813fe07ae48cab5fdb5d904bca022514ad01e7f
188 lines
5.5 KiB
C
188 lines
5.5 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef __INC_RECON_H
|
|
#define __INC_RECON_H
|
|
|
|
#include "blockd.h"
|
|
|
|
#define prototype_copy_block(sym) \
|
|
void sym(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch)
|
|
|
|
#define prototype_recon_block(sym) \
|
|
void sym(unsigned char *pred, short *diff, unsigned char *dst, int pitch)
|
|
|
|
#define prototype_recon_macroblock(sym) \
|
|
void sym(const struct vp8_recon_rtcd_vtable *rtcd, MACROBLOCKD *x)
|
|
|
|
#define prototype_build_intra_predictors(sym) \
|
|
void sym(MACROBLOCKD *x)
|
|
|
|
#define prototype_intra4x4_predict(sym) \
|
|
void sym(BLOCKD *x, int b_mode, unsigned char *predictor)
|
|
|
|
struct vp8_recon_rtcd_vtable;
|
|
|
|
#if ARCH_X86 || ARCH_X86_64
|
|
#include "x86/recon_x86.h"
|
|
#endif
|
|
|
|
#if ARCH_ARM
|
|
#include "arm/recon_arm.h"
|
|
#endif
|
|
|
|
#ifndef vp8_recon_copy16x16
|
|
#define vp8_recon_copy16x16 vp8_copy_mem16x16_c
|
|
#endif
|
|
extern prototype_copy_block(vp8_recon_copy16x16);
|
|
|
|
#ifndef vp8_recon_copy8x8
|
|
#define vp8_recon_copy8x8 vp8_copy_mem8x8_c
|
|
#endif
|
|
extern prototype_copy_block(vp8_recon_copy8x8);
|
|
|
|
#ifndef vp8_recon_copy8x4
|
|
#define vp8_recon_copy8x4 vp8_copy_mem8x4_c
|
|
#endif
|
|
extern prototype_copy_block(vp8_recon_copy8x4);
|
|
|
|
#ifndef vp8_recon_recon
|
|
#define vp8_recon_recon vp8_recon_b_c
|
|
#endif
|
|
extern prototype_recon_block(vp8_recon_recon);
|
|
|
|
#if CONFIG_I8X8
|
|
#ifndef vp8_recon_recon_uv
|
|
#define vp8_recon_recon_uv vp8_recon_uv_b_c
|
|
#endif
|
|
extern prototype_recon_block(vp8_recon_recon_uv);
|
|
#endif
|
|
|
|
extern prototype_recon_block(vp8_recon_recon);
|
|
#ifndef vp8_recon_recon2
|
|
#define vp8_recon_recon2 vp8_recon2b_c
|
|
#endif
|
|
extern prototype_recon_block(vp8_recon_recon2);
|
|
|
|
#ifndef vp8_recon_recon4
|
|
#define vp8_recon_recon4 vp8_recon4b_c
|
|
#endif
|
|
extern prototype_recon_block(vp8_recon_recon4);
|
|
|
|
#ifndef vp8_recon_recon_mb
|
|
#define vp8_recon_recon_mb vp8_recon_mb_c
|
|
#endif
|
|
extern prototype_recon_macroblock(vp8_recon_recon_mb);
|
|
|
|
#ifndef vp8_recon_recon_mby
|
|
#define vp8_recon_recon_mby vp8_recon_mby_c
|
|
#endif
|
|
extern prototype_recon_macroblock(vp8_recon_recon_mby);
|
|
|
|
#ifndef vp8_recon_build_intra_predictors_mby
|
|
#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra_predictors_mby);
|
|
|
|
#if CONFIG_I8X8
|
|
#ifndef vp8_recon_build_intra8x8_predictors_mby
|
|
#define vp8_recon_build_intra8x8_predictors_mby vp8_build_intra8x8_predictors_mby
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra8x8_predictors_mby);
|
|
#endif
|
|
|
|
#ifndef vp8_recon_build_intra_predictors_mby_s
|
|
#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra_predictors_mby_s);
|
|
|
|
#ifndef vp8_recon_build_intra_predictors_mbuv
|
|
#define vp8_recon_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra_predictors_mbuv);
|
|
|
|
#if CONFIG_I8X8
|
|
#ifndef vp8_recon_build_intra8x8_predictors_mbuv
|
|
#define vp8_recon_build_intra8x8_predictors_mbuv vp8_build_intra8x8_predictors_mbuv
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra8x8_predictors_mbuv);
|
|
#endif
|
|
|
|
#ifndef vp8_recon_build_intra_predictors_mbuv_s
|
|
#define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s
|
|
#endif
|
|
extern prototype_build_intra_predictors\
|
|
(vp8_recon_build_intra_predictors_mbuv_s);
|
|
|
|
#ifndef vp8_recon_intra4x4_predict
|
|
#define vp8_recon_intra4x4_predict vp8_intra4x4_predict
|
|
#endif
|
|
extern prototype_intra4x4_predict\
|
|
(vp8_recon_intra4x4_predict);
|
|
|
|
#if CONFIG_I8X8
|
|
#ifndef vp8_recon_intra8x8_predict
|
|
#define vp8_recon_intra8x8_predict vp8_intra8x8_predict
|
|
#endif
|
|
extern prototype_intra4x4_predict\
|
|
(vp8_recon_intra8x8_predict);
|
|
|
|
#ifndef vp8_recon_intra_uv4x4_predict
|
|
#define vp8_recon_intra_uv4x4_predict vp8_intra_uv4x4_predict
|
|
#endif
|
|
extern prototype_intra4x4_predict\
|
|
(vp8_recon_intra_uv4x4_predict);
|
|
|
|
#endif
|
|
|
|
typedef prototype_copy_block((*vp8_copy_block_fn_t));
|
|
typedef prototype_recon_block((*vp8_recon_fn_t));
|
|
typedef prototype_recon_macroblock((*vp8_recon_mb_fn_t));
|
|
typedef prototype_build_intra_predictors((*vp8_build_intra_pred_fn_t));
|
|
typedef prototype_intra4x4_predict((*vp8_intra4x4_pred_fn_t));
|
|
typedef struct vp8_recon_rtcd_vtable
|
|
{
|
|
vp8_copy_block_fn_t copy16x16;
|
|
vp8_copy_block_fn_t copy8x8;
|
|
vp8_copy_block_fn_t copy8x4;
|
|
vp8_recon_fn_t recon;
|
|
#if CONFIG_I8X8
|
|
vp8_recon_fn_t recon_uv;
|
|
#endif
|
|
vp8_recon_fn_t recon2;
|
|
vp8_recon_fn_t recon4;
|
|
vp8_recon_mb_fn_t recon_mb;
|
|
vp8_recon_mb_fn_t recon_mby;
|
|
vp8_build_intra_pred_fn_t build_intra_predictors_mby_s;
|
|
vp8_build_intra_pred_fn_t build_intra_predictors_mby;
|
|
vp8_build_intra_pred_fn_t build_intra_predictors_mbuv_s;
|
|
vp8_build_intra_pred_fn_t build_intra_predictors_mbuv;
|
|
vp8_intra4x4_pred_fn_t intra4x4_predict;
|
|
#if CONFIG_I8X8
|
|
vp8_intra4x4_pred_fn_t intra8x8_predict;
|
|
vp8_intra4x4_pred_fn_t intra_uv4x4_predict;
|
|
#endif
|
|
} vp8_recon_rtcd_vtable_t;
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
#define RECON_INVOKE(ctx,fn) (ctx)->fn
|
|
#else
|
|
#define RECON_INVOKE(ctx,fn) vp8_recon_##fn
|
|
#endif
|
|
|
|
void vp8_recon_intra_mbuv(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x);
|
|
#endif
|