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

Merge "Uncompressed header: new encoding for frame size" into experimental

Browse Source
This commit is contained in:
Dmitry Kovalev 2013-06-07 18:22:53 -07:00 committed by Gerrit Code Review
commit f576e79272
2 changed files with 128 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
vp9/decoder/vp9_decodframe.c
View File

@ -740,34 +740,20 @@ static INTERPOLATIONFILTERTYPE read_interp_filter_type(
: vp9_rb_read_literal(rb, 2); : vp9_rb_read_literal(rb, 2);
} }
static void read_frame_size(VP9_COMMON *cm, static void read_frame_size(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb,
struct vp9_read_bit_buffer *rb,
int *width, int *height) { int *width, int *height) {
const int w = vp9_rb_read_literal(rb, 16); const int w = vp9_rb_read_literal(rb, 16) + 1;
const int h = vp9_rb_read_literal(rb, 16); const int h = vp9_rb_read_literal(rb, 16) + 1;
if (w <= 0)
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid frame width");
if (h <= 0)
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Invalid frame height");
*width = w; *width = w;
*height = h; *height = h;
} }
static void setup_display_size(VP9D_COMP *pbi, static void setup_display_size(VP9D_COMP *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;
if (vp9_rb_read_bit(rb)) { cm->display_width = cm->width;
int width, height; cm->display_height = cm->height;
read_frame_size(cm, rb, &width, &height); if (vp9_rb_read_bit(rb))
cm->display_width = width; read_frame_size(cm, rb, &cm->display_width, &cm->display_height);
cm->display_height = height;
} else {
cm->display_width = cm->width;
cm->display_height = cm->height;
}
} }
static void apply_frame_size(VP9D_COMP *pbi, int width, int height) { static void apply_frame_size(VP9D_COMP *pbi, int width, int height) {
@ -810,6 +796,29 @@ static void setup_frame_size(VP9D_COMP *pbi,
apply_frame_size(pbi, width, height); apply_frame_size(pbi, width, height);
} }
static void setup_frame_size_with_refs(VP9D_COMP *pbi,
struct vp9_read_bit_buffer *rb) {
VP9_COMMON *const cm = &pbi->common;
int width, height;
int found = 0, i;
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
if (vp9_rb_read_bit(rb)) {
YV12_BUFFER_CONFIG *cfg = &cm->yv12_fb[cm->active_ref_idx[i]];
width = cfg->y_crop_width;
height = cfg->y_crop_height;
found = 1;
break;
}
}
if (!found)
read_frame_size(cm, rb, &width, &height);
setup_display_size(pbi, rb);
apply_frame_size(pbi, width, height);
}
static void update_frame_context(FRAME_CONTEXT *fc) { static void update_frame_context(FRAME_CONTEXT *fc) {
vp9_copy(fc->pre_coef_probs, fc->coef_probs); vp9_copy(fc->pre_coef_probs, fc->coef_probs);
vp9_copy(fc->pre_y_mode_prob, fc->y_mode_prob); vp9_copy(fc->pre_y_mode_prob, fc->y_mode_prob);
@ -952,12 +961,49 @@ static void decode_tiles(VP9D_COMP *pbi,
} }
} }
static void check_sync_code(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) {
if (vp9_rb_read_literal(rb, 8) != SYNC_CODE_0 ||
vp9_rb_read_literal(rb, 8) != SYNC_CODE_1 ||
vp9_rb_read_literal(rb, 8) != SYNC_CODE_2) {
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame sync code");
}
}
static void error_handler(void *data, int bit_offset) { static void error_handler(void *data, int bit_offset) {
VP9_COMMON *const cm = (VP9_COMMON *)data; VP9_COMMON *const cm = (VP9_COMMON *)data;
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, "Truncated packet"); vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, "Truncated packet");
} }
static void setup_inter_inter(VP9_COMMON *cm) {
int i;
cm->allow_comp_inter_inter = 0;
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
cm->allow_comp_inter_inter |= i > 0 &&
cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1];
}
if (cm->allow_comp_inter_inter) {
// which one is always-on in comp inter-inter?
if (cm->ref_frame_sign_bias[LAST_FRAME] ==
cm->ref_frame_sign_bias[GOLDEN_FRAME]) {
cm->comp_fixed_ref = ALTREF_FRAME;
cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = GOLDEN_FRAME;
} else if (cm->ref_frame_sign_bias[LAST_FRAME] ==
cm->ref_frame_sign_bias[ALTREF_FRAME]) {
cm->comp_fixed_ref = GOLDEN_FRAME;
cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = ALTREF_FRAME;
} else {
cm->comp_fixed_ref = LAST_FRAME;
cm->comp_var_ref[0] = GOLDEN_FRAME;
cm->comp_var_ref[1] = ALTREF_FRAME;
}
}
}
#define RESERVED \ #define RESERVED \
if (vp9_rb_read_bit(rb)) \ if (vp9_rb_read_bit(rb)) \
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, \ vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, \
@ -994,12 +1040,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
if (cm->frame_type == KEY_FRAME) { if (cm->frame_type == KEY_FRAME) {
int csp; int csp;
if (vp9_rb_read_literal(rb, 8) != SYNC_CODE_0 || check_sync_code(cm, rb);
vp9_rb_read_literal(rb, 8) != SYNC_CODE_1 ||
vp9_rb_read_literal(rb, 8) != SYNC_CODE_2) {
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame sync code");
}
csp = vp9_rb_read_literal(rb, 3); // colorspace csp = vp9_rb_read_literal(rb, 3); // colorspace
if (csp != 7) { // != sRGB if (csp != 7) { // != sRGB
@ -1036,16 +1077,9 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
vp9_setup_past_independence(cm, xd); vp9_setup_past_independence(cm, xd);
if (cm->intra_only) { if (cm->intra_only) {
if (vp9_rb_read_literal(rb, 8) != SYNC_CODE_0 || check_sync_code(cm, rb);
vp9_rb_read_literal(rb, 8) != SYNC_CODE_1 || pbi->refresh_frame_flags = vp9_rb_read_literal(rb, NUM_REF_FRAMES);
vp9_rb_read_literal(rb, 8) != SYNC_CODE_2) { setup_frame_size(pbi, rb);
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame sync code");
}
pbi->refresh_frame_flags = vp9_rb_read_literal(rb, NUM_REF_FRAMES);
setup_frame_size(pbi, rb);
} else { } else {
pbi->refresh_frame_flags = vp9_rb_read_literal(rb, NUM_REF_FRAMES); pbi->refresh_frame_flags = vp9_rb_read_literal(rb, NUM_REF_FRAMES);
@ -1055,37 +1089,15 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
cm->ref_frame_sign_bias[LAST_FRAME + i] = vp9_rb_read_bit(rb); cm->ref_frame_sign_bias[LAST_FRAME + i] = vp9_rb_read_bit(rb);
} }
setup_frame_size(pbi, rb); setup_frame_size_with_refs(pbi, rb);
// Read the sign bias for each reference frame buffer.
cm->allow_comp_inter_inter = 0;
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
vp9_setup_scale_factors(cm, i);
cm->allow_comp_inter_inter |= i > 0 &&
cm->ref_frame_sign_bias[i + 1] != cm->ref_frame_sign_bias[1];
}
if (cm->allow_comp_inter_inter) {
// which one is always-on in comp inter-inter?
if (cm->ref_frame_sign_bias[LAST_FRAME] ==
cm->ref_frame_sign_bias[GOLDEN_FRAME]) {
cm->comp_fixed_ref = ALTREF_FRAME;
cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = GOLDEN_FRAME;
} else if (cm->ref_frame_sign_bias[LAST_FRAME] ==
cm->ref_frame_sign_bias[ALTREF_FRAME]) {
cm->comp_fixed_ref = GOLDEN_FRAME;
cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = ALTREF_FRAME;
} else {
cm->comp_fixed_ref = LAST_FRAME;
cm->comp_var_ref[0] = GOLDEN_FRAME;
cm->comp_var_ref[1] = ALTREF_FRAME;
}
}
xd->allow_high_precision_mv = vp9_rb_read_bit(rb); xd->allow_high_precision_mv = vp9_rb_read_bit(rb);
cm->mcomp_filter_type = read_interp_filter_type(rb); cm->mcomp_filter_type = read_interp_filter_type(rb);
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i)
vp9_setup_scale_factors(cm, i);
setup_inter_inter(cm);
} }
} }
@ -1100,7 +1112,6 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
} }
cm->frame_context_idx = vp9_rb_read_literal(rb, NUM_FRAME_CONTEXTS_LG2); cm->frame_context_idx = vp9_rb_read_literal(rb, NUM_FRAME_CONTEXTS_LG2);
cm->clr_type = (YUV_TYPE)vp9_rb_read_bit(rb);
setup_loopfilter(pbi, rb); setup_loopfilter(pbi, rb);
setup_quantization(pbi, rb); setup_quantization(pbi, rb);
@ -1135,10 +1146,8 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
xd->corrupted = 0; xd->corrupted = 0;
new_fb->corrupted = 0; new_fb->corrupted = 0;
if ((!pbi->decoded_key_frame && !keyframe) || if (!pbi->decoded_key_frame && !keyframe)
pc->width == 0 || pc->height == 0) {
return -1; return -1;
}
vp9_setup_version(pc); vp9_setup_version(pc);
if (!read_is_valid(data, first_partition_size, data_end)) if (!read_is_valid(data, first_partition_size, data_end))

78
vp9/encoder/vp9_bitstream.c
View File

@ -1430,11 +1430,50 @@ static void write_display_size(VP9_COMP *cpi, struct vp9_write_bit_buffer *wb) {
cm->height != cm->display_height; cm->height != cm->display_height;
vp9_wb_write_bit(wb, scaling_active); vp9_wb_write_bit(wb, scaling_active);
if (scaling_active) { if (scaling_active) {
vp9_wb_write_literal(wb, cm->display_width, 16); vp9_wb_write_literal(wb, cm->display_width - 1, 16);
vp9_wb_write_literal(wb, cm->display_height, 16); vp9_wb_write_literal(wb, cm->display_height - 1, 16);
} }
} }
static void write_frame_size(VP9_COMP *cpi,
struct vp9_write_bit_buffer *wb) {
VP9_COMMON *const cm = &cpi->common;
vp9_wb_write_literal(wb, cm->width - 1, 16);
vp9_wb_write_literal(wb, cm->height - 1, 16);
write_display_size(cpi, wb);
}
static void write_frame_size_with_refs(VP9_COMP *cpi,
struct vp9_write_bit_buffer *wb) {
VP9_COMMON *const cm = &cpi->common;
int refs[ALLOWED_REFS_PER_FRAME] = {cpi->lst_fb_idx, cpi->gld_fb_idx,
cpi->alt_fb_idx};
int i, found = 0;
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
YV12_BUFFER_CONFIG *cfg = &cm->yv12_fb[cm->ref_frame_map[refs[i]]];
found = cm->width == cfg->y_crop_width &&
cm->height == cfg->y_crop_height;
vp9_wb_write_bit(wb, found);
if (found)
break;
}
if (!found) {
vp9_wb_write_literal(wb, cm->width - 1, 16);
vp9_wb_write_literal(wb, cm->height - 1, 16);
}
write_display_size(cpi, wb);
}
static void write_sync_code(struct vp9_write_bit_buffer *wb) {
vp9_wb_write_literal(wb, SYNC_CODE_0, 8);
vp9_wb_write_literal(wb, SYNC_CODE_1, 8);
vp9_wb_write_literal(wb, SYNC_CODE_2, 8);
}
static void write_uncompressed_header(VP9_COMP *cpi, static void write_uncompressed_header(VP9_COMP *cpi,
struct vp9_write_bit_buffer *wb) { struct vp9_write_bit_buffer *wb) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
@ -1455,9 +1494,7 @@ static void write_uncompressed_header(VP9_COMP *cpi,
vp9_wb_write_bit(wb, cm->error_resilient_mode); vp9_wb_write_bit(wb, cm->error_resilient_mode);
if (cm->frame_type == KEY_FRAME) { if (cm->frame_type == KEY_FRAME) {
vp9_wb_write_literal(wb, SYNC_CODE_0, 8); write_sync_code(wb);
vp9_wb_write_literal(wb, SYNC_CODE_1, 8);
vp9_wb_write_literal(wb, SYNC_CODE_2, 8);
// colorspaces // colorspaces
// 000 - Unknown // 000 - Unknown
// 001 - BT.601 // 001 - BT.601
@ -1480,45 +1517,29 @@ static void write_uncompressed_header(VP9_COMP *cpi,
vp9_wb_write_bit(wb, 0); // has extra plane vp9_wb_write_bit(wb, 0); // has extra plane
} }
// frame size write_frame_size(cpi, wb);
vp9_wb_write_literal(wb, cm->width, 16);
vp9_wb_write_literal(wb, cm->height, 16);
write_display_size(cpi, wb);
} else { } else {
int i; const int refs[ALLOWED_REFS_PER_FRAME] = {cpi->lst_fb_idx, cpi->gld_fb_idx,
int refs[ALLOWED_REFS_PER_FRAME] = {cpi->lst_fb_idx, cpi->gld_fb_idx, cpi->alt_fb_idx};
cpi->alt_fb_idx};
if (!cm->show_frame) if (!cm->show_frame)
vp9_wb_write_bit(wb, cm->intra_only); vp9_wb_write_bit(wb, cm->intra_only);
if (cm->intra_only) { if (cm->intra_only) {
vp9_wb_write_literal(wb, SYNC_CODE_0, 8); write_sync_code(wb);
vp9_wb_write_literal(wb, SYNC_CODE_1, 8);
vp9_wb_write_literal(wb, SYNC_CODE_2, 8);
vp9_wb_write_literal(wb, get_refresh_mask(cpi), NUM_REF_FRAMES); vp9_wb_write_literal(wb, get_refresh_mask(cpi), NUM_REF_FRAMES);
write_frame_size(cpi, wb);
// frame size
vp9_wb_write_literal(wb, cm->width, 16);
vp9_wb_write_literal(wb, cm->height, 16);
write_display_size(cpi, wb);
} else { } else {
int i;
vp9_wb_write_literal(wb, get_refresh_mask(cpi), NUM_REF_FRAMES); vp9_wb_write_literal(wb, get_refresh_mask(cpi), NUM_REF_FRAMES);
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) { for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
vp9_wb_write_literal(wb, refs[i], NUM_REF_FRAMES_LG2); vp9_wb_write_literal(wb, refs[i], NUM_REF_FRAMES_LG2);
vp9_wb_write_bit(wb, cm->ref_frame_sign_bias[LAST_FRAME + i]); vp9_wb_write_bit(wb, cm->ref_frame_sign_bias[LAST_FRAME + i]);
} }
// frame size write_frame_size_with_refs(cpi, wb);
vp9_wb_write_literal(wb, cm->width, 16);
vp9_wb_write_literal(wb, cm->height, 16);
write_display_size(cpi, wb);
// Signal whether to allow high MV precision
vp9_wb_write_bit(wb, xd->allow_high_precision_mv); vp9_wb_write_bit(wb, xd->allow_high_precision_mv);
// Signal the type of subpel filter to use
fix_mcomp_filter_type(cpi); fix_mcomp_filter_type(cpi);
write_interp_filter_type(cm->mcomp_filter_type, wb); write_interp_filter_type(cm->mcomp_filter_type, wb);
} }
@ -1531,7 +1552,6 @@ static void write_uncompressed_header(VP9_COMP *cpi,
} }
vp9_wb_write_literal(wb, cm->frame_context_idx, NUM_FRAME_CONTEXTS_LG2); vp9_wb_write_literal(wb, cm->frame_context_idx, NUM_FRAME_CONTEXTS_LG2);
vp9_wb_write_bit(wb, cm->clr_type);
encode_loopfilter(cm, xd, wb); encode_loopfilter(cm, xd, wb);
encode_quantization(cm, wb); encode_quantization(cm, wb);