generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add optional mode_info printout function for debug purpose" into sandbox/Jingning/transcode

Browse Source
This commit is contained in:
Jingning Han
2014-06-27 16:34:42 -07:00
committed by Gerrit Code Review
parent 68556c2f1d d7e8490d04
commit 0d075d907c
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vp9/encoder/vp9_encodeframe.c
View File

@@ -2315,6 +2315,16 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
}
}
#if CONFIG_TRANSCODE
#define PRINT_MODE_INFO_LOAD 0
void print_mode_info(MODE_INFO *mi, int mi_row, int mi_col) {
MB_MODE_INFO *mbmi = &mi->mbmi;
fprintf(stderr, "pos (%d, %d) mode info: bsize %d, mode %d, tx size %d, ref_frame %d\n",
mi_row, mi_col, mbmi->sb_type, mbmi->mode, mbmi->tx_size,
mbmi->ref_frame[0]);
}
#endif
static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
int mi_row, TOKENEXTRA **tp) {
VP9_COMMON *const cm = &cpi->common;
@@ -2337,10 +2347,17 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
if (pf) {
int offset = mi_row * cm->mi_stride + mi_col;
int i, j;
for (j = 0; j < MI_BLOCK_SIZE; ++j)
for (i = 0; i < MI_BLOCK_SIZE; ++i)
for (j = 0; j < MI_BLOCK_SIZE; ++j) {
for (i = 0; i < MI_BLOCK_SIZE; ++i) {
fread(&cm->mi[offset + j * cm->mi_stride + i],
1, sizeof(MODE_INFO), pf);
#if PRINT_MODE_INFO_LOAD
// print out the mode_info loaded in from external file
print_mode_info(&cm->mi[offset + j * cm->mi_stride + i],
mi_row + j, mi_col + i);
#endif
}
}
}
encode_sb_mi(cpi, tile, tp, mi_row, mi_col, 1, BLOCK_64X64,

2
vp9/encoder/vp9_encoder.c
View File

@@ -1018,7 +1018,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
cm->error.setjmp = 0;
#if CONFIG_TRANSCODE
cm->mi_array_pf = fopen("/usr/local/google/home/jingning/explibvpx-pub/libvpx/build/linuxbuild/mode_info_array_2.bin", "rb");
cm->mi_array_pf = fopen("/usr/local/google/home/jingning/explibvpx-pub/libvpx/build/linuxbuild/mode_info_array.bin", "rb");
#endif
return cpi;
}