From 28f99c0b87872bd94c0fbdd5b8799e662f3d334d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
Date: Fri, 16 Feb 2018 14:42:36 +0200
Subject: [PATCH] Change definition of 8-GOP to match HM

---
 src/gop.h | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/gop.h b/src/gop.h
index 11fc1ef5..4347edb4 100644
--- a/src/gop.h
+++ b/src/gop.h
@@ -27,8 +27,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 8,
     .layer      = 1,
-    .qp_offset  = 1,
-    .qp_factor  = 0.442,
+    .qp_offset  = 0,
+    .qp_factor  = 1.0,
+    .qp_model_offset = 0.0,
+    .qp_model_scale  = 0.0,
     .is_ref     = 1,
     .ref_neg_count = 3,
     .ref_neg = { 8, 12, 16 },
@@ -38,8 +40,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 4,
     .layer      = 2,
-    .qp_offset  = 2,
-    .qp_factor  = 0.3536,
+    .qp_offset  = 3,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -6.25,
+    .qp_model_scale  = 0.25,
     .is_ref     = 1,
     .ref_neg_count = 2,
     .ref_neg = { 4, 8 },
@@ -49,8 +53,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 2,
     .layer      = 3,
-    .qp_offset  = 3,
-    .qp_factor  = 0.3536,
+    .qp_offset  = 4,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -6.25,
+    .qp_model_scale  = 0.25,
     .is_ref     = 1,
     .ref_neg_count = 2,
     .ref_neg = { 2, 6 },
@@ -60,8 +66,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 1,
     .layer      = 4,
-    .qp_offset  = 4,
-    .qp_factor  = 0.68,
+    .qp_offset  = 8,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -7.0,
+    .qp_model_scale  = 0.245,
     .is_ref     = 0,
     .ref_neg_count = 1,
     .ref_neg = { 1 },
@@ -71,8 +79,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 3,
     .layer      = 4,
-    .qp_offset  = 4,
-    .qp_factor  = 0.68,
+    .qp_offset  = 8,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -7.0,
+    .qp_model_scale  = 0.245,
     .is_ref     = 0,
     .ref_neg_count = 2,
     .ref_neg = { 1, 3 },
@@ -82,8 +92,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 6,
     .layer      = 3,
-    .qp_offset  = 3,
-    .qp_factor  = 0.3536,
+    .qp_offset  = 4,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -6.25,
+    .qp_model_scale  = 0.25,
     .is_ref     = 1,
     .ref_neg_count = 2,
     .ref_neg = { 2, 6 },
@@ -93,8 +105,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 5,
     .layer      = 4,
-    .qp_offset  = 4,
-    .qp_factor  = 0.68,
+    .qp_offset  = 8,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -7.0,
+    .qp_model_scale  = 0.245,
     .is_ref     = 0,
     .ref_neg_count = 2,
     .ref_neg = { 1, 5 },
@@ -104,8 +118,10 @@ static const kvz_gop_config kvz_gop_ra8[8] = {
   {
     .poc_offset = 7,
     .layer      = 4,
-    .qp_offset  = 4,
-    .qp_factor  = 0.68,
+    .qp_offset  = 8,
+    .qp_factor  = 1.0,
+    .qp_model_offset = -7.0,
+    .qp_model_scale  = 0.245,
     .is_ref     = 0,
     .ref_neg_count = 3,
     .ref_neg = { 1, 3, 7 },