From 4ea9bee0b69e0a694cb0f444cb48e0cc4793921f Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Thu, 27 May 2021 11:37:07 +0300 Subject: [PATCH] Add rrc_rice extension flags to make bitstream correct with VTM 13.0 and update the CI VTM binary --- .travis-install.bash | 6 +++--- src/encoder_state-bitstream.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis-install.bash b/.travis-install.bash index b4fd63e1..1df8440f 100644 --- a/.travis-install.bash +++ b/.travis-install.bash @@ -14,11 +14,11 @@ tar xf ffmpeg-release-4.2.1-32bit-static.tar.xz cp ffmpeg-4.2.1-i686-static/ffmpeg "${HOME}/bin/ffmpeg" chmod +x "${HOME}/bin/ffmpeg" -wget http://ultravideo.fi/ubuntu-vtm-11.0.tgz +wget http://ultravideo.fi/ubuntu-vtm-13.0.tgz sha256sum -c - << EOF -0f1655a308ccba82976d11ed70ceb5a9cb4291db950558c707f0dfd84d5462ca ubuntu-vtm-11.0.tgz +1751bba04611791040a978015da8bb537fcd89c89453c0cdc1ec2719aac2a1a8 ubuntu-vtm-13.0.tgz EOF -tar xf ubuntu-vtm-11.0.tgz +tar xf ubuntu-vtm-13.0.tgz cp DecoderApp "${HOME}/bin/DecoderAppStatic" chmod +x "${HOME}/bin/DecoderAppStatic" diff --git a/src/encoder_state-bitstream.c b/src/encoder_state-bitstream.c index 944454b3..e8a159ad 100644 --- a/src/encoder_state-bitstream.c +++ b/src/encoder_state-bitstream.c @@ -468,8 +468,10 @@ static void encoder_state_write_bitstream_SPS_extension(bitstream_t *stream, WRITE_U(stream, 0, 1, "transform_skip_context_enabled_flag"); WRITE_U(stream, 0, 1, "extended_precision_processing_flag"); + WRITE_U(stream, 0, 1, "sps_ts_residual_coding_rice_present_in_sh_flag"); WRITE_U(stream, state->encoder_control->cfg.intra_smoothing_disabled, 1, "intra_smoothing_disabled_flag"); WRITE_U(stream, 0, 1, "high_precision_offsets_enabled_flag"); + WRITE_U(stream, 0, 1, "rrc_rice_extension_flag"); WRITE_U(stream, 0, 1, "persistent_rice_adaptation_enabled_flag"); WRITE_U(stream, 0, 1, "cabac_bypass_alignment_enabled_flag");