Commit 56c2f41c authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Renaming VP9D_COMP & VP9Decompressor to VP9Decoder.

Change-Id: Ieb9b455b8aaef9884391021b7f640ef24c554687
parent e2ab65ab
...@@ -671,7 +671,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm, ...@@ -671,7 +671,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
setup_display_size(cm, rb); setup_display_size(cm, rb);
} }
static void decode_tile(VP9D_COMP *pbi, const TileInfo *const tile, static void decode_tile(VP9Decoder *pbi, const TileInfo *const tile,
vp9_reader *r) { vp9_reader *r) {
const int num_threads = pbi->oxcf.max_threads; const int num_threads = pbi->oxcf.max_threads;
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
...@@ -776,7 +776,7 @@ typedef struct TileBuffer { ...@@ -776,7 +776,7 @@ typedef struct TileBuffer {
int col; // only used with multi-threaded decoding int col; // only used with multi-threaded decoding
} TileBuffer; } TileBuffer;
static const uint8_t *decode_tiles(VP9D_COMP *pbi, static const uint8_t *decode_tiles(VP9Decoder *pbi,
const uint8_t *data, const uint8_t *data,
const uint8_t *data_end) { const uint8_t *data_end) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
...@@ -865,7 +865,7 @@ static int compare_tile_buffers(const void *a, const void *b) { ...@@ -865,7 +865,7 @@ static int compare_tile_buffers(const void *a, const void *b) {
} }
} }
static const uint8_t *decode_tiles_mt(VP9D_COMP *pbi, static const uint8_t *decode_tiles_mt(VP9Decoder *pbi,
const uint8_t *data, const uint8_t *data,
const uint8_t *data_end) { const uint8_t *data_end) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
...@@ -1010,7 +1010,7 @@ static void error_handler(void *data) { ...@@ -1010,7 +1010,7 @@ static void error_handler(void *data) {
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, \ vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, \
"Reserved bit must be unset") "Reserved bit must be unset")
static size_t read_uncompressed_header(VP9D_COMP *pbi, static size_t read_uncompressed_header(VP9Decoder *pbi,
struct vp9_read_bit_buffer *rb) { struct vp9_read_bit_buffer *rb) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
size_t sz; size_t sz;
...@@ -1147,7 +1147,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, ...@@ -1147,7 +1147,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
return sz; return sz;
} }
static int read_compressed_header(VP9D_COMP *pbi, const uint8_t *data, static int read_compressed_header(VP9Decoder *pbi, const uint8_t *data,
size_t partition_size) { size_t partition_size) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
MACROBLOCKD *const xd = &pbi->mb; MACROBLOCKD *const xd = &pbi->mb;
...@@ -1247,7 +1247,7 @@ static void debug_check_frame_counts(const VP9_COMMON *const cm) { ...@@ -1247,7 +1247,7 @@ static void debug_check_frame_counts(const VP9_COMMON *const cm) {
} }
#endif // NDEBUG #endif // NDEBUG
int vp9_decode_frame(VP9D_COMP *pbi, int vp9_decode_frame(VP9Decoder *pbi,
const uint8_t *data, const uint8_t *data_end, const uint8_t *data, const uint8_t *data_end,
const uint8_t **p_data_end) { const uint8_t **p_data_end) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
......
...@@ -17,11 +17,11 @@ extern "C" { ...@@ -17,11 +17,11 @@ extern "C" {
#endif #endif
struct VP9Common; struct VP9Common;
struct VP9Decompressor; struct VP9Decoder;
void vp9_init_dequantizer(struct VP9Common *cm); void vp9_init_dequantizer(struct VP9Common *cm);
int vp9_decode_frame(struct VP9Decompressor *pbi, int vp9_decode_frame(struct VP9Decoder *pbi,
const uint8_t *data, const uint8_t *data_end, const uint8_t *data, const uint8_t *data_end,
const uint8_t **p_data_end); const uint8_t **p_data_end);
......
...@@ -110,8 +110,8 @@ void vp9_initialize_dec() { ...@@ -110,8 +110,8 @@ void vp9_initialize_dec() {
} }
} }
VP9D_COMP *vp9_decoder_create(const VP9D_CONFIG *oxcf) { VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf) {
VP9D_COMP *const pbi = vpx_memalign(32, sizeof(*pbi)); VP9Decoder *const pbi = vpx_memalign(32, sizeof(*pbi));
VP9_COMMON *const cm = pbi ? &pbi->common : NULL; VP9_COMMON *const cm = pbi ? &pbi->common : NULL;
if (!cm) if (!cm)
...@@ -152,7 +152,7 @@ VP9D_COMP *vp9_decoder_create(const VP9D_CONFIG *oxcf) { ...@@ -152,7 +152,7 @@ VP9D_COMP *vp9_decoder_create(const VP9D_CONFIG *oxcf) {
return pbi; return pbi;
} }
void vp9_decoder_remove(VP9D_COMP *pbi) { void vp9_decoder_remove(VP9Decoder *pbi) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
int i; int i;
...@@ -182,7 +182,7 @@ static int equal_dimensions(const YV12_BUFFER_CONFIG *a, ...@@ -182,7 +182,7 @@ static int equal_dimensions(const YV12_BUFFER_CONFIG *a,
a->uv_height == b->uv_height && a->uv_width == b->uv_width; a->uv_height == b->uv_height && a->uv_width == b->uv_width;
} }
vpx_codec_err_t vp9_copy_reference_dec(VP9D_COMP *pbi, vpx_codec_err_t vp9_copy_reference_dec(VP9Decoder *pbi,
VP9_REFFRAME ref_frame_flag, VP9_REFFRAME ref_frame_flag,
YV12_BUFFER_CONFIG *sd) { YV12_BUFFER_CONFIG *sd) {
VP9_COMMON *cm = &pbi->common; VP9_COMMON *cm = &pbi->common;
...@@ -252,7 +252,7 @@ vpx_codec_err_t vp9_set_reference_dec(VP9_COMMON *cm, ...@@ -252,7 +252,7 @@ vpx_codec_err_t vp9_set_reference_dec(VP9_COMMON *cm,
} }
int vp9_get_reference_dec(VP9D_COMP *pbi, int index, YV12_BUFFER_CONFIG **fb) { int vp9_get_reference_dec(VP9Decoder *pbi, int index, YV12_BUFFER_CONFIG **fb) {
VP9_COMMON *cm = &pbi->common; VP9_COMMON *cm = &pbi->common;
if (index < 0 || index >= REF_FRAMES) if (index < 0 || index >= REF_FRAMES)
...@@ -263,7 +263,7 @@ int vp9_get_reference_dec(VP9D_COMP *pbi, int index, YV12_BUFFER_CONFIG **fb) { ...@@ -263,7 +263,7 @@ int vp9_get_reference_dec(VP9D_COMP *pbi, int index, YV12_BUFFER_CONFIG **fb) {
} }
/* If any buffer updating is signaled it should be done here. */ /* If any buffer updating is signaled it should be done here. */
static void swap_frame_buffers(VP9D_COMP *pbi) { static void swap_frame_buffers(VP9Decoder *pbi) {
int ref_index = 0, mask; int ref_index = 0, mask;
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
...@@ -287,7 +287,7 @@ static void swap_frame_buffers(VP9D_COMP *pbi) { ...@@ -287,7 +287,7 @@ static void swap_frame_buffers(VP9D_COMP *pbi) {
cm->frame_refs[ref_index].idx = INT_MAX; cm->frame_refs[ref_index].idx = INT_MAX;
} }
int vp9_receive_compressed_data(VP9D_COMP *pbi, int vp9_receive_compressed_data(VP9Decoder *pbi,
size_t size, const uint8_t **psource, size_t size, const uint8_t **psource,
int64_t time_stamp) { int64_t time_stamp) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
...@@ -403,7 +403,7 @@ int vp9_receive_compressed_data(VP9D_COMP *pbi, ...@@ -403,7 +403,7 @@ int vp9_receive_compressed_data(VP9D_COMP *pbi,
return retcode; return retcode;
} }
int vp9_get_raw_frame(VP9D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp, int64_t *time_stamp, int64_t *time_end_stamp,
vp9_ppflags_t *flags) { vp9_ppflags_t *flags) {
int ret = -1; int ret = -1;
......
...@@ -35,7 +35,7 @@ typedef struct { ...@@ -35,7 +35,7 @@ typedef struct {
int inv_tile_order; int inv_tile_order;
} VP9D_CONFIG; } VP9D_CONFIG;
typedef struct VP9Decompressor { typedef struct VP9Decoder {
DECLARE_ALIGNED(16, MACROBLOCKD, mb); DECLARE_ALIGNED(16, MACROBLOCKD, mb);
DECLARE_ALIGNED(16, VP9_COMMON, common); DECLARE_ALIGNED(16, VP9_COMMON, common);
...@@ -59,20 +59,20 @@ typedef struct VP9Decompressor { ...@@ -59,20 +59,20 @@ typedef struct VP9Decompressor {
int num_tile_workers; int num_tile_workers;
VP9LfSync lf_row_sync; VP9LfSync lf_row_sync;
} VP9D_COMP; } VP9Decoder;
void vp9_initialize_dec(); void vp9_initialize_dec();
int vp9_receive_compressed_data(struct VP9Decompressor *pbi, int vp9_receive_compressed_data(struct VP9Decoder *pbi,
size_t size, const uint8_t **dest, size_t size, const uint8_t **dest,
int64_t time_stamp); int64_t time_stamp);
int vp9_get_raw_frame(struct VP9Decompressor *pbi, int vp9_get_raw_frame(struct VP9Decoder *pbi,
YV12_BUFFER_CONFIG *sd, YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp, int64_t *time_stamp, int64_t *time_end_stamp,
vp9_ppflags_t *flags); vp9_ppflags_t *flags);
vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decompressor *pbi, vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi,
VP9_REFFRAME ref_frame_flag, VP9_REFFRAME ref_frame_flag,
YV12_BUFFER_CONFIG *sd); YV12_BUFFER_CONFIG *sd);
...@@ -80,13 +80,13 @@ vpx_codec_err_t vp9_set_reference_dec(VP9_COMMON *cm, ...@@ -80,13 +80,13 @@ vpx_codec_err_t vp9_set_reference_dec(VP9_COMMON *cm,
VP9_REFFRAME ref_frame_flag, VP9_REFFRAME ref_frame_flag,
YV12_BUFFER_CONFIG *sd); YV12_BUFFER_CONFIG *sd);
int vp9_get_reference_dec(struct VP9Decompressor *pbi, int vp9_get_reference_dec(struct VP9Decoder *pbi,
int index, YV12_BUFFER_CONFIG **fb); int index, YV12_BUFFER_CONFIG **fb);
struct VP9Decompressor *vp9_decoder_create(const VP9D_CONFIG *oxcf); struct VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf);
void vp9_decoder_remove(struct VP9Decompressor *pbi); void vp9_decoder_remove(struct VP9Decoder *pbi);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
...@@ -132,7 +132,7 @@ static int loop_filter_row_worker(void *arg1, void *arg2) { ...@@ -132,7 +132,7 @@ static int loop_filter_row_worker(void *arg1, void *arg2) {
// VP9 decoder: Implement multi-threaded loopfilter that uses the tile // VP9 decoder: Implement multi-threaded loopfilter that uses the tile
// threads. // threads.
void vp9_loop_filter_frame_mt(VP9D_COMP *pbi, void vp9_loop_filter_frame_mt(VP9Decoder *pbi,
VP9_COMMON *cm, VP9_COMMON *cm,
MACROBLOCKD *xd, MACROBLOCKD *xd,
int frame_filter_level, int frame_filter_level,
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
struct macroblockd; struct macroblockd;
struct VP9Common; struct VP9Common;
struct VP9Decompressor; struct VP9Decoder;
typedef struct TileWorkerData { typedef struct TileWorkerData {
struct VP9Common *cm; struct VP9Common *cm;
...@@ -50,7 +50,7 @@ void vp9_loop_filter_alloc(struct VP9Common *cm, struct VP9LfSyncData *lf_sync, ...@@ -50,7 +50,7 @@ void vp9_loop_filter_alloc(struct VP9Common *cm, struct VP9LfSyncData *lf_sync,
void vp9_loop_filter_dealloc(struct VP9LfSyncData *lf_sync, int rows); void vp9_loop_filter_dealloc(struct VP9LfSyncData *lf_sync, int rows);
// Multi-threaded loopfilter that uses the tile threads. // Multi-threaded loopfilter that uses the tile threads.
void vp9_loop_filter_frame_mt(struct VP9Decompressor *pbi, void vp9_loop_filter_frame_mt(struct VP9Decoder *pbi,
struct VP9Common *cm, struct VP9Common *cm,
struct macroblockd *xd, struct macroblockd *xd,
int frame_filter_level, int frame_filter_level,
......
...@@ -33,7 +33,7 @@ struct vpx_codec_alg_priv { ...@@ -33,7 +33,7 @@ struct vpx_codec_alg_priv {
vpx_codec_dec_cfg_t cfg; vpx_codec_dec_cfg_t cfg;
vp9_stream_info_t si; vp9_stream_info_t si;
int decoder_init; int decoder_init;
struct VP9Decompressor *pbi; struct VP9Decoder *pbi;
int postproc_cfg_set; int postproc_cfg_set;
vp8_postproc_cfg_t postproc_cfg; vp8_postproc_cfg_t postproc_cfg;
#if CONFIG_POSTPROC_VISUALIZER #if CONFIG_POSTPROC_VISUALIZER
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment