ref: b10b8879070ee788731fd06452e602f96efa7d59
parent: 8e3d0e4d7db867caa110e96fa0fd1ff9ba37cb9f
parent: b0c101e2b41565947ced97b86f0965f19416e50f
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu May 16 08:08:27 EDT 2013
Merge "Removing lossless flag from the bitstream." into experimental
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -989,7 +989,14 @@
pc->clamp_type = (CLAMP_TYPE)vp9_read_bit(&header_bc);
pc->error_resilient_mode = vp9_read_bit(&header_bc);
- xd->lossless = vp9_read_bit(&header_bc);
+ setup_loopfilter(pc, xd, &header_bc);
+
+ setup_quantization(pbi, &header_bc);
+
+ xd->lossless = pc->base_qindex == 0 &&
+ pc->y_dc_delta_q == 0 &&
+ pc->uv_dc_delta_q == 0 &&
+ pc->uv_ac_delta_q == 0;
if (xd->lossless) {xd->inv_txm4x4_1 = vp9_short_iwalsh4x4_1;
xd->inv_txm4x4 = vp9_short_iwalsh4x4;
@@ -1003,10 +1010,6 @@
xd->itxm_add_y_block = vp9_idct_add_y_block;
xd->itxm_add_uv_block = vp9_idct_add_uv_block;
}
-
- setup_loopfilter(pc, xd, &header_bc);
-
- setup_quantization(pbi, &header_bc);
// Determine if the golden frame or ARF buffer should be updated and how.
// For all non key frames the GF and ARF refresh flags and sign bias
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1566,9 +1566,6 @@
// error resilient mode
vp9_write_bit(&header_bc, pc->error_resilient_mode);
- // lossless mode: note this needs to be before loopfilter
- vp9_write_bit(&header_bc, cpi->mb.e_mbd.lossless);
-
encode_loopfilter(pc, xd, &header_bc);
encode_quantization(pc, &header_bc);
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1269,10 +1269,10 @@
vp9_zero(cpi->coef_counts_32x32);
vp9_zero(cm->fc.eob_branch_counts);
- cpi->mb.e_mbd.lossless = (cm->base_qindex == 0 &&
- cm->y_dc_delta_q == 0 &&
- cm->uv_dc_delta_q == 0 &&
- cm->uv_ac_delta_q == 0);
+ cpi->mb.e_mbd.lossless = cm->base_qindex == 0 &&
+ cm->y_dc_delta_q == 0 &&
+ cm->uv_dc_delta_q == 0 &&
+ cm->uv_ac_delta_q == 0;
switch_lossless_mode(cpi, cpi->mb.e_mbd.lossless);
vp9_frame_init_quantizer(cpi);
--
⑨