[FFmpeg-devel] [PATCH 1/7] lavf/rawdec: set avg_frame_rate

[FFmpeg-devel] [PATCH 1/7] lavf/rawdec: set avg_frame_rate

[Anton Khirnov]

Timestamps in two FATE H.264 conformance tests now start at 1 instead
of 0, which also happens in some other H.264 tests before this commit
and so is not a big issue.
Conversely, timestamps in some HEVC conformance tests start from a
smaller value now.
Ideally this should be addressed later in a more general way.

h264-conformance-frext-frext2_panasonic_b no longer requires -vsync
passthrough.
---
 libavformat/rawdec.c                          |  1 +
 tests/fate/h264.mak                           |  2 +-
 .../h264-conformance-frext-frext2_panasonic_b | 30 +++++++++----------
 .../h264-conformance-frext-frext4_panasonic_a | 20 ++++++-------
 .../fate/hevc-conformance-CIP_A_Panasonic_3   |  4 +--
 .../fate/hevc-conformance-CIP_C_Panasonic_2   |  4 +--
 .../ref/fate/hevc-conformance-SDH_A_Orange_3  |  4 +--
 tests/ref/fate/hevc-small422chroma            |  2 +-
 8 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index de804366ed1..9126a9e53b0 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -86,6 +86,7 @@ int ff_raw_video_read_header(AVFormatContext *s)
     st->codecpar->codec_id = s->iformat->raw_codec_id;
     sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;
 
+    st->avg_frame_rate = s1->framerate;
     sti->avctx->framerate = s1->framerate;
     avpriv_set_pts_info(st, 64, 1, 1200000);
 
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index b883f3a3ffa..c8ed23955ac 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -346,7 +346,7 @@ fate-h264-conformance-frext-freh7_b:              CMD = framecrc -i $(TARGET_SAM
 fate-h264-conformance-frext-frext01_jvc_d:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
 fate-h264-conformance-frext-frext02_jvc_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
 fate-h264-conformance-frext-frext1_panasonic_c:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
-fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync passthrough
+fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc
 fate-h264-conformance-frext-frext3_panasonic_d:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
 fate-h264-conformance-frext-frext4_panasonic_a:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
 fate-h264-conformance-frext-frext_mmco4_sony_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
diff --git a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
index 76e4d26cf8f..d4435700828 100644
--- a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
+++ b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
@@ -3,18 +3,18 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          0,          0,        1,   152064, 0x0147a2a9
-0,          1,          1,        1,   152064, 0xe2365351
-0,          2,          2,        1,   152064, 0xb5f9daee
-0,          3,          3,        1,   152064, 0xd60818b2
-0,          4,          4,        1,   152064, 0x21b528e5
-0,          5,          5,        1,   152064, 0x9c9dda18
-0,          6,          6,        1,   152064, 0x387fe7de
-0,          7,          7,        1,   152064, 0x8f0c5a1e
-0,          8,          8,        1,   152064, 0x02409694
-0,          9,          9,        1,   152064, 0x2b36a7a7
-0,         10,         10,        1,   152064, 0x3c6d3863
-0,         11,         11,        1,   152064, 0xaa7835e1
-0,         12,         12,        1,   152064, 0x6d105fe7
-0,         13,         13,        1,   152064, 0x9a348732
-0,         14,         14,        1,   152064, 0x96a3af13
+0,          1,          1,        1,   152064, 0x0147a2a9
+0,          2,          2,        1,   152064, 0xe2365351
+0,          3,          3,        1,   152064, 0xb5f9daee
+0,          4,          4,        1,   152064, 0xd60818b2
+0,          5,          5,        1,   152064, 0x21b528e5
+0,          6,          6,        1,   152064, 0x9c9dda18
+0,          7,          7,        1,   152064, 0x387fe7de
+0,          8,          8,        1,   152064, 0x8f0c5a1e
+0,          9,          9,        1,   152064, 0x02409694
+0,         10,         10,        1,   152064, 0x2b36a7a7
+0,         11,         11,        1,   152064, 0x3c6d3863
+0,         12,         12,        1,   152064, 0xaa7835e1
+0,         13,         13,        1,   152064, 0x6d105fe7
+0,         14,         14,        1,   152064, 0x9a348732
+0,         15,         15,        1,   152064, 0x96a3af13
diff --git a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
index 5640228a263..1f678d1122c 100644
--- a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
@@ -3,13 +3,13 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          0,          0,        1,   152064, 0xd604d440
-0,          1,          1,        1,   152064, 0x08ef262c
-0,          2,          2,        1,   152064, 0x992fca8e
-0,          3,          3,        1,   152064, 0x5a02ee15
-0,          4,          4,        1,   152064, 0xf15d5c66
-0,          5,          5,        1,   152064, 0x360dda12
-0,          6,          6,        1,   152064, 0x18b54985
-0,          7,          7,        1,   152064, 0xf12b6cde
-0,          8,          8,        1,   152064, 0x3b2e63f7
-0,          9,          9,        1,   152064, 0x140abcfd
+0,          1,          1,        1,   152064, 0xd604d440
+0,          2,          2,        1,   152064, 0x08ef262c
+0,          3,          3,        1,   152064, 0x992fca8e
+0,          4,          4,        1,   152064, 0x5a02ee15
+0,          5,          5,        1,   152064, 0xf15d5c66
+0,          6,          6,        1,   152064, 0x360dda12
+0,          7,          7,        1,   152064, 0x18b54985
+0,          8,          8,        1,   152064, 0xf12b6cde
+0,          9,          9,        1,   152064, 0x3b2e63f7
+0,         10,         10,        1,   152064, 0x140abcfd
diff --git a/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 b/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
index ebe0f676d27..3adef2f366e 100644
--- a/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
+++ b/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
@@ -3,5 +3,5 @@
 #codec_id 0: rawvideo
 #dimensions 0: 416x240
 #sar 0: 0/1
-0,          2,          2,        1,   149760, 0x6e1f16d0
-0,          3,          3,        1,   149760, 0x5be5bde9
+0,          0,          0,        1,   149760, 0x6e1f16d0
+0,          1,          1,        1,   149760, 0x5be5bde9
diff --git a/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2 b/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
index 74f7f8cd74b..8e6c681cfef 100644
--- a/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
+++ b/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
@@ -3,5 +3,5 @@
 #codec_id 0: rawvideo
 #dimensions 0: 416x240
 #sar 0: 0/1
-0,          2,          2,        1,   149760, 0xcd1019b2
-0,          3,          3,        1,   149760, 0xeb39efeb
+0,          0,          0,        1,   149760, 0xcd1019b2
+0,          1,          1,        1,   149760, 0xeb39efeb
diff --git a/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 b/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
index e5bc4f8121b..f3ef192c6a6 100644
--- a/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
+++ b/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
@@ -3,5 +3,5 @@
 #codec_id 0: rawvideo
 #dimensions 0: 1920x1080
 #sar 0: 0/1
-0,          2,          2,        1,  3110400, 0x0117aa5d
-0,          3,          3,        1,  3110400, 0xa737bc56
+0,          0,          0,        1,  3110400, 0x0117aa5d
+0,          1,          1,        1,  3110400, 0xa737bc56
diff --git a/tests/ref/fate/hevc-small422chroma b/tests/ref/fate/hevc-small422chroma
index 954829a0ab6..de0ea46c31a 100644
--- a/tests/ref/fate/hevc-small422chroma
+++ b/tests/ref/fate/hevc-small422chroma
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 3840x2160
 #sar 0: 1/1
-0,         11,         11,        1, 33177600, 0x53015e18
+0,          7,          7,        1, 33177600, 0x53015e18
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/7] lavf/demux: treat streams with AVSTREAM_PARSE_FULL_RAW as having timestamps

[Anton Khirnov]

In this case the timestamps are set by the parser.
Cf. a6b3471c44fd981d3b33ea9050f78a0bc9494c5e

Required by the following commit.
---
 libavformat/demux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index b19ab86d08d..06de71cd6e3 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -2569,7 +2569,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
                 extract_extradata_check(st))
                 break;
             if (sti->first_dts == AV_NOPTS_VALUE &&
-                !(ic->iformat->flags & AVFMT_NOTIMESTAMPS) &&
+                (!(ic->iformat->flags & AVFMT_NOTIMESTAMPS) || sti->need_parsing == AVSTREAM_PARSE_FULL_RAW) &&
                 sti->codec_info_nb_frames < ((st->disposition & AV_DISPOSITION_ATTACHED_PIC) ? 1 : ic->max_ts_probe) &&
                 (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ||
                  st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/7] lavf/rawdec: mark raw demuxers as having no timestamps

[Anton Khirnov]

Changes the result of the h264_redundant_pps-mov test, where the output
timebase is now 1001/24000 instead of 1/24. This is more correct, as the
source file actually is 23.98fps.
---
 libavformat/rawdec.h                  | 2 +-
 tests/ref/fate/h264_redundant_pps-mov | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h
index f843fe5a2e0..91d0b659afd 100644
--- a/libavformat/rawdec.h
+++ b/libavformat/rawdec.h
@@ -57,7 +57,7 @@ const AVInputFormat ff_ ## shortname ## _demuxer = {\
     .read_header    = ff_raw_video_read_header,\
     .read_packet    = ff_raw_read_partial_packet,\
     .extensions     = ext,\
-    .flags          = flag,\
+    .flags          = flag | AVFMT_NOTIMESTAMPS,\
     .raw_codec_id   = id,\
     .priv_data_size = sizeof(FFRawVideoDemuxerContext),\
     .priv_class     = &ff_rawvideo_demuxer_class,\
diff --git a/tests/ref/fate/h264_redundant_pps-mov b/tests/ref/fate/h264_redundant_pps-mov
index 7cab0e0b29b..a8a1fae933b 100644
--- a/tests/ref/fate/h264_redundant_pps-mov
+++ b/tests/ref/fate/h264_redundant_pps-mov
@@ -1,6 +1,6 @@
 ac2e8f528dae4e4d610fa3517d2c94fb *tests/data/fate/h264_redundant_pps-mov.h264
 187284 tests/data/fate/h264_redundant_pps-mov.h264
-#tb 0: 1/24
+#tb 0: 1001/24000
 #media_type 0: video
 #codec_id 0: rawvideo
 #dimensions 0: 640x360
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/7] fftools/ffmpeg: improve decoder -ts_debug line

[Anton Khirnov]

* log to the input stream log context
* drop the now-duplicate index/type information
* show pkt_dts and frame duration
---
 fftools/ffmpeg.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 438bee8fef6..17eb9ea5964 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2308,12 +2308,20 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
     }
 
     if (debug_ts) {
-        av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "
-               "frame_pts:%s frame_pts_time:%s best_effort_ts:%"PRId64" best_effort_ts_time:%s keyframe:%d frame_type:%d time_base:%d/%d\n",
-               ist->st->index, av_ts2str(decoded_frame->pts),
+        av_log(ist, AV_LOG_INFO,
+               "decoder -> pts:%s pts_time:%s "
+               "pkt_dts:%s pkt_dts_time:%s "
+               "best_effort_ts:%"PRId64" best_effort_ts_time:%s "
+               "duration:%s duration_time:%s "
+               "keyframe:%d frame_type:%d time_base:%d/%d\n",
+               av_ts2str(decoded_frame->pts),
                av_ts2timestr(decoded_frame->pts, &ist->st->time_base),
+               av_ts2str(decoded_frame->pkt_dts),
+               av_ts2timestr(decoded_frame->pkt_dts, &ist->st->time_base),
                best_effort_timestamp,
                av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
+               av_ts2str(decoded_frame->duration),
+               av_ts2timestr(decoded_frame->duration, &ist->st->time_base),
                decoded_frame->key_frame, decoded_frame->pict_type,
                ist->st->time_base.num, ist->st->time_base.den);
     }
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 5/7] fftools/ffmpeg: use InputStream.pts as last resort for decoded frame pts

[Anton Khirnov]

---
 fftools/ffmpeg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 17eb9ea5964..d38054be2f1 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2300,6 +2300,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
         ist->nb_dts_buffer--;
     }
 
+    if (best_effort_timestamp == AV_NOPTS_VALUE)
+        best_effort_timestamp = av_rescale_q(ist->pts, AV_TIME_BASE_Q, ist->st->time_base);
+
     if(best_effort_timestamp != AV_NOPTS_VALUE) {
         int64_t ts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q);
 
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 6/7] fftools/ffmpeg: change video decoding timestamp generation

[Anton Khirnov]

When no timestamps are available from the container, the video decoding
code will currently use fake dts values - generated in
process_input_packet() based on a combination of information from the
decoder and the parser (obtained via the demuxer) - to generate
timestamps during decoder flushing. This is fragile, hard to follow, and
unnecessarily convoluted, since more reliable information can be
obtained directly from post-decoding values.

The new code keeps track of the last decoded frame pts and estimates its
duration based on a number of heuristics. Timestamps generated when both
pts and pkt_dts are missing are then simple pts+duration of the last frame.
The heuristics are somewhat complicated by the fact that lavf insists on
making up packet timestamps based on its highly incomplete information.
That should be removed in the future, allowing to further simplify this
code.

The results of the following tests change:
* h264-3386 now requires -fps_mode passthrough to avoid dropping frames
  at the end; this is a pathology of the interaction of the new and old
  code, and the fact that the sample switches from field to frame coding
  in the last packet, and will be fixed in following commits
* hevc-conformance-DELTAQP_A_BRCM_4 stops inventing an arbitrary
  timestamp gap at the end
* hevc-small422chroma - the single frame output by this test now has a
  timestamp of 0, rather than an arbitrary 7
---
 fftools/ffmpeg.c                              | 79 ++++++++++++++-----
 fftools/ffmpeg.h                              |  9 ++-
 fftools/ffmpeg_demux.c                        |  3 +-
 tests/fate/h264.mak                           |  2 +-
 tests/ref/fate/h264-3386                      |  6 +-
 .../fate/hevc-conformance-DELTAQP_A_BRCM_4    |  2 +-
 tests/ref/fate/hevc-small422chroma            |  2 +-
 7 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index d38054be2f1..eaaa4ff7970 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2204,11 +2204,63 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
     return err < 0 ? err : ret;
 }
 
+static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *frame)
+{
+    const InputFile   *ifile = input_files[ist->file_index];
+    const int container_nots = !!(ifile->ctx->iformat->flags & AVFMT_NOTIMESTAMPS);
+    int64_t codec_duration = 0;
+
+    // XXX lavf currently makes up frame durations when they are not provided by
+    // the container. As there is no way to reliably distinguish real container
+    // durations from the fake made-up ones, we use heuristics based on whether
+    // the container has timestamps. Eventually lavf should stop making up
+    // durations, then this should be simplified.
+
+    // prefer frame duration for containers with timestamps
+    if (frame->duration > 0 && !container_nots)
+        return frame->duration;
+
+    if (ist->dec_ctx->framerate.den && ist->dec_ctx->framerate.num) {
+        int ticks = frame->repeat_pict >= 0 ?
+                    frame->repeat_pict + 1  :
+                    ist->dec_ctx->ticks_per_frame;
+        codec_duration = av_rescale_q(ticks, av_inv_q(ist->dec_ctx->framerate),
+                                      ist->st->time_base);
+    }
+
+    // prefer codec-layer duration for containers without timestamps
+    if (codec_duration > 0 && container_nots)
+        return codec_duration;
+
+    // when timestamps are available, repeat last frame's actual duration
+    // (i.e. pts difference between this and last frame)
+    if (frame->pts != AV_NOPTS_VALUE && ist->last_frame_pts != AV_NOPTS_VALUE &&
+        frame->pts > ist->last_frame_pts)
+        return frame->pts - ist->last_frame_pts;
+
+    // try frame/codec duration
+    if (frame->duration > 0)
+        return frame->duration;
+    if (codec_duration > 0)
+        return codec_duration;
+
+    // try average framerate
+    if (ist->st->avg_frame_rate.num && ist->st->avg_frame_rate.den) {
+        int64_t d = av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate),
+                                 ist->st->time_base);
+        if (d > 0)
+            return d;
+    }
+
+    // last resort is last frame's estimated duration, and 1
+    return FFMAX(ist->last_frame_duration_est, 1);
+}
+
 static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *duration_pts, int eof,
                         int *decode_failed)
 {
     AVFrame *decoded_frame = ist->decoded_frame;
-    int i, ret = 0, err = 0;
+    int ret = 0, err = 0;
     int64_t best_effort_timestamp;
     int64_t dts = AV_NOPTS_VALUE;
 
@@ -2224,16 +2276,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
         pkt->dts = dts; // ffmpeg.c probably shouldn't do this
     }
 
-    // The old code used to set dts on the drain packet, which does not work
-    // with the new API anymore.
-    if (eof) {
-        void *new = av_realloc_array(ist->dts_buffer, ist->nb_dts_buffer + 1, sizeof(ist->dts_buffer[0]));
-        if (!new)
-            return AVERROR(ENOMEM);
-        ist->dts_buffer = new;
-        ist->dts_buffer[ist->nb_dts_buffer++] = dts;
-    }
-
     update_benchmark(NULL);
     ret = decode(ist, ist->dec_ctx, decoded_frame, got_output, pkt);
     update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
@@ -2292,13 +2334,10 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
     if (ist->framerate.num)
         best_effort_timestamp = ist->cfr_next_pts++;
 
-    if (eof && best_effort_timestamp == AV_NOPTS_VALUE && ist->nb_dts_buffer > 0) {
-        best_effort_timestamp = ist->dts_buffer[0];
-
-        for (i = 0; i < ist->nb_dts_buffer - 1; i++)
-            ist->dts_buffer[i] = ist->dts_buffer[i + 1];
-        ist->nb_dts_buffer--;
-    }
+    // no timestamp available - extrapolate from previous frame duration
+    if (best_effort_timestamp == AV_NOPTS_VALUE &&
+        ist->last_frame_pts != AV_NOPTS_VALUE)
+        best_effort_timestamp = ist->last_frame_pts + ist->last_frame_duration_est;
 
     if (best_effort_timestamp == AV_NOPTS_VALUE)
         best_effort_timestamp = av_rescale_q(ist->pts, AV_TIME_BASE_Q, ist->st->time_base);
@@ -2310,6 +2349,10 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
             ist->next_pts = ist->pts = ts;
     }
 
+    // update timestamp history
+    ist->last_frame_duration_est = video_duration_estimate(ist, decoded_frame);
+    ist->last_frame_pts          = decoded_frame->pts;
+
     if (debug_ts) {
         av_log(ist, AV_LOG_INFO,
                "decoder -> pts:%s pts_time:%s "
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 823218e2142..81586c3e45c 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -369,6 +369,12 @@ typedef struct InputStream {
 
     int64_t       next_pts;  ///< synthetic pts for the next decode frame (in AV_TIME_BASE units)
     int64_t       pts;       ///< current pts of the decoded frame  (in AV_TIME_BASE units)
+
+    // pts/estimated duration of the last decoded video frame
+    // in decoder timebase
+    int64_t last_frame_pts;
+    int64_t last_frame_duration_est;
+
     int           wrap_correction_done;
 
     // the value of AVCodecParserContext.repeat_pict from the AVStream parser
@@ -433,9 +439,6 @@ typedef struct InputStream {
     uint64_t frames_decoded;
     uint64_t samples_decoded;
 
-    int64_t *dts_buffer;
-    int nb_dts_buffer;
-
     int got_output;
 } InputStream;
 
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index db05ddb8e90..7be7789b3ea 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -494,7 +494,6 @@ static void ist_free(InputStream **pist)
     av_frame_free(&ist->sub2video.frame);
     av_freep(&ist->filters);
     av_freep(&ist->hwaccel_device);
-    av_freep(&ist->dts_buffer);
 
     avcodec_free_context(&ist->dec_ctx);
     avcodec_parameters_free(&ist->par);
@@ -829,6 +828,8 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d)
 
             ist->framerate_guessed = av_guess_frame_rate(ic, st, NULL);
 
+            ist->last_frame_pts = AV_NOPTS_VALUE;
+
             break;
         case AVMEDIA_TYPE_AUDIO: {
             int guess_layout_max = INT_MAX;
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index c8ed23955ac..7998879ed31 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -444,7 +444,7 @@ fate-h264-mixed-nal-coding:                       CMD = framecrc -i $(TARGET_SAM
 fate-h264-ref-pic-mod-overflow:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/ref-pic-mod-overflow.h264
 fate-h264-twofields-packet:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -an -frames 30
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
-fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
+fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264 -fps_mode passthrough
 fate-h264-missing-frame:                          CMD = framecrc -i $(TARGET_SAMPLES)/h264/nondeterministic_cut.h264
 fate-h264-timecode:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/crew_cif_timecode-2.h264
 
diff --git a/tests/ref/fate/h264-3386 b/tests/ref/fate/h264-3386
index 421581f8c63..f1a25a2dc04 100644
--- a/tests/ref/fate/h264-3386
+++ b/tests/ref/fate/h264-3386
@@ -47,6 +47,6 @@
 0,         45,         45,        1,  2332800, 0x80b968d3
 0,         46,         46,        1,  2332800, 0xa45f4e6f
 0,         47,         47,        1,  2332800, 0xe0fcbade
-0,         48,         48,        1,  2332800, 0x19568f4d
-0,         49,         49,        1,  2332800, 0x33c53f59
-0,         50,         50,        1,  2332800, 0xbdbe8fbf
+0,         47,         47,        1,  2332800, 0x19568f4d
+0,         48,         48,        1,  2332800, 0x33c53f59
+0,         49,         49,        1,  2332800, 0xbdbe8fbf
diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
index 5ca3faf58fb..2abd58b64be 100644
--- a/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
+++ b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
@@ -98,4 +98,4 @@
 0,         92,         92,        1,  3133440, 0x761571be
 0,         93,         93,        1,  3133440, 0x34dc14a1
 0,         94,         94,        1,  3133440, 0xbb94c2d4
-0,         96,         96,        1,  3133440, 0x5300e459
+0,         95,         95,        1,  3133440, 0x5300e459
diff --git a/tests/ref/fate/hevc-small422chroma b/tests/ref/fate/hevc-small422chroma
index de0ea46c31a..dca2af0a1a3 100644
--- a/tests/ref/fate/hevc-small422chroma
+++ b/tests/ref/fate/hevc-small422chroma
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 3840x2160
 #sar 0: 1/1
-0,          7,          7,        1, 33177600, 0x53015e18
+0,          0,          0,        1, 33177600, 0x53015e18
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 7/7] fftools/ffmpeg: stop using fake dts for generating timestamps

[Anton Khirnov]

When no packet dts values are available from the container, video
decoding code will currently use its own guessed values, which will then
be propagated to pkt_dts on decoded frames and used as pts in certain
cases. This is inaccurate, fragile, and unnecessarily convoluted.
Simply removing this allows the extrapolation code introduced in the
previous commit to do a better job.

Changes the results of numerous h264 and hevc FATE tests, where no
spurious timestamp gaps are generated anymore. Several tests no longer
need -vsync passthrough.
---
 fftools/ffmpeg.c                              |   7 -
 tests/fate/h264.mak                           |   4 +-
 tests/ref/fate/h264-3386                      |  94 +--
 .../fate/h264-conformance-cabac_mot_fld0_full |  60 +-
 .../h264-conformance-cabac_mot_picaff0_full   |  60 +-
 .../ref/fate/h264-conformance-cabref3_sand_d  | 100 +--
 tests/ref/fate/h264-conformance-cafi1_sva_c   |  66 +-
 .../ref/fate/h264-conformance-capa1_toshiba_b | 180 +++---
 .../ref/fate/h264-conformance-capama3_sand_f  | 100 +--
 .../h264-conformance-cavlc_mot_fld0_full_b    |  60 +-
 .../h264-conformance-cavlc_mot_picaff0_full_b |  60 +-
 tests/ref/fate/h264-conformance-cvfi1_sony_d  |  34 +-
 tests/ref/fate/h264-conformance-cvfi1_sva_c   |  14 +-
 tests/ref/fate/h264-conformance-cvfi2_sony_h  |  34 +-
 tests/ref/fate/h264-conformance-cvfi2_sva_c   |  26 +-
 .../fate/h264-conformance-cvmapaqp3_sony_e    |  14 +-
 .../fate/h264-conformance-cvmp_mot_fld_l30_b  |  60 +-
 .../fate/h264-conformance-cvmp_mot_frm_l31_b  |  60 +-
 .../ref/fate/h264-conformance-cvnlfi1_sony_c  |  34 +-
 .../ref/fate/h264-conformance-cvnlfi2_sony_h  |  34 +-
 .../ref/fate/h264-conformance-cvpa1_toshiba_b | 180 +++---
 tests/ref/fate/h264-conformance-fi1_sony_e    |  34 +-
 .../fate/h264-conformance-frext-bcrm_freh10   | 200 +++---
 .../fate/h264-conformance-frext-brcm_freh11   | 200 +++---
 .../fate/h264-conformance-frext-brcm_freh4    | 200 +++---
 tests/ref/fate/h264-conformance-frext-freh6   | 200 +++---
 tests/ref/fate/h264-conformance-frext-freh7_b | 200 +++---
 .../h264-conformance-frext-frext2_panasonic_b |  30 +-
 .../h264-conformance-frext-frext4_panasonic_a |  20 +-
 .../fate/h264-conformance-frext-hcaff1_hhi_b  |  20 +-
 .../fate/h264-conformance-frext-hpcafl_bcrm_c | 600 +++++++++---------
 .../h264-conformance-frext-hpcaflnl_bcrm_c    | 600 +++++++++---------
 .../h264-conformance-frext-hpcamapalq_bcrm_b  | 316 ++++-----
 .../fate/h264-conformance-frext-hpcvfl_bcrm_a | 600 +++++++++---------
 .../h264-conformance-frext-hpcvflnl_bcrm_a    | 600 +++++++++---------
 .../ref/fate/h264-conformance-mr3_tandberg_b  | 582 ++++++++---------
 tests/ref/fate/h264-conformance-mr6_bt_b      | 120 ++--
 tests/ref/fate/h264-conformance-mr7_bt_b      | 100 +--
 tests/ref/fate/h264-conformance-mr8_bt_b      | 116 ++--
 tests/ref/fate/h264-conformance-mr9_bt_b      |  96 +--
 .../fate/h264-conformance-sharp_mp_field_1_b  |  30 +-
 .../fate/h264-conformance-sharp_mp_field_2_b  |  30 +-
 .../fate/h264-conformance-sharp_mp_field_3_b  |  30 +-
 .../fate/h264-conformance-sharp_mp_paff_1r2   |  26 +-
 .../fate/h264-conformance-sharp_mp_paff_2r    |  26 +-
 tests/ref/fate/h264-intra-refresh-recovery    |  20 +-
 .../hevc-conformance-BUMPING_A_ericsson_1     |  90 +--
 .../fate/hevc-conformance-NUT_A_ericsson_5    |  24 +-
 .../hevc-conformance-NoOutPrior_A_Qualcomm_1  |  36 +-
 .../hevc-conformance-NoOutPrior_B_Qualcomm_1  |  50 +-
 .../fate/hevc-conformance-OPFLAG_B_Qualcomm_1 | 118 ++--
 .../fate/hevc-conformance-OPFLAG_C_Qualcomm_1 | 162 ++---
 .../ref/fate/hevc-conformance-RAP_A_docomo_4  | 172 ++---
 .../ref/fate/hevc-conformance-RAP_B_Bossen_1  |  26 +-
 54 files changed, 3474 insertions(+), 3481 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index eaaa4ff7970..5f837c1b896 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2262,7 +2262,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
     AVFrame *decoded_frame = ist->decoded_frame;
     int ret = 0, err = 0;
     int64_t best_effort_timestamp;
-    int64_t dts = AV_NOPTS_VALUE;
 
     // With fate-indeo3-2, we're getting 0-sized packets before EOF for some
     // reason. This seems like a semi-critical bug. Don't trigger EOF, and
@@ -2270,12 +2269,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
     if (!eof && pkt && pkt->size == 0)
         return 0;
 
-    if (ist->dts != AV_NOPTS_VALUE)
-        dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base);
-    if (pkt) {
-        pkt->dts = dts; // ffmpeg.c probably shouldn't do this
-    }
-
     update_benchmark(NULL);
     ret = decode(ist, ist->dec_ctx, decoded_frame, got_output, pkt);
     update_benchmark("decode_video %d.%d", ist->file_index, ist->st->index);
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 7998879ed31..173806861aa 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -365,7 +365,7 @@ fate-h264-conformance-frext-hpcadq_brcm_b:        CMD = framecrc -i $(TARGET_SAM
 fate-h264-conformance-frext-hpcafl_bcrm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264
 fate-h264-conformance-frext-hpcaflnl_bcrm_c:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264
 fate-h264-conformance-frext-hpcalq_brcm_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264
-fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync passthrough
+fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264
 fate-h264-conformance-frext-hpcamolq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264
 fate-h264-conformance-frext-hpcanl_brcm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264
 fate-h264-conformance-frext-hpcaq2lq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264
@@ -444,7 +444,7 @@ fate-h264-mixed-nal-coding:                       CMD = framecrc -i $(TARGET_SAM
 fate-h264-ref-pic-mod-overflow:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/ref-pic-mod-overflow.h264
 fate-h264-twofields-packet:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -an -frames 30
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
-fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264 -fps_mode passthrough
+fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
 fate-h264-missing-frame:                          CMD = framecrc -i $(TARGET_SAMPLES)/h264/nondeterministic_cut.h264
 fate-h264-timecode:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/crew_cif_timecode-2.h264
 
diff --git a/tests/ref/fate/h264-3386 b/tests/ref/fate/h264-3386
index f1a25a2dc04..0b15d88cdf6 100644
--- a/tests/ref/fate/h264-3386
+++ b/tests/ref/fate/h264-3386
@@ -3,50 +3,50 @@
 #codec_id 0: rawvideo
 #dimensions 0: 1440x1080
 #sar 0: 4/3
-0,          3,          3,        1,  2332800, 0xa9dcb2ac
-0,          4,          4,        1,  2332800, 0x9b17af27
-0,          5,          5,        1,  2332800, 0x02da3196
-0,          6,          6,        1,  2332800, 0x9c78ed62
-0,          7,          7,        1,  2332800, 0xa6e926a0
-0,          8,          8,        1,  2332800, 0x324e51d2
-0,          9,          9,        1,  2332800, 0xd8289620
-0,         10,         10,        1,  2332800, 0xfc3619f9
-0,         11,         11,        1,  2332800, 0x6b8d2560
-0,         12,         12,        1,  2332800, 0x5714dca0
-0,         13,         13,        1,  2332800, 0x246e2842
-0,         14,         14,        1,  2332800, 0x59bc0b2e
-0,         15,         15,        1,  2332800, 0x24fe5cfa
-0,         16,         16,        1,  2332800, 0xb9607c3e
-0,         17,         17,        1,  2332800, 0x663669c9
-0,         19,         19,        1,  2332800, 0xd37fd62f
-0,         20,         20,        1,  2332800, 0x2d7db904
-0,         21,         21,        1,  2332800, 0x79a53eba
-0,         22,         22,        1,  2332800, 0x3b0c7e19
-0,         23,         23,        1,  2332800, 0xd12f64c5
-0,         24,         24,        1,  2332800, 0xacdb407f
-0,         25,         25,        1,  2332800, 0x829d7e61
-0,         26,         26,        1,  2332800, 0x7932b82f
-0,         27,         27,        1,  2332800, 0x61f81627
-0,         28,         28,        1,  2332800, 0xa1a2e000
-0,         29,         29,        1,  2332800, 0x93aad5e9
-0,         30,         30,        1,  2332800, 0x9993b5b5
-0,         31,         31,        1,  2332800, 0x6ac48232
-0,         32,         32,        1,  2332800, 0x5738f9c0
-0,         33,         33,        1,  2332800, 0x82a59d01
-0,         34,         34,        1,  2332800, 0xc4664862
-0,         35,         35,        1,  2332800, 0xf0e6222d
-0,         36,         36,        1,  2332800, 0xd29e7100
-0,         37,         37,        1,  2332800, 0xe093ef85
-0,         38,         38,        1,  2332800, 0x28c68a65
-0,         39,         39,        1,  2332800, 0x49a6b21e
-0,         40,         40,        1,  2332800, 0xfb28a097
-0,         41,         41,        1,  2332800, 0xade1e336
-0,         42,         42,        1,  2332800, 0xe5118412
-0,         43,         43,        1,  2332800, 0x58750176
-0,         44,         44,        1,  2332800, 0xacb99939
-0,         45,         45,        1,  2332800, 0x80b968d3
-0,         46,         46,        1,  2332800, 0xa45f4e6f
-0,         47,         47,        1,  2332800, 0xe0fcbade
-0,         47,         47,        1,  2332800, 0x19568f4d
-0,         48,         48,        1,  2332800, 0x33c53f59
-0,         49,         49,        1,  2332800, 0xbdbe8fbf
+0,          0,          0,        1,  2332800, 0xa9dcb2ac
+0,          1,          1,        1,  2332800, 0x9b17af27
+0,          2,          2,        1,  2332800, 0x02da3196
+0,          3,          3,        1,  2332800, 0x9c78ed62
+0,          4,          4,        1,  2332800, 0xa6e926a0
+0,          5,          5,        1,  2332800, 0x324e51d2
+0,          6,          6,        1,  2332800, 0xd8289620
+0,          7,          7,        1,  2332800, 0xfc3619f9
+0,          8,          8,        1,  2332800, 0x6b8d2560
+0,          9,          9,        1,  2332800, 0x5714dca0
+0,         10,         10,        1,  2332800, 0x246e2842
+0,         11,         11,        1,  2332800, 0x59bc0b2e
+0,         12,         12,        1,  2332800, 0x24fe5cfa
+0,         13,         13,        1,  2332800, 0xb9607c3e
+0,         14,         14,        1,  2332800, 0x663669c9
+0,         15,         15,        1,  2332800, 0xd37fd62f
+0,         16,         16,        1,  2332800, 0x2d7db904
+0,         17,         17,        1,  2332800, 0x79a53eba
+0,         18,         18,        1,  2332800, 0x3b0c7e19
+0,         19,         19,        1,  2332800, 0xd12f64c5
+0,         20,         20,        1,  2332800, 0xacdb407f
+0,         21,         21,        1,  2332800, 0x829d7e61
+0,         22,         22,        1,  2332800, 0x7932b82f
+0,         23,         23,        1,  2332800, 0x61f81627
+0,         24,         24,        1,  2332800, 0xa1a2e000
+0,         25,         25,        1,  2332800, 0x93aad5e9
+0,         26,         26,        1,  2332800, 0x9993b5b5
+0,         27,         27,        1,  2332800, 0x6ac48232
+0,         28,         28,        1,  2332800, 0x5738f9c0
+0,         29,         29,        1,  2332800, 0x82a59d01
+0,         30,         30,        1,  2332800, 0xc4664862
+0,         31,         31,        1,  2332800, 0xf0e6222d
+0,         32,         32,        1,  2332800, 0xd29e7100
+0,         33,         33,        1,  2332800, 0xe093ef85
+0,         34,         34,        1,  2332800, 0x28c68a65
+0,         35,         35,        1,  2332800, 0x49a6b21e
+0,         36,         36,        1,  2332800, 0xfb28a097
+0,         37,         37,        1,  2332800, 0xade1e336
+0,         38,         38,        1,  2332800, 0xe5118412
+0,         39,         39,        1,  2332800, 0x58750176
+0,         40,         40,        1,  2332800, 0xacb99939
+0,         41,         41,        1,  2332800, 0x80b968d3
+0,         42,         42,        1,  2332800, 0xa45f4e6f
+0,         43,         43,        1,  2332800, 0xe0fcbade
+0,         44,         44,        1,  2332800, 0x19568f4d
+0,         45,         45,        1,  2332800, 0x33c53f59
+0,         46,         46,        1,  2332800, 0xbdbe8fbf
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_fld0_full b/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
index 62bea9cd989..8778fef98e0 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xbf168f4e
-0,          2,          2,        1,   518400, 0xeda5e54f
-0,          3,          3,        1,   518400, 0xef496d43
-0,          4,          4,        1,   518400, 0x6b68dad5
-0,          5,          5,        1,   518400, 0x9a40a7de
-0,          6,          6,        1,   518400, 0x0c21c018
-0,          7,          7,        1,   518400, 0x4ac5a846
-0,          8,          8,        1,   518400, 0x3a1aa817
-0,          9,          9,        1,   518400, 0xcc4eb434
-0,         10,         10,        1,   518400, 0x4368a3c2
-0,         11,         11,        1,   518400, 0xb923682f
-0,         12,         12,        1,   518400, 0xd95460a8
-0,         13,         13,        1,   518400, 0x8e8518aa
-0,         14,         14,        1,   518400, 0x292a1a80
-0,         15,         15,        1,   518400, 0xbada388e
-0,         16,         16,        1,   518400, 0xa67f63c9
-0,         17,         17,        1,   518400, 0x9fc77e21
-0,         18,         18,        1,   518400, 0xe99dc2ac
-0,         19,         19,        1,   518400, 0x17d7d080
-0,         20,         20,        1,   518400, 0x41760c0b
-0,         21,         21,        1,   518400, 0x3c70f34d
-0,         22,         22,        1,   518400, 0x0d640285
-0,         23,         23,        1,   518400, 0x448893e8
-0,         24,         24,        1,   518400, 0x08194490
-0,         25,         25,        1,   518400, 0xcf227031
-0,         26,         26,        1,   518400, 0x8d94587d
-0,         27,         27,        1,   518400, 0x696fca01
-0,         28,         28,        1,   518400, 0xe0ab234b
-0,         29,         29,        1,   518400, 0x0620153b
-0,         30,         30,        1,   518400, 0xb78c146c
+0,          0,          0,        1,   518400, 0xbf168f4e
+0,          1,          1,        1,   518400, 0xeda5e54f
+0,          2,          2,        1,   518400, 0xef496d43
+0,          3,          3,        1,   518400, 0x6b68dad5
+0,          4,          4,        1,   518400, 0x9a40a7de
+0,          5,          5,        1,   518400, 0x0c21c018
+0,          6,          6,        1,   518400, 0x4ac5a846
+0,          7,          7,        1,   518400, 0x3a1aa817
+0,          8,          8,        1,   518400, 0xcc4eb434
+0,          9,          9,        1,   518400, 0x4368a3c2
+0,         10,         10,        1,   518400, 0xb923682f
+0,         11,         11,        1,   518400, 0xd95460a8
+0,         12,         12,        1,   518400, 0x8e8518aa
+0,         13,         13,        1,   518400, 0x292a1a80
+0,         14,         14,        1,   518400, 0xbada388e
+0,         15,         15,        1,   518400, 0xa67f63c9
+0,         16,         16,        1,   518400, 0x9fc77e21
+0,         17,         17,        1,   518400, 0xe99dc2ac
+0,         18,         18,        1,   518400, 0x17d7d080
+0,         19,         19,        1,   518400, 0x41760c0b
+0,         20,         20,        1,   518400, 0x3c70f34d
+0,         21,         21,        1,   518400, 0x0d640285
+0,         22,         22,        1,   518400, 0x448893e8
+0,         23,         23,        1,   518400, 0x08194490
+0,         24,         24,        1,   518400, 0xcf227031
+0,         25,         25,        1,   518400, 0x8d94587d
+0,         26,         26,        1,   518400, 0x696fca01
+0,         27,         27,        1,   518400, 0xe0ab234b
+0,         28,         28,        1,   518400, 0x0620153b
+0,         29,         29,        1,   518400, 0xb78c146c
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full b/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
index 465cde76165..5651e4b57c2 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xd8b58a23
-0,          2,          2,        1,   518400, 0xe53b4aba
-0,          3,          3,        1,   518400, 0x6cbca47a
-0,          4,          4,        1,   518400, 0xceb51253
-0,          5,          5,        1,   518400, 0x60cb3cdd
-0,          6,          6,        1,   518400, 0x7b633553
-0,          7,          7,        1,   518400, 0x10c012c9
-0,          8,          8,        1,   518400, 0xa340ee20
-0,          9,          9,        1,   518400, 0x574c22c2
-0,         10,         10,        1,   518400, 0xbcdb1bf7
-0,         11,         11,        1,   518400, 0x57811e9a
-0,         12,         12,        1,   518400, 0xdd4af748
-0,         13,         13,        1,   518400, 0xb931a637
-0,         14,         14,        1,   518400, 0xcef6ce95
-0,         15,         15,        1,   518400, 0xd28c7085
-0,         16,         16,        1,   518400, 0xae9daf53
-0,         17,         17,        1,   518400, 0xca29d819
-0,         18,         18,        1,   518400, 0x3c4bd7eb
-0,         19,         19,        1,   518400, 0x912ee227
-0,         20,         20,        1,   518400, 0xb67d0e27
-0,         21,         21,        1,   518400, 0x8cf7309d
-0,         22,         22,        1,   518400, 0x358ad344
-0,         23,         23,        1,   518400, 0x4462c642
-0,         24,         24,        1,   518400, 0x3bb43428
-0,         25,         25,        1,   518400, 0x12d6f8ca
-0,         26,         26,        1,   518400, 0x003f13aa
-0,         27,         27,        1,   518400, 0x6cd8c432
-0,         28,         28,        1,   518400, 0xee5ff01b
-0,         29,         29,        1,   518400, 0xba0616ee
-0,         30,         30,        1,   518400, 0x37fa7891
+0,          0,          0,        1,   518400, 0xd8b58a23
+0,          1,          1,        1,   518400, 0xe53b4aba
+0,          2,          2,        1,   518400, 0x6cbca47a
+0,          3,          3,        1,   518400, 0xceb51253
+0,          4,          4,        1,   518400, 0x60cb3cdd
+0,          5,          5,        1,   518400, 0x7b633553
+0,          6,          6,        1,   518400, 0x10c012c9
+0,          7,          7,        1,   518400, 0xa340ee20
+0,          8,          8,        1,   518400, 0x574c22c2
+0,          9,          9,        1,   518400, 0xbcdb1bf7
+0,         10,         10,        1,   518400, 0x57811e9a
+0,         11,         11,        1,   518400, 0xdd4af748
+0,         12,         12,        1,   518400, 0xb931a637
+0,         13,         13,        1,   518400, 0xcef6ce95
+0,         14,         14,        1,   518400, 0xd28c7085
+0,         15,         15,        1,   518400, 0xae9daf53
+0,         16,         16,        1,   518400, 0xca29d819
+0,         17,         17,        1,   518400, 0x3c4bd7eb
+0,         18,         18,        1,   518400, 0x912ee227
+0,         19,         19,        1,   518400, 0xb67d0e27
+0,         20,         20,        1,   518400, 0x8cf7309d
+0,         21,         21,        1,   518400, 0x358ad344
+0,         22,         22,        1,   518400, 0x4462c642
+0,         23,         23,        1,   518400, 0x3bb43428
+0,         24,         24,        1,   518400, 0x12d6f8ca
+0,         25,         25,        1,   518400, 0x003f13aa
+0,         26,         26,        1,   518400, 0x6cd8c432
+0,         27,         27,        1,   518400, 0xee5ff01b
+0,         28,         28,        1,   518400, 0xba0616ee
+0,         29,         29,        1,   518400, 0x37fa7891
diff --git a/tests/ref/fate/h264-conformance-cabref3_sand_d b/tests/ref/fate/h264-conformance-cabref3_sand_d
index 5dfdfac3aa2..d5cd4458797 100644
--- a/tests/ref/fate/h264-conformance-cabref3_sand_d
+++ b/tests/ref/fate/h264-conformance-cabref3_sand_d
@@ -3,53 +3,53 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x2061bbd0
-0,          2,          2,        1,   152064, 0x41adb750
-0,          3,          3,        1,   152064, 0x6e889e90
-0,          4,          4,        1,   152064, 0xbb5e60f5
-0,          5,          5,        1,   152064, 0x5a32eca7
-0,          6,          6,        1,   152064, 0x5cb05e88
-0,          7,          7,        1,   152064, 0x2fff3e6c
-0,          8,          8,        1,   152064, 0xd917c85e
-0,          9,          9,        1,   152064, 0x6eac446f
-0,         10,         10,        1,   152064, 0x238b24b0
-0,         11,         11,        1,   152064, 0x3f3bd44c
-0,         12,         12,        1,   152064, 0x73982bc5
-0,         13,         13,        1,   152064, 0xf6188a82
-0,         14,         14,        1,   152064, 0x818c5b41
-0,         15,         15,        1,   152064, 0x000d1012
-0,         16,         16,        1,   152064, 0xc4a8750e
-0,         17,         17,        1,   152064, 0x1689bb77
-0,         18,         18,        1,   152064, 0x8f52f338
-0,         19,         19,        1,   152064, 0xbf5ee06b
-0,         20,         20,        1,   152064, 0x89508ad7
-0,         21,         21,        1,   152064, 0x2b1986a6
-0,         22,         22,        1,   152064, 0xe6fd6b0e
-0,         23,         23,        1,   152064, 0x883e2e4e
-0,         24,         24,        1,   152064, 0xd133db07
-0,         25,         25,        1,   152064, 0x39b3bb22
-0,         26,         26,        1,   152064, 0x8447410a
-0,         27,         27,        1,   152064, 0x9c66c6e5
-0,         28,         28,        1,   152064, 0x514de9cc
-0,         29,         29,        1,   152064, 0x08d9f1da
-0,         30,         30,        1,   152064, 0x8f10f536
-0,         31,         31,        1,   152064, 0x57d4b27b
-0,         32,         32,        1,   152064, 0x46f56d3c
-0,         33,         33,        1,   152064, 0x5d260230
-0,         34,         34,        1,   152064, 0x4a72aeac
-0,         35,         35,        1,   152064, 0x5cfe187f
-0,         36,         36,        1,   152064, 0x08e55cb2
-0,         37,         37,        1,   152064, 0x4727f34f
-0,         38,         38,        1,   152064, 0xd6a26f1c
-0,         39,         39,        1,   152064, 0xcc1fcf9c
-0,         40,         40,        1,   152064, 0x3681b775
-0,         41,         41,        1,   152064, 0xf580c7d9
-0,         42,         42,        1,   152064, 0xaa6747fb
-0,         43,         43,        1,   152064, 0x2e22f9f9
-0,         44,         44,        1,   152064, 0xb3ee6d81
-0,         45,         45,        1,   152064, 0x930b0145
-0,         46,         46,        1,   152064, 0xae36af99
-0,         47,         47,        1,   152064, 0xeb58fd26
-0,         48,         48,        1,   152064, 0xb9004da3
-0,         49,         49,        1,   152064, 0x2b25e444
-0,         50,         50,        1,   152064, 0xb36927de
+0,          0,          0,        1,   152064, 0x2061bbd0
+0,          1,          1,        1,   152064, 0x41adb750
+0,          2,          2,        1,   152064, 0x6e889e90
+0,          3,          3,        1,   152064, 0xbb5e60f5
+0,          4,          4,        1,   152064, 0x5a32eca7
+0,          5,          5,        1,   152064, 0x5cb05e88
+0,          6,          6,        1,   152064, 0x2fff3e6c
+0,          7,          7,        1,   152064, 0xd917c85e
+0,          8,          8,        1,   152064, 0x6eac446f
+0,          9,          9,        1,   152064, 0x238b24b0
+0,         10,         10,        1,   152064, 0x3f3bd44c
+0,         11,         11,        1,   152064, 0x73982bc5
+0,         12,         12,        1,   152064, 0xf6188a82
+0,         13,         13,        1,   152064, 0x818c5b41
+0,         14,         14,        1,   152064, 0x000d1012
+0,         15,         15,        1,   152064, 0xc4a8750e
+0,         16,         16,        1,   152064, 0x1689bb77
+0,         17,         17,        1,   152064, 0x8f52f338
+0,         18,         18,        1,   152064, 0xbf5ee06b
+0,         19,         19,        1,   152064, 0x89508ad7
+0,         20,         20,        1,   152064, 0x2b1986a6
+0,         21,         21,        1,   152064, 0xe6fd6b0e
+0,         22,         22,        1,   152064, 0x883e2e4e
+0,         23,         23,        1,   152064, 0xd133db07
+0,         24,         24,        1,   152064, 0x39b3bb22
+0,         25,         25,        1,   152064, 0x8447410a
+0,         26,         26,        1,   152064, 0x9c66c6e5
+0,         27,         27,        1,   152064, 0x514de9cc
+0,         28,         28,        1,   152064, 0x08d9f1da
+0,         29,         29,        1,   152064, 0x8f10f536
+0,         30,         30,        1,   152064, 0x57d4b27b
+0,         31,         31,        1,   152064, 0x46f56d3c
+0,         32,         32,        1,   152064, 0x5d260230
+0,         33,         33,        1,   152064, 0x4a72aeac
+0,         34,         34,        1,   152064, 0x5cfe187f
+0,         35,         35,        1,   152064, 0x08e55cb2
+0,         36,         36,        1,   152064, 0x4727f34f
+0,         37,         37,        1,   152064, 0xd6a26f1c
+0,         38,         38,        1,   152064, 0xcc1fcf9c
+0,         39,         39,        1,   152064, 0x3681b775
+0,         40,         40,        1,   152064, 0xf580c7d9
+0,         41,         41,        1,   152064, 0xaa6747fb
+0,         42,         42,        1,   152064, 0x2e22f9f9
+0,         43,         43,        1,   152064, 0xb3ee6d81
+0,         44,         44,        1,   152064, 0x930b0145
+0,         45,         45,        1,   152064, 0xae36af99
+0,         46,         46,        1,   152064, 0xeb58fd26
+0,         47,         47,        1,   152064, 0xb9004da3
+0,         48,         48,        1,   152064, 0x2b25e444
+0,         49,         49,        1,   152064, 0xb36927de
diff --git a/tests/ref/fate/h264-conformance-cafi1_sva_c b/tests/ref/fate/h264-conformance-cafi1_sva_c
index 91ae0fd934f..11d958fd4cd 100644
--- a/tests/ref/fate/h264-conformance-cafi1_sva_c
+++ b/tests/ref/fate/h264-conformance-cafi1_sva_c
@@ -3,36 +3,36 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x47bd73fa
-0,          2,          2,        1,   518400, 0xfe3ea7cc
-0,          3,          3,        1,   518400, 0x9bc549ae
-0,          4,          4,        1,   518400, 0x7bb7f0a1
-0,          5,          5,        1,   518400, 0x328903d4
-0,          6,          6,        1,   518400, 0x96ab366b
-0,          7,          7,        1,   518400, 0xa923eed3
-0,          8,          8,        1,   518400, 0x162b08f6
-0,          9,          9,        1,   518400, 0xe711bd8b
-0,         10,         10,        1,   518400, 0x55e2d4ed
-0,         11,         11,        1,   518400, 0x7dd3107b
-0,         12,         12,        1,   518400, 0x0ed20bcf
-0,         13,         13,        1,   518400, 0x352f5743
-0,         14,         14,        1,   518400, 0x0a3aeb5e
-0,         15,         15,        1,   518400, 0xc458eda3
-0,         16,         16,        1,   518400, 0xe8d5fec5
-0,         17,         17,        1,   518400, 0x18fc6c37
-0,         18,         18,        1,   518400, 0x448add76
-0,         19,         19,        1,   518400, 0x8741ead7
-0,         20,         20,        1,   518400, 0x7008a751
-0,         21,         21,        1,   518400, 0x4ca0633d
-0,         22,         22,        1,   518400, 0x021ab800
-0,         23,         23,        1,   518400, 0xfb91ba57
-0,         24,         24,        1,   518400, 0x90e71dd0
-0,         25,         25,        1,   518400, 0xac859de5
-0,         26,         26,        1,   518400, 0xce9790bd
-0,         27,         27,        1,   518400, 0x010ade8b
-0,         28,         28,        1,   518400, 0xd0b3a399
-0,         29,         29,        1,   518400, 0x6cafcff3
-0,         30,         30,        1,   518400, 0xc32284c0
-0,         31,         31,        1,   518400, 0x1af8f73e
-0,         32,         32,        1,   518400, 0x3babd71e
-0,         33,         33,        1,   518400, 0xd77cb86b
+0,          0,          0,        1,   518400, 0x47bd73fa
+0,          1,          1,        1,   518400, 0xfe3ea7cc
+0,          2,          2,        1,   518400, 0x9bc549ae
+0,          3,          3,        1,   518400, 0x7bb7f0a1
+0,          4,          4,        1,   518400, 0x328903d4
+0,          5,          5,        1,   518400, 0x96ab366b
+0,          6,          6,        1,   518400, 0xa923eed3
+0,          7,          7,        1,   518400, 0x162b08f6
+0,          8,          8,        1,   518400, 0xe711bd8b
+0,          9,          9,        1,   518400, 0x55e2d4ed
+0,         10,         10,        1,   518400, 0x7dd3107b
+0,         11,         11,        1,   518400, 0x0ed20bcf
+0,         12,         12,        1,   518400, 0x352f5743
+0,         13,         13,        1,   518400, 0x0a3aeb5e
+0,         14,         14,        1,   518400, 0xc458eda3
+0,         15,         15,        1,   518400, 0xe8d5fec5
+0,         16,         16,        1,   518400, 0x18fc6c37
+0,         17,         17,        1,   518400, 0x448add76
+0,         18,         18,        1,   518400, 0x8741ead7
+0,         19,         19,        1,   518400, 0x7008a751
+0,         20,         20,        1,   518400, 0x4ca0633d
+0,         21,         21,        1,   518400, 0x021ab800
+0,         22,         22,        1,   518400, 0xfb91ba57
+0,         23,         23,        1,   518400, 0x90e71dd0
+0,         24,         24,        1,   518400, 0xac859de5
+0,         25,         25,        1,   518400, 0xce9790bd
+0,         26,         26,        1,   518400, 0x010ade8b
+0,         27,         27,        1,   518400, 0xd0b3a399
+0,         28,         28,        1,   518400, 0x6cafcff3
+0,         29,         29,        1,   518400, 0xc32284c0
+0,         30,         30,        1,   518400, 0x1af8f73e
+0,         31,         31,        1,   518400, 0x3babd71e
+0,         32,         32,        1,   518400, 0xd77cb86b
diff --git a/tests/ref/fate/h264-conformance-capa1_toshiba_b b/tests/ref/fate/h264-conformance-capa1_toshiba_b
index 8a97a30459d..c88dc547eac 100644
--- a/tests/ref/fate/h264-conformance-capa1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-capa1_toshiba_b
@@ -3,93 +3,93 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x4040d2fc
-0,          2,          2,        1,   152064, 0x0d8f9897
-0,          3,          3,        1,   152064, 0xc23321cd
-0,          4,          4,        1,   152064, 0x3c9225eb
-0,          5,          5,        1,   152064, 0x8927006f
-0,          6,          6,        1,   152064, 0xf706a302
-0,          7,          7,        1,   152064, 0x8219c106
-0,          8,          8,        1,   152064, 0x06c990ea
-0,          9,          9,        1,   152064, 0x3a0f1135
-0,         10,         10,        1,   152064, 0x4cff21d3
-0,         11,         11,        1,   152064, 0x6be0e050
-0,         12,         12,        1,   152064, 0x718b6c7b
-0,         13,         13,        1,   152064, 0x24b38713
-0,         14,         14,        1,   152064, 0x500553fb
-0,         15,         15,        1,   152064, 0x531ae610
-0,         16,         16,        1,   152064, 0x46f4ff1b
-0,         17,         17,        1,   152064, 0xe5abe5ff
-0,         18,         18,        1,   152064, 0x97daa351
-0,         19,         19,        1,   152064, 0xfbef0a8f
-0,         20,         20,        1,   152064, 0xbe76134f
-0,         21,         21,        1,   152064, 0xa4bf10ea
-0,         22,         22,        1,   152064, 0xb2fb32af
-0,         23,         23,        1,   152064, 0xd33027a5
-0,         24,         24,        1,   152064, 0x78e20c2b
-0,         25,         25,        1,   152064, 0xefda2d6f
-0,         26,         26,        1,   152064, 0xb99126f0
-0,         27,         27,        1,   152064, 0x89d7e465
-0,         28,         28,        1,   152064, 0x6150ff97
-0,         29,         29,        1,   152064, 0xde03d937
-0,         30,         30,        1,   152064, 0xd90ca874
-0,         31,         31,        1,   152064, 0xb120b294
-0,         32,         32,        1,   152064, 0x644eade4
-0,         33,         33,        1,   152064, 0xd1bb004f
-0,         34,         34,        1,   152064, 0x99806a8b
-0,         35,         35,        1,   152064, 0x8c6b635f
-0,         36,         36,        1,   152064, 0xa269fa8b
-0,         37,         37,        1,   152064, 0xc11c0e64
-0,         38,         38,        1,   152064, 0xac13f5eb
-0,         39,         39,        1,   152064, 0x895799cf
-0,         40,         40,        1,   152064, 0x95a9bea1
-0,         41,         41,        1,   152064, 0xe998dfba
-0,         42,         42,        1,   152064, 0xc72d8460
-0,         43,         43,        1,   152064, 0xd1cb9b9a
-0,         44,         44,        1,   152064, 0xb49aadd3
-0,         45,         45,        1,   152064, 0x8bc38547
-0,         46,         46,        1,   152064, 0x3485984b
-0,         47,         47,        1,   152064, 0xdf305c0a
-0,         48,         48,        1,   152064, 0x6a1ec990
-0,         49,         49,        1,   152064, 0x595e0de4
-0,         50,         50,        1,   152064, 0xe1baf7c4
-0,         51,         51,        1,   152064, 0xf08b9b47
-0,         52,         52,        1,   152064, 0x6532ba6f
-0,         53,         53,        1,   152064, 0x3de67da6
-0,         54,         54,        1,   152064, 0x439ffd04
-0,         55,         55,        1,   152064, 0x6e6c1e97
-0,         56,         56,        1,   152064, 0x8e5aee7a
-0,         57,         57,        1,   152064, 0xd634999a
-0,         58,         58,        1,   152064, 0xadfa9e8b
-0,         59,         59,        1,   152064, 0x1b9090f5
-0,         60,         60,        1,   152064, 0x29094dfc
-0,         61,         61,        1,   152064, 0x56748851
-0,         62,         62,        1,   152064, 0x2316719d
-0,         63,         63,        1,   152064, 0x2ee0060b
-0,         64,         64,        1,   152064, 0x3edb36d4
-0,         65,         65,        1,   152064, 0x9ef437a3
-0,         66,         66,        1,   152064, 0x8d9af72e
-0,         67,         67,        1,   152064, 0xab86389c
-0,         68,         68,        1,   152064, 0xd3b34576
-0,         69,         69,        1,   152064, 0x9e5b04f4
-0,         70,         70,        1,   152064, 0x6a164c17
-0,         71,         71,        1,   152064, 0xcecf20ab
-0,         72,         72,        1,   152064, 0x07c8e273
-0,         73,         73,        1,   152064, 0x9b46fe6a
-0,         74,         74,        1,   152064, 0xc1e8002b
-0,         75,         75,        1,   152064, 0xdebdbe53
-0,         76,         76,        1,   152064, 0x0d2dfd99
-0,         77,         77,        1,   152064, 0xe8ae925f
-0,         78,         78,        1,   152064, 0xe1fe6272
-0,         79,         79,        1,   152064, 0xbb74d5e6
-0,         80,         80,        1,   152064, 0xc7b5d949
-0,         81,         81,        1,   152064, 0x9b15b020
-0,         82,         82,        1,   152064, 0xc8201f44
-0,         83,         83,        1,   152064, 0x30d03303
-0,         84,         84,        1,   152064, 0x9f66fbc2
-0,         85,         85,        1,   152064, 0x482b71ec
-0,         86,         86,        1,   152064, 0x1c9e50bf
-0,         87,         87,        1,   152064, 0x89f247e4
-0,         88,         88,        1,   152064, 0xaa5f9141
-0,         89,         89,        1,   152064, 0xb816aa8c
-0,         90,         90,        1,   152064, 0x3112a619
+0,          0,          0,        1,   152064, 0x4040d2fc
+0,          1,          1,        1,   152064, 0x0d8f9897
+0,          2,          2,        1,   152064, 0xc23321cd
+0,          3,          3,        1,   152064, 0x3c9225eb
+0,          4,          4,        1,   152064, 0x8927006f
+0,          5,          5,        1,   152064, 0xf706a302
+0,          6,          6,        1,   152064, 0x8219c106
+0,          7,          7,        1,   152064, 0x06c990ea
+0,          8,          8,        1,   152064, 0x3a0f1135
+0,          9,          9,        1,   152064, 0x4cff21d3
+0,         10,         10,        1,   152064, 0x6be0e050
+0,         11,         11,        1,   152064, 0x718b6c7b
+0,         12,         12,        1,   152064, 0x24b38713
+0,         13,         13,        1,   152064, 0x500553fb
+0,         14,         14,        1,   152064, 0x531ae610
+0,         15,         15,        1,   152064, 0x46f4ff1b
+0,         16,         16,        1,   152064, 0xe5abe5ff
+0,         17,         17,        1,   152064, 0x97daa351
+0,         18,         18,        1,   152064, 0xfbef0a8f
+0,         19,         19,        1,   152064, 0xbe76134f
+0,         20,         20,        1,   152064, 0xa4bf10ea
+0,         21,         21,        1,   152064, 0xb2fb32af
+0,         22,         22,        1,   152064, 0xd33027a5
+0,         23,         23,        1,   152064, 0x78e20c2b
+0,         24,         24,        1,   152064, 0xefda2d6f
+0,         25,         25,        1,   152064, 0xb99126f0
+0,         26,         26,        1,   152064, 0x89d7e465
+0,         27,         27,        1,   152064, 0x6150ff97
+0,         28,         28,        1,   152064, 0xde03d937
+0,         29,         29,        1,   152064, 0xd90ca874
+0,         30,         30,        1,   152064, 0xb120b294
+0,         31,         31,        1,   152064, 0x644eade4
+0,         32,         32,        1,   152064, 0xd1bb004f
+0,         33,         33,        1,   152064, 0x99806a8b
+0,         34,         34,        1,   152064, 0x8c6b635f
+0,         35,         35,        1,   152064, 0xa269fa8b
+0,         36,         36,        1,   152064, 0xc11c0e64
+0,         37,         37,        1,   152064, 0xac13f5eb
+0,         38,         38,        1,   152064, 0x895799cf
+0,         39,         39,        1,   152064, 0x95a9bea1
+0,         40,         40,        1,   152064, 0xe998dfba
+0,         41,         41,        1,   152064, 0xc72d8460
+0,         42,         42,        1,   152064, 0xd1cb9b9a
+0,         43,         43,        1,   152064, 0xb49aadd3
+0,         44,         44,        1,   152064, 0x8bc38547
+0,         45,         45,        1,   152064, 0x3485984b
+0,         46,         46,        1,   152064, 0xdf305c0a
+0,         47,         47,        1,   152064, 0x6a1ec990
+0,         48,         48,        1,   152064, 0x595e0de4
+0,         49,         49,        1,   152064, 0xe1baf7c4
+0,         50,         50,        1,   152064, 0xf08b9b47
+0,         51,         51,        1,   152064, 0x6532ba6f
+0,         52,         52,        1,   152064, 0x3de67da6
+0,         53,         53,        1,   152064, 0x439ffd04
+0,         54,         54,        1,   152064, 0x6e6c1e97
+0,         55,         55,        1,   152064, 0x8e5aee7a
+0,         56,         56,        1,   152064, 0xd634999a
+0,         57,         57,        1,   152064, 0xadfa9e8b
+0,         58,         58,        1,   152064, 0x1b9090f5
+0,         59,         59,        1,   152064, 0x29094dfc
+0,         60,         60,        1,   152064, 0x56748851
+0,         61,         61,        1,   152064, 0x2316719d
+0,         62,         62,        1,   152064, 0x2ee0060b
+0,         63,         63,        1,   152064, 0x3edb36d4
+0,         64,         64,        1,   152064, 0x9ef437a3
+0,         65,         65,        1,   152064, 0x8d9af72e
+0,         66,         66,        1,   152064, 0xab86389c
+0,         67,         67,        1,   152064, 0xd3b34576
+0,         68,         68,        1,   152064, 0x9e5b04f4
+0,         69,         69,        1,   152064, 0x6a164c17
+0,         70,         70,        1,   152064, 0xcecf20ab
+0,         71,         71,        1,   152064, 0x07c8e273
+0,         72,         72,        1,   152064, 0x9b46fe6a
+0,         73,         73,        1,   152064, 0xc1e8002b
+0,         74,         74,        1,   152064, 0xdebdbe53
+0,         75,         75,        1,   152064, 0x0d2dfd99
+0,         76,         76,        1,   152064, 0xe8ae925f
+0,         77,         77,        1,   152064, 0xe1fe6272
+0,         78,         78,        1,   152064, 0xbb74d5e6
+0,         79,         79,        1,   152064, 0xc7b5d949
+0,         80,         80,        1,   152064, 0x9b15b020
+0,         81,         81,        1,   152064, 0xc8201f44
+0,         82,         82,        1,   152064, 0x30d03303
+0,         83,         83,        1,   152064, 0x9f66fbc2
+0,         84,         84,        1,   152064, 0x482b71ec
+0,         85,         85,        1,   152064, 0x1c9e50bf
+0,         86,         86,        1,   152064, 0x89f247e4
+0,         87,         87,        1,   152064, 0xaa5f9141
+0,         88,         88,        1,   152064, 0xb816aa8c
+0,         89,         89,        1,   152064, 0x3112a619
diff --git a/tests/ref/fate/h264-conformance-capama3_sand_f b/tests/ref/fate/h264-conformance-capama3_sand_f
index 50d54604938..b847b9a2b99 100644
--- a/tests/ref/fate/h264-conformance-capama3_sand_f
+++ b/tests/ref/fate/h264-conformance-capama3_sand_f
@@ -3,53 +3,53 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0xf772f152
-0,          2,          2,        1,   152064, 0xc416d300
-0,          3,          3,        1,   152064, 0xc2275c94
-0,          4,          4,        1,   152064, 0x1bd35645
-0,          5,          5,        1,   152064, 0x60327bf5
-0,          6,          6,        1,   152064, 0x7f5541bd
-0,          7,          7,        1,   152064, 0x52e5ebad
-0,          8,          8,        1,   152064, 0xb8e5c1f3
-0,          9,          9,        1,   152064, 0x2b4e3653
-0,         10,         10,        1,   152064, 0x9a8f8499
-0,         11,         11,        1,   152064, 0x32d4e9fb
-0,         12,         12,        1,   152064, 0x0bc73d7a
-0,         13,         13,        1,   152064, 0xb58a8b87
-0,         14,         14,        1,   152064, 0xddbc5468
-0,         15,         15,        1,   152064, 0xcfa30b64
-0,         16,         16,        1,   152064, 0xad411f36
-0,         17,         17,        1,   152064, 0x2f8c4d9b
-0,         18,         18,        1,   152064, 0xc8523359
-0,         19,         19,        1,   152064, 0x86be9861
-0,         20,         20,        1,   152064, 0x7518d731
-0,         21,         21,        1,   152064, 0x425fbfab
-0,         22,         22,        1,   152064, 0x4f00250d
-0,         23,         23,        1,   152064, 0x12b40617
-0,         24,         24,        1,   152064, 0x65ff925d
-0,         25,         25,        1,   152064, 0xc76a94c9
-0,         26,         26,        1,   152064, 0x640170d5
-0,         27,         27,        1,   152064, 0xd338a090
-0,         28,         28,        1,   152064, 0xce715174
-0,         29,         29,        1,   152064, 0x7bded195
-0,         30,         30,        1,   152064, 0x09e7d3b9
-0,         31,         31,        1,   152064, 0x651e1518
-0,         32,         32,        1,   152064, 0x03cadc5f
-0,         33,         33,        1,   152064, 0x08906919
-0,         34,         34,        1,   152064, 0x3303ebe0
-0,         35,         35,        1,   152064, 0xa28676c5
-0,         36,         36,        1,   152064, 0x3900ecaf
-0,         37,         37,        1,   152064, 0xeb795a05
-0,         38,         38,        1,   152064, 0x870034df
-0,         39,         39,        1,   152064, 0x69b0527a
-0,         40,         40,        1,   152064, 0xb2b314f9
-0,         41,         41,        1,   152064, 0x1a44ea1a
-0,         42,         42,        1,   152064, 0xe6eaec87
-0,         43,         43,        1,   152064, 0xd9ad818e
-0,         44,         44,        1,   152064, 0x9c7ff76e
-0,         45,         45,        1,   152064, 0x74c45abb
-0,         46,         46,        1,   152064, 0x2f4fa5c6
-0,         47,         47,        1,   152064, 0x19620702
-0,         48,         48,        1,   152064, 0xfc9601f3
-0,         49,         49,        1,   152064, 0x33e0d8e7
-0,         50,         50,        1,   152064, 0xdf7f2a80
+0,          0,          0,        1,   152064, 0xf772f152
+0,          1,          1,        1,   152064, 0xc416d300
+0,          2,          2,        1,   152064, 0xc2275c94
+0,          3,          3,        1,   152064, 0x1bd35645
+0,          4,          4,        1,   152064, 0x60327bf5
+0,          5,          5,        1,   152064, 0x7f5541bd
+0,          6,          6,        1,   152064, 0x52e5ebad
+0,          7,          7,        1,   152064, 0xb8e5c1f3
+0,          8,          8,        1,   152064, 0x2b4e3653
+0,          9,          9,        1,   152064, 0x9a8f8499
+0,         10,         10,        1,   152064, 0x32d4e9fb
+0,         11,         11,        1,   152064, 0x0bc73d7a
+0,         12,         12,        1,   152064, 0xb58a8b87
+0,         13,         13,        1,   152064, 0xddbc5468
+0,         14,         14,        1,   152064, 0xcfa30b64
+0,         15,         15,        1,   152064, 0xad411f36
+0,         16,         16,        1,   152064, 0x2f8c4d9b
+0,         17,         17,        1,   152064, 0xc8523359
+0,         18,         18,        1,   152064, 0x86be9861
+0,         19,         19,        1,   152064, 0x7518d731
+0,         20,         20,        1,   152064, 0x425fbfab
+0,         21,         21,        1,   152064, 0x4f00250d
+0,         22,         22,        1,   152064, 0x12b40617
+0,         23,         23,        1,   152064, 0x65ff925d
+0,         24,         24,        1,   152064, 0xc76a94c9
+0,         25,         25,        1,   152064, 0x640170d5
+0,         26,         26,        1,   152064, 0xd338a090
+0,         27,         27,        1,   152064, 0xce715174
+0,         28,         28,        1,   152064, 0x7bded195
+0,         29,         29,        1,   152064, 0x09e7d3b9
+0,         30,         30,        1,   152064, 0x651e1518
+0,         31,         31,        1,   152064, 0x03cadc5f
+0,         32,         32,        1,   152064, 0x08906919
+0,         33,         33,        1,   152064, 0x3303ebe0
+0,         34,         34,        1,   152064, 0xa28676c5
+0,         35,         35,        1,   152064, 0x3900ecaf
+0,         36,         36,        1,   152064, 0xeb795a05
+0,         37,         37,        1,   152064, 0x870034df
+0,         38,         38,        1,   152064, 0x69b0527a
+0,         39,         39,        1,   152064, 0xb2b314f9
+0,         40,         40,        1,   152064, 0x1a44ea1a
+0,         41,         41,        1,   152064, 0xe6eaec87
+0,         42,         42,        1,   152064, 0xd9ad818e
+0,         43,         43,        1,   152064, 0x9c7ff76e
+0,         44,         44,        1,   152064, 0x74c45abb
+0,         45,         45,        1,   152064, 0x2f4fa5c6
+0,         46,         46,        1,   152064, 0x19620702
+0,         47,         47,        1,   152064, 0xfc9601f3
+0,         48,         48,        1,   152064, 0x33e0d8e7
+0,         49,         49,        1,   152064, 0xdf7f2a80
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
index 7c5663e623a..0ee9a397f5a 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x99d0df36
-0,          2,          2,        1,   518400, 0xa8601c1a
-0,          3,          3,        1,   518400, 0x4a17d235
-0,          4,          4,        1,   518400, 0x75f23abf
-0,          5,          5,        1,   518400, 0x746aad53
-0,          6,          6,        1,   518400, 0xb0b8913e
-0,          7,          7,        1,   518400, 0x60a27f57
-0,          8,          8,        1,   518400, 0xfa227f3e
-0,          9,          9,        1,   518400, 0x7a1e57c2
-0,         10,         10,        1,   518400, 0xcbbaa84f
-0,         11,         11,        1,   518400, 0xf9c1bd13
-0,         12,         12,        1,   518400, 0x9e80caaf
-0,         13,         13,        1,   518400, 0x14cc6928
-0,         14,         14,        1,   518400, 0xca0353ef
-0,         15,         15,        1,   518400, 0xcad65e5f
-0,         16,         16,        1,   518400, 0xd5bc47b3
-0,         17,         17,        1,   518400, 0xa9893d36
-0,         18,         18,        1,   518400, 0x69bd9085
-0,         19,         19,        1,   518400, 0xff33c476
-0,         20,         20,        1,   518400, 0x9538adf7
-0,         21,         21,        1,   518400, 0xd4ff3b62
-0,         22,         22,        1,   518400, 0x021a11fd
-0,         23,         23,        1,   518400, 0x293e6f9f
-0,         24,         24,        1,   518400, 0x5d38e4c3
-0,         25,         25,        1,   518400, 0xd1f4ad49
-0,         26,         26,        1,   518400, 0xf13dd946
-0,         27,         27,        1,   518400, 0x0359e9ff
-0,         28,         28,        1,   518400, 0xb61098ad
-0,         29,         29,        1,   518400, 0xa855b11c
-0,         30,         30,        1,   518400, 0x7fcf9343
+0,          0,          0,        1,   518400, 0x99d0df36
+0,          1,          1,        1,   518400, 0xa8601c1a
+0,          2,          2,        1,   518400, 0x4a17d235
+0,          3,          3,        1,   518400, 0x75f23abf
+0,          4,          4,        1,   518400, 0x746aad53
+0,          5,          5,        1,   518400, 0xb0b8913e
+0,          6,          6,        1,   518400, 0x60a27f57
+0,          7,          7,        1,   518400, 0xfa227f3e
+0,          8,          8,        1,   518400, 0x7a1e57c2
+0,          9,          9,        1,   518400, 0xcbbaa84f
+0,         10,         10,        1,   518400, 0xf9c1bd13
+0,         11,         11,        1,   518400, 0x9e80caaf
+0,         12,         12,        1,   518400, 0x14cc6928
+0,         13,         13,        1,   518400, 0xca0353ef
+0,         14,         14,        1,   518400, 0xcad65e5f
+0,         15,         15,        1,   518400, 0xd5bc47b3
+0,         16,         16,        1,   518400, 0xa9893d36
+0,         17,         17,        1,   518400, 0x69bd9085
+0,         18,         18,        1,   518400, 0xff33c476
+0,         19,         19,        1,   518400, 0x9538adf7
+0,         20,         20,        1,   518400, 0xd4ff3b62
+0,         21,         21,        1,   518400, 0x021a11fd
+0,         22,         22,        1,   518400, 0x293e6f9f
+0,         23,         23,        1,   518400, 0x5d38e4c3
+0,         24,         24,        1,   518400, 0xd1f4ad49
+0,         25,         25,        1,   518400, 0xf13dd946
+0,         26,         26,        1,   518400, 0x0359e9ff
+0,         27,         27,        1,   518400, 0xb61098ad
+0,         28,         28,        1,   518400, 0xa855b11c
+0,         29,         29,        1,   518400, 0x7fcf9343
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
index 8b63e8b5ea7..c0f6a5ed12c 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xf6b83a0e
-0,          2,          2,        1,   518400, 0xc5e8b8ee
-0,          3,          3,        1,   518400, 0xb3bc6e43
-0,          4,          4,        1,   518400, 0x5b08dc73
-0,          5,          5,        1,   518400, 0x4a7f7690
-0,          6,          6,        1,   518400, 0x8a9f4275
-0,          7,          7,        1,   518400, 0xc7cb92fd
-0,          8,          8,        1,   518400, 0xc721e231
-0,          9,          9,        1,   518400, 0xfb31371b
-0,         10,         10,        1,   518400, 0xac57f5d9
-0,         11,         11,        1,   518400, 0x92b7debc
-0,         12,         12,        1,   518400, 0xfe3e533e
-0,         13,         13,        1,   518400, 0x1b3a7a72
-0,         14,         14,        1,   518400, 0x98df2d81
-0,         15,         15,        1,   518400, 0xe0ce9c52
-0,         16,         16,        1,   518400, 0x6a31166d
-0,         17,         17,        1,   518400, 0x64ffd4d2
-0,         18,         18,        1,   518400, 0x3ec062ef
-0,         19,         19,        1,   518400, 0x3480fae1
-0,         20,         20,        1,   518400, 0xa87ae4b7
-0,         21,         21,        1,   518400, 0xd301319f
-0,         22,         22,        1,   518400, 0xa9284989
-0,         23,         23,        1,   518400, 0x3de73b50
-0,         24,         24,        1,   518400, 0x30a79f84
-0,         25,         25,        1,   518400, 0x7d5152d4
-0,         26,         26,        1,   518400, 0x25514095
-0,         27,         27,        1,   518400, 0x1749a05f
-0,         28,         28,        1,   518400, 0x598139a7
-0,         29,         29,        1,   518400, 0x3cece862
-0,         30,         30,        1,   518400, 0xe1c27efe
+0,          0,          0,        1,   518400, 0xf6b83a0e
+0,          1,          1,        1,   518400, 0xc5e8b8ee
+0,          2,          2,        1,   518400, 0xb3bc6e43
+0,          3,          3,        1,   518400, 0x5b08dc73
+0,          4,          4,        1,   518400, 0x4a7f7690
+0,          5,          5,        1,   518400, 0x8a9f4275
+0,          6,          6,        1,   518400, 0xc7cb92fd
+0,          7,          7,        1,   518400, 0xc721e231
+0,          8,          8,        1,   518400, 0xfb31371b
+0,          9,          9,        1,   518400, 0xac57f5d9
+0,         10,         10,        1,   518400, 0x92b7debc
+0,         11,         11,        1,   518400, 0xfe3e533e
+0,         12,         12,        1,   518400, 0x1b3a7a72
+0,         13,         13,        1,   518400, 0x98df2d81
+0,         14,         14,        1,   518400, 0xe0ce9c52
+0,         15,         15,        1,   518400, 0x6a31166d
+0,         16,         16,        1,   518400, 0x64ffd4d2
+0,         17,         17,        1,   518400, 0x3ec062ef
+0,         18,         18,        1,   518400, 0x3480fae1
+0,         19,         19,        1,   518400, 0xa87ae4b7
+0,         20,         20,        1,   518400, 0xd301319f
+0,         21,         21,        1,   518400, 0xa9284989
+0,         22,         22,        1,   518400, 0x3de73b50
+0,         23,         23,        1,   518400, 0x30a79f84
+0,         24,         24,        1,   518400, 0x7d5152d4
+0,         25,         25,        1,   518400, 0x25514095
+0,         26,         26,        1,   518400, 0x1749a05f
+0,         27,         27,        1,   518400, 0x598139a7
+0,         28,         28,        1,   518400, 0x3cece862
+0,         29,         29,        1,   518400, 0xe1c27efe
diff --git a/tests/ref/fate/h264-conformance-cvfi1_sony_d b/tests/ref/fate/h264-conformance-cvfi1_sony_d
index bcb2a150687..bf998bcf8a9 100644
--- a/tests/ref/fate/h264-conformance-cvfi1_sony_d
+++ b/tests/ref/fate/h264-conformance-cvfi1_sony_d
@@ -3,20 +3,20 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xd9444d71
-0,          2,          2,        1,   518400, 0x5d8928cd
-0,          3,          3,        1,   518400, 0xea5bc08b
-0,          4,          4,        1,   518400, 0xb4465d31
-0,          5,          5,        1,   518400, 0x983b5dbb
-0,          6,          6,        1,   518400, 0x54936746
-0,          7,          7,        1,   518400, 0x7ae38b02
-0,          8,          8,        1,   518400, 0xc2a0dd83
-0,          9,          9,        1,   518400, 0x61cac7a6
-0,         10,         10,        1,   518400, 0xb0038443
-0,         11,         11,        1,   518400, 0x16514296
-0,         12,         12,        1,   518400, 0xa68dd470
-0,         13,         13,        1,   518400, 0x2572f868
-0,         14,         14,        1,   518400, 0x770a3239
-0,         15,         15,        1,   518400, 0xdd04f6d2
-0,         16,         16,        1,   518400, 0xa5e5d01e
-0,         17,         17,        1,   518400, 0x5fe25c86
+0,          0,          0,        1,   518400, 0xd9444d71
+0,          1,          1,        1,   518400, 0x5d8928cd
+0,          2,          2,        1,   518400, 0xea5bc08b
+0,          3,          3,        1,   518400, 0xb4465d31
+0,          4,          4,        1,   518400, 0x983b5dbb
+0,          5,          5,        1,   518400, 0x54936746
+0,          6,          6,        1,   518400, 0x7ae38b02
+0,          7,          7,        1,   518400, 0xc2a0dd83
+0,          8,          8,        1,   518400, 0x61cac7a6
+0,          9,          9,        1,   518400, 0xb0038443
+0,         10,         10,        1,   518400, 0x16514296
+0,         11,         11,        1,   518400, 0xa68dd470
+0,         12,         12,        1,   518400, 0x2572f868
+0,         13,         13,        1,   518400, 0x770a3239
+0,         14,         14,        1,   518400, 0xdd04f6d2
+0,         15,         15,        1,   518400, 0xa5e5d01e
+0,         16,         16,        1,   518400, 0x5fe25c86
diff --git a/tests/ref/fate/h264-conformance-cvfi1_sva_c b/tests/ref/fate/h264-conformance-cvfi1_sva_c
index 1a4841a3778..55628842f57 100644
--- a/tests/ref/fate/h264-conformance-cvfi1_sva_c
+++ b/tests/ref/fate/h264-conformance-cvfi1_sva_c
@@ -3,10 +3,10 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x8f022263
-0,          2,          2,        1,   518400, 0x02692654
-0,          3,          3,        1,   518400, 0x55eff579
-0,          4,          4,        1,   518400, 0x6c1bdf1d
-0,          5,          5,        1,   518400, 0xbbedf5e4
-0,          6,          6,        1,   518400, 0xb90d740d
-0,          7,          7,        1,   518400, 0x81300adb
+0,          0,          0,        1,   518400, 0x8f022263
+0,          1,          1,        1,   518400, 0x02692654
+0,          2,          2,        1,   518400, 0x55eff579
+0,          3,          3,        1,   518400, 0x6c1bdf1d
+0,          4,          4,        1,   518400, 0xbbedf5e4
+0,          5,          5,        1,   518400, 0xb90d740d
+0,          6,          6,        1,   518400, 0x81300adb
diff --git a/tests/ref/fate/h264-conformance-cvfi2_sony_h b/tests/ref/fate/h264-conformance-cvfi2_sony_h
index f86d077f0a5..deb9b38ad8c 100644
--- a/tests/ref/fate/h264-conformance-cvfi2_sony_h
+++ b/tests/ref/fate/h264-conformance-cvfi2_sony_h
@@ -3,20 +3,20 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xd9444d71
-0,          2,          2,        1,   518400, 0x491faf75
-0,          3,          3,        1,   518400, 0xf8b4d15c
-0,          4,          4,        1,   518400, 0x99d9f60c
-0,          5,          5,        1,   518400, 0x46c17a6d
-0,          6,          6,        1,   518400, 0x30b9447d
-0,          7,          7,        1,   518400, 0x135d0c76
-0,          8,          8,        1,   518400, 0x1b831a3c
-0,          9,          9,        1,   518400, 0x5910def8
-0,         10,         10,        1,   518400, 0x8db90147
-0,         11,         11,        1,   518400, 0x6a2b79c7
-0,         12,         12,        1,   518400, 0xc8d302e5
-0,         13,         13,        1,   518400, 0x515bb024
-0,         14,         14,        1,   518400, 0xedf7836c
-0,         15,         15,        1,   518400, 0x7e247b9d
-0,         16,         16,        1,   518400, 0x10c9bb10
-0,         17,         17,        1,   518400, 0xe38e2807
+0,          0,          0,        1,   518400, 0xd9444d71
+0,          1,          1,        1,   518400, 0x491faf75
+0,          2,          2,        1,   518400, 0xf8b4d15c
+0,          3,          3,        1,   518400, 0x99d9f60c
+0,          4,          4,        1,   518400, 0x46c17a6d
+0,          5,          5,        1,   518400, 0x30b9447d
+0,          6,          6,        1,   518400, 0x135d0c76
+0,          7,          7,        1,   518400, 0x1b831a3c
+0,          8,          8,        1,   518400, 0x5910def8
+0,          9,          9,        1,   518400, 0x8db90147
+0,         10,         10,        1,   518400, 0x6a2b79c7
+0,         11,         11,        1,   518400, 0xc8d302e5
+0,         12,         12,        1,   518400, 0x515bb024
+0,         13,         13,        1,   518400, 0xedf7836c
+0,         14,         14,        1,   518400, 0x7e247b9d
+0,         15,         15,        1,   518400, 0x10c9bb10
+0,         16,         16,        1,   518400, 0xe38e2807
diff --git a/tests/ref/fate/h264-conformance-cvfi2_sva_c b/tests/ref/fate/h264-conformance-cvfi2_sva_c
index 5fe4546d1bb..e2a0b6da785 100644
--- a/tests/ref/fate/h264-conformance-cvfi2_sva_c
+++ b/tests/ref/fate/h264-conformance-cvfi2_sva_c
@@ -3,16 +3,16 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x4073cc0b
-0,          2,          2,        1,   518400, 0x5f599a48
-0,          3,          3,        1,   518400, 0xc6fe555a
-0,          4,          4,        1,   518400, 0xe63ac345
-0,          5,          5,        1,   518400, 0x9b4f0c5c
-0,          6,          6,        1,   518400, 0x98aaba2d
-0,          7,          7,        1,   518400, 0xd629bd09
-0,          8,          8,        1,   518400, 0xe9796c37
-0,          9,          9,        1,   518400, 0xba54d16e
-0,         10,         10,        1,   518400, 0xe396c3eb
-0,         11,         11,        1,   518400, 0x63ee4b81
-0,         12,         12,        1,   518400, 0x68ac6986
-0,         13,         13,        1,   518400, 0xe0d53000
+0,          0,          0,        1,   518400, 0x4073cc0b
+0,          1,          1,        1,   518400, 0x5f599a48
+0,          2,          2,        1,   518400, 0xc6fe555a
+0,          3,          3,        1,   518400, 0xe63ac345
+0,          4,          4,        1,   518400, 0x9b4f0c5c
+0,          5,          5,        1,   518400, 0x98aaba2d
+0,          6,          6,        1,   518400, 0xd629bd09
+0,          7,          7,        1,   518400, 0xe9796c37
+0,          8,          8,        1,   518400, 0xba54d16e
+0,          9,          9,        1,   518400, 0xe396c3eb
+0,         10,         10,        1,   518400, 0x63ee4b81
+0,         11,         11,        1,   518400, 0x68ac6986
+0,         12,         12,        1,   518400, 0xe0d53000
diff --git a/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e b/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
index d29adc899eb..8cc81e62ac8 100644
--- a/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
+++ b/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
@@ -4,10 +4,10 @@
 #dimensions 0: 720x480
 #sar 0: 0/1
 0,          0,          0,        1,   518400, 0x80dffda2
-0,          2,          2,        1,   518400, 0x9450183b
-0,          3,          3,        1,   518400, 0x85d429a7
-0,          4,          4,        1,   518400, 0xe1f3b686
-0,          5,          5,        1,   518400, 0x2180c761
-0,          6,          6,        1,   518400, 0x30269c7c
-0,          7,          7,        1,   518400, 0xe9aa575a
-0,          8,          8,        1,   518400, 0x7b815a0a
+0,          1,          1,        1,   518400, 0x9450183b
+0,          2,          2,        1,   518400, 0x85d429a7
+0,          3,          3,        1,   518400, 0xe1f3b686
+0,          4,          4,        1,   518400, 0x2180c761
+0,          5,          5,        1,   518400, 0x30269c7c
+0,          6,          6,        1,   518400, 0xe9aa575a
+0,          7,          7,        1,   518400, 0x7b815a0a
diff --git a/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b b/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
index 2f3f50dc928..94d4dff0b18 100644
--- a/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
+++ b/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xe9c7643e
-0,          2,          2,        1,   518400, 0xba7456ec
-0,          3,          3,        1,   518400, 0xdeb96749
-0,          4,          4,        1,   518400, 0xa101a986
-0,          5,          5,        1,   518400, 0x3db7baa5
-0,          6,          6,        1,   518400, 0xf3dfcec7
-0,          7,          7,        1,   518400, 0x79b4f537
-0,          8,          8,        1,   518400, 0x9e64fe68
-0,          9,          9,        1,   518400, 0x0e810b53
-0,         10,         10,        1,   518400, 0x20baf3b8
-0,         11,         11,        1,   518400, 0x0a49d341
-0,         12,         12,        1,   518400, 0xa8304ab5
-0,         13,         13,        1,   518400, 0x2600e98f
-0,         14,         14,        1,   518400, 0x9253e3e8
-0,         15,         15,        1,   518400, 0xd6e12783
-0,         16,         16,        1,   518400, 0x6894fc79
-0,         17,         17,        1,   518400, 0xfb60d3e3
-0,         18,         18,        1,   518400, 0x523602be
-0,         19,         19,        1,   518400, 0x4979f409
-0,         20,         20,        1,   518400, 0x50d4e2ab
-0,         21,         21,        1,   518400, 0xa8c2140a
-0,         22,         22,        1,   518400, 0x45c0bc15
-0,         23,         23,        1,   518400, 0xaef78cab
-0,         24,         24,        1,   518400, 0xec539d02
-0,         25,         25,        1,   518400, 0x602585ea
-0,         26,         26,        1,   518400, 0xda263463
-0,         27,         27,        1,   518400, 0xa03d8922
-0,         28,         28,        1,   518400, 0x43ea1c1d
-0,         29,         29,        1,   518400, 0xb1e055a6
-0,         30,         30,        1,   518400, 0x6fff9398
+0,          0,          0,        1,   518400, 0xe9c7643e
+0,          1,          1,        1,   518400, 0xba7456ec
+0,          2,          2,        1,   518400, 0xdeb96749
+0,          3,          3,        1,   518400, 0xa101a986
+0,          4,          4,        1,   518400, 0x3db7baa5
+0,          5,          5,        1,   518400, 0xf3dfcec7
+0,          6,          6,        1,   518400, 0x79b4f537
+0,          7,          7,        1,   518400, 0x9e64fe68
+0,          8,          8,        1,   518400, 0x0e810b53
+0,          9,          9,        1,   518400, 0x20baf3b8
+0,         10,         10,        1,   518400, 0x0a49d341
+0,         11,         11,        1,   518400, 0xa8304ab5
+0,         12,         12,        1,   518400, 0x2600e98f
+0,         13,         13,        1,   518400, 0x9253e3e8
+0,         14,         14,        1,   518400, 0xd6e12783
+0,         15,         15,        1,   518400, 0x6894fc79
+0,         16,         16,        1,   518400, 0xfb60d3e3
+0,         17,         17,        1,   518400, 0x523602be
+0,         18,         18,        1,   518400, 0x4979f409
+0,         19,         19,        1,   518400, 0x50d4e2ab
+0,         20,         20,        1,   518400, 0xa8c2140a
+0,         21,         21,        1,   518400, 0x45c0bc15
+0,         22,         22,        1,   518400, 0xaef78cab
+0,         23,         23,        1,   518400, 0xec539d02
+0,         24,         24,        1,   518400, 0x602585ea
+0,         25,         25,        1,   518400, 0xda263463
+0,         26,         26,        1,   518400, 0xa03d8922
+0,         27,         27,        1,   518400, 0x43ea1c1d
+0,         28,         28,        1,   518400, 0xb1e055a6
+0,         29,         29,        1,   518400, 0x6fff9398
diff --git a/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b b/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
index 25d46c4bb4c..fc6b1b7d5ea 100644
--- a/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
+++ b/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
@@ -3,33 +3,33 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x7b2475e3
-0,          2,          2,        1,   518400, 0xda786a87
-0,          3,          3,        1,   518400, 0xb1dd8108
-0,          4,          4,        1,   518400, 0x760ed65d
-0,          5,          5,        1,   518400, 0x8632d20c
-0,          6,          6,        1,   518400, 0xdd81e625
-0,          7,          7,        1,   518400, 0x853f1c41
-0,          8,          8,        1,   518400, 0x20191585
-0,          9,          9,        1,   518400, 0x0367e357
-0,         10,         10,        1,   518400, 0x60521167
-0,         11,         11,        1,   518400, 0xa887d4cc
-0,         12,         12,        1,   518400, 0x9a450f9e
-0,         13,         13,        1,   518400, 0xe9620841
-0,         14,         14,        1,   518400, 0xb482fb0e
-0,         15,         15,        1,   518400, 0x7b79f670
-0,         16,         16,        1,   518400, 0x9d37f1d1
-0,         17,         17,        1,   518400, 0xe358d323
-0,         18,         18,        1,   518400, 0x62ade59c
-0,         19,         19,        1,   518400, 0xdd78da66
-0,         20,         20,        1,   518400, 0xd97b867b
-0,         21,         21,        1,   518400, 0x8a90cf8c
-0,         22,         22,        1,   518400, 0x9d386610
-0,         23,         23,        1,   518400, 0x2c590f46
-0,         24,         24,        1,   518400, 0x92662861
-0,         25,         25,        1,   518400, 0x6979f563
-0,         26,         26,        1,   518400, 0xdd0fa1b2
-0,         27,         27,        1,   518400, 0xccbf1c1c
-0,         28,         28,        1,   518400, 0x7e358112
-0,         29,         29,        1,   518400, 0xb7c0d89d
-0,         30,         30,        1,   518400, 0xc6b03973
+0,          0,          0,        1,   518400, 0x7b2475e3
+0,          1,          1,        1,   518400, 0xda786a87
+0,          2,          2,        1,   518400, 0xb1dd8108
+0,          3,          3,        1,   518400, 0x760ed65d
+0,          4,          4,        1,   518400, 0x8632d20c
+0,          5,          5,        1,   518400, 0xdd81e625
+0,          6,          6,        1,   518400, 0x853f1c41
+0,          7,          7,        1,   518400, 0x20191585
+0,          8,          8,        1,   518400, 0x0367e357
+0,          9,          9,        1,   518400, 0x60521167
+0,         10,         10,        1,   518400, 0xa887d4cc
+0,         11,         11,        1,   518400, 0x9a450f9e
+0,         12,         12,        1,   518400, 0xe9620841
+0,         13,         13,        1,   518400, 0xb482fb0e
+0,         14,         14,        1,   518400, 0x7b79f670
+0,         15,         15,        1,   518400, 0x9d37f1d1
+0,         16,         16,        1,   518400, 0xe358d323
+0,         17,         17,        1,   518400, 0x62ade59c
+0,         18,         18,        1,   518400, 0xdd78da66
+0,         19,         19,        1,   518400, 0xd97b867b
+0,         20,         20,        1,   518400, 0x8a90cf8c
+0,         21,         21,        1,   518400, 0x9d386610
+0,         22,         22,        1,   518400, 0x2c590f46
+0,         23,         23,        1,   518400, 0x92662861
+0,         24,         24,        1,   518400, 0x6979f563
+0,         25,         25,        1,   518400, 0xdd0fa1b2
+0,         26,         26,        1,   518400, 0xccbf1c1c
+0,         27,         27,        1,   518400, 0x7e358112
+0,         28,         28,        1,   518400, 0xb7c0d89d
+0,         29,         29,        1,   518400, 0xc6b03973
diff --git a/tests/ref/fate/h264-conformance-cvnlfi1_sony_c b/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
index 47b1a4b2ac9..02a6b537523 100644
--- a/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
+++ b/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
@@ -3,20 +3,20 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x0fbb4e71
-0,          2,          2,        1,   518400, 0x4b816734
-0,          3,          3,        1,   518400, 0x0c350f19
-0,          4,          4,        1,   518400, 0xda049cb6
-0,          5,          5,        1,   518400, 0x1f3e7bb9
-0,          6,          6,        1,   518400, 0x995cbe66
-0,          7,          7,        1,   518400, 0x07f7e65c
-0,          8,          8,        1,   518400, 0xfcb7487f
-0,          9,          9,        1,   518400, 0xb080f48a
-0,         10,         10,        1,   518400, 0x3ef5b7e4
-0,         11,         11,        1,   518400, 0xa1518e1c
-0,         12,         12,        1,   518400, 0xb36f1cc9
-0,         13,         13,        1,   518400, 0x86ea48af
-0,         14,         14,        1,   518400, 0xe42373b7
-0,         15,         15,        1,   518400, 0xa8435828
-0,         16,         16,        1,   518400, 0xc942ea0e
-0,         17,         17,        1,   518400, 0xcc597514
+0,          0,          0,        1,   518400, 0x0fbb4e71
+0,          1,          1,        1,   518400, 0x4b816734
+0,          2,          2,        1,   518400, 0x0c350f19
+0,          3,          3,        1,   518400, 0xda049cb6
+0,          4,          4,        1,   518400, 0x1f3e7bb9
+0,          5,          5,        1,   518400, 0x995cbe66
+0,          6,          6,        1,   518400, 0x07f7e65c
+0,          7,          7,        1,   518400, 0xfcb7487f
+0,          8,          8,        1,   518400, 0xb080f48a
+0,          9,          9,        1,   518400, 0x3ef5b7e4
+0,         10,         10,        1,   518400, 0xa1518e1c
+0,         11,         11,        1,   518400, 0xb36f1cc9
+0,         12,         12,        1,   518400, 0x86ea48af
+0,         13,         13,        1,   518400, 0xe42373b7
+0,         14,         14,        1,   518400, 0xa8435828
+0,         15,         15,        1,   518400, 0xc942ea0e
+0,         16,         16,        1,   518400, 0xcc597514
diff --git a/tests/ref/fate/h264-conformance-cvnlfi2_sony_h b/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
index 48d625e1cbb..c7128ba3369 100644
--- a/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
+++ b/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
@@ -3,20 +3,20 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0x0fbb4e71
-0,          2,          2,        1,   518400, 0xc46bec04
-0,          3,          3,        1,   518400, 0xc50ffc1d
-0,          4,          4,        1,   518400, 0x684b07b7
-0,          5,          5,        1,   518400, 0xde799af0
-0,          6,          6,        1,   518400, 0xed497b27
-0,          7,          7,        1,   518400, 0x3e9d1e3a
-0,          8,          8,        1,   518400, 0x154d3c5c
-0,          9,          9,        1,   518400, 0x5257e37c
-0,         10,         10,        1,   518400, 0x6e15139a
-0,         11,         11,        1,   518400, 0x5dc39c59
-0,         12,         12,        1,   518400, 0xe1803100
-0,         13,         13,        1,   518400, 0xb4d4d535
-0,         14,         14,        1,   518400, 0x7a97a25d
-0,         15,         15,        1,   518400, 0xf86b8923
-0,         16,         16,        1,   518400, 0x3355be98
-0,         17,         17,        1,   518400, 0x8f555830
+0,          0,          0,        1,   518400, 0x0fbb4e71
+0,          1,          1,        1,   518400, 0xc46bec04
+0,          2,          2,        1,   518400, 0xc50ffc1d
+0,          3,          3,        1,   518400, 0x684b07b7
+0,          4,          4,        1,   518400, 0xde799af0
+0,          5,          5,        1,   518400, 0xed497b27
+0,          6,          6,        1,   518400, 0x3e9d1e3a
+0,          7,          7,        1,   518400, 0x154d3c5c
+0,          8,          8,        1,   518400, 0x5257e37c
+0,          9,          9,        1,   518400, 0x6e15139a
+0,         10,         10,        1,   518400, 0x5dc39c59
+0,         11,         11,        1,   518400, 0xe1803100
+0,         12,         12,        1,   518400, 0xb4d4d535
+0,         13,         13,        1,   518400, 0x7a97a25d
+0,         14,         14,        1,   518400, 0xf86b8923
+0,         15,         15,        1,   518400, 0x3355be98
+0,         16,         16,        1,   518400, 0x8f555830
diff --git a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
index fb4104f18d0..6bf9ee39346 100644
--- a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
@@ -3,93 +3,93 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x128cd77a
-0,          2,          2,        1,   152064, 0x565b9fc1
-0,          3,          3,        1,   152064, 0xbe322679
-0,          4,          4,        1,   152064, 0x0ea4238f
-0,          5,          5,        1,   152064, 0x1e08fb3c
-0,          6,          6,        1,   152064, 0x6da3a93c
-0,          7,          7,        1,   152064, 0x75e5b181
-0,          8,          8,        1,   152064, 0xa0b39334
-0,          9,          9,        1,   152064, 0xa0d10d6d
-0,         10,         10,        1,   152064, 0x33842bcb
-0,         11,         11,        1,   152064, 0x9a74e1e4
-0,         12,         12,        1,   152064, 0xc2037244
-0,         13,         13,        1,   152064, 0x364b8ae4
-0,         14,         14,        1,   152064, 0x18c04971
-0,         15,         15,        1,   152064, 0x7234ecb5
-0,         16,         16,        1,   152064, 0x3719f8bc
-0,         17,         17,        1,   152064, 0x1285ead1
-0,         18,         18,        1,   152064, 0xd3bfab18
-0,         19,         19,        1,   152064, 0x898111e2
-0,         20,         20,        1,   152064, 0x681c15fc
-0,         21,         21,        1,   152064, 0x8e501572
-0,         22,         22,        1,   152064, 0xd7c838be
-0,         23,         23,        1,   152064, 0xede424b2
-0,         24,         24,        1,   152064, 0xcfc20240
-0,         25,         25,        1,   152064, 0x13992e86
-0,         26,         26,        1,   152064, 0x56fb251a
-0,         27,         27,        1,   152064, 0xee9be320
-0,         28,         28,        1,   152064, 0xea650153
-0,         29,         29,        1,   152064, 0x2cb6dabe
-0,         30,         30,        1,   152064, 0xf44fa4b5
-0,         31,         31,        1,   152064, 0xdac2adff
-0,         32,         32,        1,   152064, 0x9e15a1dc
-0,         33,         33,        1,   152064, 0x28d00970
-0,         34,         34,        1,   152064, 0xe4277347
-0,         35,         35,        1,   152064, 0xebd25ad1
-0,         36,         36,        1,   152064, 0x029402da
-0,         37,         37,        1,   152064, 0x1a2311ef
-0,         38,         38,        1,   152064, 0xb86bf96a
-0,         39,         39,        1,   152064, 0x67d7a5b0
-0,         40,         40,        1,   152064, 0x573abc2d
-0,         41,         41,        1,   152064, 0xbe97dec0
-0,         42,         42,        1,   152064, 0x592b91a4
-0,         43,         43,        1,   152064, 0x9adda65e
-0,         44,         44,        1,   152064, 0x0354b2cb
-0,         45,         45,        1,   152064, 0x91e27ff9
-0,         46,         46,        1,   152064, 0x389f8625
-0,         47,         47,        1,   152064, 0x90175850
-0,         48,         48,        1,   152064, 0x2d36c427
-0,         49,         49,        1,   152064, 0xc0dd14ab
-0,         50,         50,        1,   152064, 0xd49bf131
-0,         51,         51,        1,   152064, 0x0d4a9b92
-0,         52,         52,        1,   152064, 0xae9bb2f1
-0,         53,         53,        1,   152064, 0x36847ade
-0,         54,         54,        1,   152064, 0x74810382
-0,         55,         55,        1,   152064, 0xc56d1d9f
-0,         56,         56,        1,   152064, 0xcfefe3ae
-0,         57,         57,        1,   152064, 0xeaa39353
-0,         58,         58,        1,   152064, 0x14289aef
-0,         59,         59,        1,   152064, 0x74ba8f3b
-0,         60,         60,        1,   152064, 0xdcaa518d
-0,         61,         61,        1,   152064, 0x6e4881c2
-0,         62,         62,        1,   152064, 0xa4db767d
-0,         63,         63,        1,   152064, 0x239b0b19
-0,         64,         64,        1,   152064, 0x5d054236
-0,         65,         65,        1,   152064, 0x6f392d7c
-0,         66,         66,        1,   152064, 0x5c2af146
-0,         67,         67,        1,   152064, 0x26b439af
-0,         68,         68,        1,   152064, 0xba7043ab
-0,         69,         69,        1,   152064, 0x0816000c
-0,         70,         70,        1,   152064, 0x3a713c05
-0,         71,         71,        1,   152064, 0xb3111f6d
-0,         72,         72,        1,   152064, 0xdbf8dae2
-0,         73,         73,        1,   152064, 0x09ddf22e
-0,         74,         74,        1,   152064, 0x8871fa7e
-0,         75,         75,        1,   152064, 0x9f5db7a1
-0,         76,         76,        1,   152064, 0xcc38f225
-0,         77,         77,        1,   152064, 0xa1d18df9
-0,         78,         78,        1,   152064, 0x9b1c5d6a
-0,         79,         79,        1,   152064, 0x9f2bc696
-0,         80,         80,        1,   152064, 0xc39bd11a
-0,         81,         81,        1,   152064, 0x4ceca7d0
-0,         82,         82,        1,   152064, 0x63a60f1d
-0,         83,         83,        1,   152064, 0x4cd31f28
-0,         84,         84,        1,   152064, 0x9c9af5d1
-0,         85,         85,        1,   152064, 0x6def65fc
-0,         86,         86,        1,   152064, 0x1011466d
-0,         87,         87,        1,   152064, 0xfeca406d
-0,         88,         88,        1,   152064, 0xd1ca8a1e
-0,         89,         89,        1,   152064, 0x30caa195
-0,         90,         90,        1,   152064, 0x31a09a48
+0,          0,          0,        1,   152064, 0x128cd77a
+0,          1,          1,        1,   152064, 0x565b9fc1
+0,          2,          2,        1,   152064, 0xbe322679
+0,          3,          3,        1,   152064, 0x0ea4238f
+0,          4,          4,        1,   152064, 0x1e08fb3c
+0,          5,          5,        1,   152064, 0x6da3a93c
+0,          6,          6,        1,   152064, 0x75e5b181
+0,          7,          7,        1,   152064, 0xa0b39334
+0,          8,          8,        1,   152064, 0xa0d10d6d
+0,          9,          9,        1,   152064, 0x33842bcb
+0,         10,         10,        1,   152064, 0x9a74e1e4
+0,         11,         11,        1,   152064, 0xc2037244
+0,         12,         12,        1,   152064, 0x364b8ae4
+0,         13,         13,        1,   152064, 0x18c04971
+0,         14,         14,        1,   152064, 0x7234ecb5
+0,         15,         15,        1,   152064, 0x3719f8bc
+0,         16,         16,        1,   152064, 0x1285ead1
+0,         17,         17,        1,   152064, 0xd3bfab18
+0,         18,         18,        1,   152064, 0x898111e2
+0,         19,         19,        1,   152064, 0x681c15fc
+0,         20,         20,        1,   152064, 0x8e501572
+0,         21,         21,        1,   152064, 0xd7c838be
+0,         22,         22,        1,   152064, 0xede424b2
+0,         23,         23,        1,   152064, 0xcfc20240
+0,         24,         24,        1,   152064, 0x13992e86
+0,         25,         25,        1,   152064, 0x56fb251a
+0,         26,         26,        1,   152064, 0xee9be320
+0,         27,         27,        1,   152064, 0xea650153
+0,         28,         28,        1,   152064, 0x2cb6dabe
+0,         29,         29,        1,   152064, 0xf44fa4b5
+0,         30,         30,        1,   152064, 0xdac2adff
+0,         31,         31,        1,   152064, 0x9e15a1dc
+0,         32,         32,        1,   152064, 0x28d00970
+0,         33,         33,        1,   152064, 0xe4277347
+0,         34,         34,        1,   152064, 0xebd25ad1
+0,         35,         35,        1,   152064, 0x029402da
+0,         36,         36,        1,   152064, 0x1a2311ef
+0,         37,         37,        1,   152064, 0xb86bf96a
+0,         38,         38,        1,   152064, 0x67d7a5b0
+0,         39,         39,        1,   152064, 0x573abc2d
+0,         40,         40,        1,   152064, 0xbe97dec0
+0,         41,         41,        1,   152064, 0x592b91a4
+0,         42,         42,        1,   152064, 0x9adda65e
+0,         43,         43,        1,   152064, 0x0354b2cb
+0,         44,         44,        1,   152064, 0x91e27ff9
+0,         45,         45,        1,   152064, 0x389f8625
+0,         46,         46,        1,   152064, 0x90175850
+0,         47,         47,        1,   152064, 0x2d36c427
+0,         48,         48,        1,   152064, 0xc0dd14ab
+0,         49,         49,        1,   152064, 0xd49bf131
+0,         50,         50,        1,   152064, 0x0d4a9b92
+0,         51,         51,        1,   152064, 0xae9bb2f1
+0,         52,         52,        1,   152064, 0x36847ade
+0,         53,         53,        1,   152064, 0x74810382
+0,         54,         54,        1,   152064, 0xc56d1d9f
+0,         55,         55,        1,   152064, 0xcfefe3ae
+0,         56,         56,        1,   152064, 0xeaa39353
+0,         57,         57,        1,   152064, 0x14289aef
+0,         58,         58,        1,   152064, 0x74ba8f3b
+0,         59,         59,        1,   152064, 0xdcaa518d
+0,         60,         60,        1,   152064, 0x6e4881c2
+0,         61,         61,        1,   152064, 0xa4db767d
+0,         62,         62,        1,   152064, 0x239b0b19
+0,         63,         63,        1,   152064, 0x5d054236
+0,         64,         64,        1,   152064, 0x6f392d7c
+0,         65,         65,        1,   152064, 0x5c2af146
+0,         66,         66,        1,   152064, 0x26b439af
+0,         67,         67,        1,   152064, 0xba7043ab
+0,         68,         68,        1,   152064, 0x0816000c
+0,         69,         69,        1,   152064, 0x3a713c05
+0,         70,         70,        1,   152064, 0xb3111f6d
+0,         71,         71,        1,   152064, 0xdbf8dae2
+0,         72,         72,        1,   152064, 0x09ddf22e
+0,         73,         73,        1,   152064, 0x8871fa7e
+0,         74,         74,        1,   152064, 0x9f5db7a1
+0,         75,         75,        1,   152064, 0xcc38f225
+0,         76,         76,        1,   152064, 0xa1d18df9
+0,         77,         77,        1,   152064, 0x9b1c5d6a
+0,         78,         78,        1,   152064, 0x9f2bc696
+0,         79,         79,        1,   152064, 0xc39bd11a
+0,         80,         80,        1,   152064, 0x4ceca7d0
+0,         81,         81,        1,   152064, 0x63a60f1d
+0,         82,         82,        1,   152064, 0x4cd31f28
+0,         83,         83,        1,   152064, 0x9c9af5d1
+0,         84,         84,        1,   152064, 0x6def65fc
+0,         85,         85,        1,   152064, 0x1011466d
+0,         86,         86,        1,   152064, 0xfeca406d
+0,         87,         87,        1,   152064, 0xd1ca8a1e
+0,         88,         88,        1,   152064, 0x30caa195
+0,         89,         89,        1,   152064, 0x31a09a48
diff --git a/tests/ref/fate/h264-conformance-fi1_sony_e b/tests/ref/fate/h264-conformance-fi1_sony_e
index 4b3dedce5c3..c48306679c9 100644
--- a/tests/ref/fate/h264-conformance-fi1_sony_e
+++ b/tests/ref/fate/h264-conformance-fi1_sony_e
@@ -3,20 +3,20 @@
 #codec_id 0: rawvideo
 #dimensions 0: 192x128
 #sar 0: 0/1
-0,          1,          1,        1,    36864, 0x3d54d3e3
-0,          2,          2,        1,    36864, 0xa9573ef0
-0,          3,          3,        1,    36864, 0x0ea5f263
-0,          4,          4,        1,    36864, 0x5a849fb9
-0,          5,          5,        1,    36864, 0x7ddb1eff
-0,          6,          6,        1,    36864, 0x5e73e3b7
-0,          7,          7,        1,    36864, 0x7d50d329
-0,          8,          8,        1,    36864, 0xf2c2cd27
-0,          9,          9,        1,    36864, 0xdf4f4628
-0,         10,         10,        1,    36864, 0xddd6d5be
-0,         11,         11,        1,    36864, 0xb530e1aa
-0,         12,         12,        1,    36864, 0xeca42470
-0,         13,         13,        1,    36864, 0xa5701caf
-0,         14,         14,        1,    36864, 0x6f5d28fc
-0,         15,         15,        1,    36864, 0xd4ab4ab2
-0,         16,         16,        1,    36864, 0xf2dfcc22
-0,         17,         17,        1,    36864, 0xcaa87e79
+0,          0,          0,        1,    36864, 0x3d54d3e3
+0,          1,          1,        1,    36864, 0xa9573ef0
+0,          2,          2,        1,    36864, 0x0ea5f263
+0,          3,          3,        1,    36864, 0x5a849fb9
+0,          4,          4,        1,    36864, 0x7ddb1eff
+0,          5,          5,        1,    36864, 0x5e73e3b7
+0,          6,          6,        1,    36864, 0x7d50d329
+0,          7,          7,        1,    36864, 0xf2c2cd27
+0,          8,          8,        1,    36864, 0xdf4f4628
+0,          9,          9,        1,    36864, 0xddd6d5be
+0,         10,         10,        1,    36864, 0xb530e1aa
+0,         11,         11,        1,    36864, 0xeca42470
+0,         12,         12,        1,    36864, 0xa5701caf
+0,         13,         13,        1,    36864, 0x6f5d28fc
+0,         14,         14,        1,    36864, 0xd4ab4ab2
+0,         15,         15,        1,    36864, 0xf2dfcc22
+0,         16,         16,        1,    36864, 0xcaa87e79
diff --git a/tests/ref/fate/h264-conformance-frext-bcrm_freh10 b/tests/ref/fate/h264-conformance-frext-bcrm_freh10
index 4e41aa6cdcb..7592f6c5169 100644
--- a/tests/ref/fate/h264-conformance-frext-bcrm_freh10
+++ b/tests/ref/fate/h264-conformance-frext-bcrm_freh10
@@ -3,103 +3,103 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0xbdc2b880
-0,          2,          2,        1,   152064, 0x4ebf93fe
-0,          3,          3,        1,   152064, 0xe30d6871
-0,          4,          4,        1,   152064, 0x04f46b9b
-0,          5,          5,        1,   152064, 0xd7dd219a
-0,          6,          6,        1,   152064, 0x02fc6511
-0,          7,          7,        1,   152064, 0x98868faa
-0,          8,          8,        1,   152064, 0x54b94f92
-0,          9,          9,        1,   152064, 0xe3b6be4b
-0,         10,         10,        1,   152064, 0xf148cf10
-0,         11,         11,        1,   152064, 0xda3239b8
-0,         12,         12,        1,   152064, 0x6c5d7331
-0,         13,         13,        1,   152064, 0x825f1fea
-0,         14,         14,        1,   152064, 0x47791056
-0,         15,         15,        1,   152064, 0xc08e8a58
-0,         16,         16,        1,   152064, 0x020299f3
-0,         17,         17,        1,   152064, 0x0dfd4457
-0,         18,         18,        1,   152064, 0xcf005e68
-0,         19,         19,        1,   152064, 0x1f9e2c32
-0,         20,         20,        1,   152064, 0xa8359324
-0,         21,         21,        1,   152064, 0x4b03752d
-0,         22,         22,        1,   152064, 0xd6281621
-0,         23,         23,        1,   152064, 0xc97ac928
-0,         24,         24,        1,   152064, 0xded90dcd
-0,         25,         25,        1,   152064, 0xd6883255
-0,         26,         26,        1,   152064, 0x6edb4d4f
-0,         27,         27,        1,   152064, 0xd6f93a80
-0,         28,         28,        1,   152064, 0x163d6153
-0,         29,         29,        1,   152064, 0x04b90c06
-0,         30,         30,        1,   152064, 0xee8730c1
-0,         31,         31,        1,   152064, 0xd5f5c669
-0,         32,         32,        1,   152064, 0xcc600b1f
-0,         33,         33,        1,   152064, 0x15ddde03
-0,         34,         34,        1,   152064, 0xd0388dd0
-0,         35,         35,        1,   152064, 0xa292ab7d
-0,         36,         36,        1,   152064, 0xacf584e9
-0,         37,         37,        1,   152064, 0xcef42714
-0,         38,         38,        1,   152064, 0xeb162f35
-0,         39,         39,        1,   152064, 0x0a07de7b
-0,         40,         40,        1,   152064, 0x7ae76c81
-0,         41,         41,        1,   152064, 0x139c8fda
-0,         42,         42,        1,   152064, 0x43724411
-0,         43,         43,        1,   152064, 0x07b2ddea
-0,         44,         44,        1,   152064, 0x831a1cc7
-0,         45,         45,        1,   152064, 0x092f5073
-0,         46,         46,        1,   152064, 0xe5b6d380
-0,         47,         47,        1,   152064, 0xdd30d69e
-0,         48,         48,        1,   152064, 0x887020b2
-0,         49,         49,        1,   152064, 0x84436510
-0,         50,         50,        1,   152064, 0x49f63606
-0,         51,         51,        1,   152064, 0x6b96e959
-0,         52,         52,        1,   152064, 0xc6247cc7
-0,         53,         53,        1,   152064, 0x7a67c532
-0,         54,         54,        1,   152064, 0x93f4c476
-0,         55,         55,        1,   152064, 0x3c119654
-0,         56,         56,        1,   152064, 0xa45f7c72
-0,         57,         57,        1,   152064, 0x2ac50cb0
-0,         58,         58,        1,   152064, 0x9bf16d06
-0,         59,         59,        1,   152064, 0xfa0750d9
-0,         60,         60,        1,   152064, 0x02197630
-0,         61,         61,        1,   152064, 0x6d44f9b5
-0,         62,         62,        1,   152064, 0x86b211f5
-0,         63,         63,        1,   152064, 0xf4fda5d0
-0,         64,         64,        1,   152064, 0x36f840a7
-0,         65,         65,        1,   152064, 0x42412992
-0,         66,         66,        1,   152064, 0xd0c9ba37
-0,         67,         67,        1,   152064, 0xc40eba62
-0,         68,         68,        1,   152064, 0x2d093b53
-0,         69,         69,        1,   152064, 0xee39c69c
-0,         70,         70,        1,   152064, 0xcbbf8968
-0,         71,         71,        1,   152064, 0xfddc1704
-0,         72,         72,        1,   152064, 0x8dc47c61
-0,         73,         73,        1,   152064, 0xf15580bf
-0,         74,         74,        1,   152064, 0x9c71a8b0
-0,         75,         75,        1,   152064, 0x19b90b9f
-0,         76,         76,        1,   152064, 0xb65ae287
-0,         77,         77,        1,   152064, 0xf265693d
-0,         78,         78,        1,   152064, 0x721714a1
-0,         79,         79,        1,   152064, 0x383e8ac5
-0,         80,         80,        1,   152064, 0x02558677
-0,         81,         81,        1,   152064, 0xdaab3cdf
-0,         82,         82,        1,   152064, 0xc939a2f6
-0,         83,         83,        1,   152064, 0x977afa7f
-0,         84,         84,        1,   152064, 0xe5e65f35
-0,         85,         85,        1,   152064, 0x247546fa
-0,         86,         86,        1,   152064, 0x49ff2094
-0,         87,         87,        1,   152064, 0x9fd58cda
-0,         88,         88,        1,   152064, 0x3e31b6e3
-0,         89,         89,        1,   152064, 0x75c6d796
-0,         90,         90,        1,   152064, 0x4ab3e7bb
-0,         91,         91,        1,   152064, 0x393935ea
-0,         92,         92,        1,   152064, 0xc8e62905
-0,         93,         93,        1,   152064, 0xbb149e61
-0,         94,         94,        1,   152064, 0x2553c4c5
-0,         95,         95,        1,   152064, 0x7f82a8b4
-0,         96,         96,        1,   152064, 0x26ef31e6
-0,         97,         97,        1,   152064, 0xf029744a
-0,         98,         98,        1,   152064, 0x0a6f191a
-0,         99,         99,        1,   152064, 0x55808643
-0,        100,        100,        1,   152064, 0x27576172
+0,          0,          0,        1,   152064, 0xbdc2b880
+0,          1,          1,        1,   152064, 0x4ebf93fe
+0,          2,          2,        1,   152064, 0xe30d6871
+0,          3,          3,        1,   152064, 0x04f46b9b
+0,          4,          4,        1,   152064, 0xd7dd219a
+0,          5,          5,        1,   152064, 0x02fc6511
+0,          6,          6,        1,   152064, 0x98868faa
+0,          7,          7,        1,   152064, 0x54b94f92
+0,          8,          8,        1,   152064, 0xe3b6be4b
+0,          9,          9,        1,   152064, 0xf148cf10
+0,         10,         10,        1,   152064, 0xda3239b8
+0,         11,         11,        1,   152064, 0x6c5d7331
+0,         12,         12,        1,   152064, 0x825f1fea
+0,         13,         13,        1,   152064, 0x47791056
+0,         14,         14,        1,   152064, 0xc08e8a58
+0,         15,         15,        1,   152064, 0x020299f3
+0,         16,         16,        1,   152064, 0x0dfd4457
+0,         17,         17,        1,   152064, 0xcf005e68
+0,         18,         18,        1,   152064, 0x1f9e2c32
+0,         19,         19,        1,   152064, 0xa8359324
+0,         20,         20,        1,   152064, 0x4b03752d
+0,         21,         21,        1,   152064, 0xd6281621
+0,         22,         22,        1,   152064, 0xc97ac928
+0,         23,         23,        1,   152064, 0xded90dcd
+0,         24,         24,        1,   152064, 0xd6883255
+0,         25,         25,        1,   152064, 0x6edb4d4f
+0,         26,         26,        1,   152064, 0xd6f93a80
+0,         27,         27,        1,   152064, 0x163d6153
+0,         28,         28,        1,   152064, 0x04b90c06
+0,         29,         29,        1,   152064, 0xee8730c1
+0,         30,         30,        1,   152064, 0xd5f5c669
+0,         31,         31,        1,   152064, 0xcc600b1f
+0,         32,         32,        1,   152064, 0x15ddde03
+0,         33,         33,        1,   152064, 0xd0388dd0
+0,         34,         34,        1,   152064, 0xa292ab7d
+0,         35,         35,        1,   152064, 0xacf584e9
+0,         36,         36,        1,   152064, 0xcef42714
+0,         37,         37,        1,   152064, 0xeb162f35
+0,         38,         38,        1,   152064, 0x0a07de7b
+0,         39,         39,        1,   152064, 0x7ae76c81
+0,         40,         40,        1,   152064, 0x139c8fda
+0,         41,         41,        1,   152064, 0x43724411
+0,         42,         42,        1,   152064, 0x07b2ddea
+0,         43,         43,        1,   152064, 0x831a1cc7
+0,         44,         44,        1,   152064, 0x092f5073
+0,         45,         45,        1,   152064, 0xe5b6d380
+0,         46,         46,        1,   152064, 0xdd30d69e
+0,         47,         47,        1,   152064, 0x887020b2
+0,         48,         48,        1,   152064, 0x84436510
+0,         49,         49,        1,   152064, 0x49f63606
+0,         50,         50,        1,   152064, 0x6b96e959
+0,         51,         51,        1,   152064, 0xc6247cc7
+0,         52,         52,        1,   152064, 0x7a67c532
+0,         53,         53,        1,   152064, 0x93f4c476
+0,         54,         54,        1,   152064, 0x3c119654
+0,         55,         55,        1,   152064, 0xa45f7c72
+0,         56,         56,        1,   152064, 0x2ac50cb0
+0,         57,         57,        1,   152064, 0x9bf16d06
+0,         58,         58,        1,   152064, 0xfa0750d9
+0,         59,         59,        1,   152064, 0x02197630
+0,         60,         60,        1,   152064, 0x6d44f9b5
+0,         61,         61,        1,   152064, 0x86b211f5
+0,         62,         62,        1,   152064, 0xf4fda5d0
+0,         63,         63,        1,   152064, 0x36f840a7
+0,         64,         64,        1,   152064, 0x42412992
+0,         65,         65,        1,   152064, 0xd0c9ba37
+0,         66,         66,        1,   152064, 0xc40eba62
+0,         67,         67,        1,   152064, 0x2d093b53
+0,         68,         68,        1,   152064, 0xee39c69c
+0,         69,         69,        1,   152064, 0xcbbf8968
+0,         70,         70,        1,   152064, 0xfddc1704
+0,         71,         71,        1,   152064, 0x8dc47c61
+0,         72,         72,        1,   152064, 0xf15580bf
+0,         73,         73,        1,   152064, 0x9c71a8b0
+0,         74,         74,        1,   152064, 0x19b90b9f
+0,         75,         75,        1,   152064, 0xb65ae287
+0,         76,         76,        1,   152064, 0xf265693d
+0,         77,         77,        1,   152064, 0x721714a1
+0,         78,         78,        1,   152064, 0x383e8ac5
+0,         79,         79,        1,   152064, 0x02558677
+0,         80,         80,        1,   152064, 0xdaab3cdf
+0,         81,         81,        1,   152064, 0xc939a2f6
+0,         82,         82,        1,   152064, 0x977afa7f
+0,         83,         83,        1,   152064, 0xe5e65f35
+0,         84,         84,        1,   152064, 0x247546fa
+0,         85,         85,        1,   152064, 0x49ff2094
+0,         86,         86,        1,   152064, 0x9fd58cda
+0,         87,         87,        1,   152064, 0x3e31b6e3
+0,         88,         88,        1,   152064, 0x75c6d796
+0,         89,         89,        1,   152064, 0x4ab3e7bb
+0,         90,         90,        1,   152064, 0x393935ea
+0,         91,         91,        1,   152064, 0xc8e62905
+0,         92,         92,        1,   152064, 0xbb149e61
+0,         93,         93,        1,   152064, 0x2553c4c5
+0,         94,         94,        1,   152064, 0x7f82a8b4
+0,         95,         95,        1,   152064, 0x26ef31e6
+0,         96,         96,        1,   152064, 0xf029744a
+0,         97,         97,        1,   152064, 0x0a6f191a
+0,         98,         98,        1,   152064, 0x55808643
+0,         99,         99,        1,   152064, 0x27576172
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh11 b/tests/ref/fate/h264-conformance-frext-brcm_freh11
index 1ba3b7e1810..5bb9aa447e4 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh11
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh11
@@ -3,103 +3,103 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x9744ac59
-0,          2,          2,        1,   152064, 0x3eba88bf
-0,          3,          3,        1,   152064, 0xd4105c5a
-0,          4,          4,        1,   152064, 0x452966a3
-0,          5,          5,        1,   152064, 0x30071add
-0,          6,          6,        1,   152064, 0x0eb75245
-0,          7,          7,        1,   152064, 0x4daa80fa
-0,          8,          8,        1,   152064, 0xf53a43a1
-0,          9,          9,        1,   152064, 0xa55ab43d
-0,         10,         10,        1,   152064, 0x915ec82e
-0,         11,         11,        1,   152064, 0xadce2f9a
-0,         12,         12,        1,   152064, 0xf7a25715
-0,         13,         13,        1,   152064, 0x90c91c7d
-0,         14,         14,        1,   152064, 0x4f0df4ef
-0,         15,         15,        1,   152064, 0xf6e0783c
-0,         16,         16,        1,   152064, 0x417c8ca8
-0,         17,         17,        1,   152064, 0xd33d29d8
-0,         18,         18,        1,   152064, 0xc9723fa3
-0,         19,         19,        1,   152064, 0x3e4f22f4
-0,         20,         20,        1,   152064, 0xd5aa7bd8
-0,         21,         21,        1,   152064, 0x2a425b54
-0,         22,         22,        1,   152064, 0x2d400788
-0,         23,         23,        1,   152064, 0x12fab3a4
-0,         24,         24,        1,   152064, 0x5544f881
-0,         25,         25,        1,   152064, 0xd0612cc5
-0,         26,         26,        1,   152064, 0x157b3654
-0,         27,         27,        1,   152064, 0x04b61fe0
-0,         28,         28,        1,   152064, 0x897d600a
-0,         29,         29,        1,   152064, 0x0d94fa29
-0,         30,         30,        1,   152064, 0xc0fe249d
-0,         31,         31,        1,   152064, 0x65abc1d6
-0,         32,         32,        1,   152064, 0x2bd5f09d
-0,         33,         33,        1,   152064, 0xd3eebd28
-0,         34,         34,        1,   152064, 0x93458649
-0,         35,         35,        1,   152064, 0x55e793a6
-0,         36,         36,        1,   152064, 0x9fc378ce
-0,         37,         37,        1,   152064, 0x24c32731
-0,         38,         38,        1,   152064, 0x3c321c50
-0,         39,         39,        1,   152064, 0xcef3ca8b
-0,         40,         40,        1,   152064, 0x97116676
-0,         41,         41,        1,   152064, 0x73ae78f6
-0,         42,         42,        1,   152064, 0xdeec219e
-0,         43,         43,        1,   152064, 0xc061d584
-0,         44,         44,        1,   152064, 0xcf47f6c9
-0,         45,         45,        1,   152064, 0x280d3a2d
-0,         46,         46,        1,   152064, 0xb660c846
-0,         47,         47,        1,   152064, 0xe167c588
-0,         48,         48,        1,   152064, 0x08f808de
-0,         49,         49,        1,   152064, 0x9de65c0b
-0,         50,         50,        1,   152064, 0xc52a1937
-0,         51,         51,        1,   152064, 0xf5a4d86f
-0,         52,         52,        1,   152064, 0xbef86d37
-0,         53,         53,        1,   152064, 0xa227b21b
-0,         54,         54,        1,   152064, 0x0601ad35
-0,         55,         55,        1,   152064, 0x15198730
-0,         56,         56,        1,   152064, 0x9af764c6
-0,         57,         57,        1,   152064, 0x1a95e99a
-0,         58,         58,        1,   152064, 0x6bef5aa8
-0,         59,         59,        1,   152064, 0x92f03267
-0,         60,         60,        1,   152064, 0x0a3d56cb
-0,         61,         61,        1,   152064, 0xd9c9f62e
-0,         62,         62,        1,   152064, 0xcd81ea16
-0,         63,         63,        1,   152064, 0x8ed789c0
-0,         64,         64,        1,   152064, 0x5a5e356f
-0,         65,         65,        1,   152064, 0x2f260ebf
-0,         66,         66,        1,   152064, 0xa0379c89
-0,         67,         67,        1,   152064, 0x100cb40c
-0,         68,         68,        1,   152064, 0xaad2220a
-0,         69,         69,        1,   152064, 0xec82aa8d
-0,         70,         70,        1,   152064, 0x91088303
-0,         71,         71,        1,   152064, 0x0cce0e9e
-0,         72,         72,        1,   152064, 0xf3bc716a
-0,         73,         73,        1,   152064, 0x989879c5
-0,         74,         74,        1,   152064, 0x491297a0
-0,         75,         75,        1,   152064, 0xdc16f30d
-0,         76,         76,        1,   152064, 0xb9bfdd57
-0,         77,         77,        1,   152064, 0x5fba59c2
-0,         78,         78,        1,   152064, 0x89c40529
-0,         79,         79,        1,   152064, 0x1b3e7b54
-0,         80,         80,        1,   152064, 0x5d0d7903
-0,         81,         81,        1,   152064, 0x2e3434e1
-0,         82,         82,        1,   152064, 0x1f47a276
-0,         83,         83,        1,   152064, 0xa22de2b1
-0,         84,         84,        1,   152064, 0x77344844
-0,         85,         85,        1,   152064, 0x6a6b3fce
-0,         86,         86,        1,   152064, 0x82660651
-0,         87,         87,        1,   152064, 0x51e67cc9
-0,         88,         88,        1,   152064, 0xb790ae51
-0,         89,         89,        1,   152064, 0x906bc6b6
-0,         90,         90,        1,   152064, 0x55c5dc21
-0,         91,         91,        1,   152064, 0xb51f3004
-0,         92,         92,        1,   152064, 0x68500a25
-0,         93,         93,        1,   152064, 0x5dbc812e
-0,         94,         94,        1,   152064, 0x895eb6ed
-0,         95,         95,        1,   152064, 0x2f5594fc
-0,         96,         96,        1,   152064, 0x04a222a9
-0,         97,         97,        1,   152064, 0x90036f6a
-0,         98,         98,        1,   152064, 0x8b8b064c
-0,         99,         99,        1,   152064, 0xd47c7334
-0,        100,        100,        1,   152064, 0x13f06213
+0,          0,          0,        1,   152064, 0x9744ac59
+0,          1,          1,        1,   152064, 0x3eba88bf
+0,          2,          2,        1,   152064, 0xd4105c5a
+0,          3,          3,        1,   152064, 0x452966a3
+0,          4,          4,        1,   152064, 0x30071add
+0,          5,          5,        1,   152064, 0x0eb75245
+0,          6,          6,        1,   152064, 0x4daa80fa
+0,          7,          7,        1,   152064, 0xf53a43a1
+0,          8,          8,        1,   152064, 0xa55ab43d
+0,          9,          9,        1,   152064, 0x915ec82e
+0,         10,         10,        1,   152064, 0xadce2f9a
+0,         11,         11,        1,   152064, 0xf7a25715
+0,         12,         12,        1,   152064, 0x90c91c7d
+0,         13,         13,        1,   152064, 0x4f0df4ef
+0,         14,         14,        1,   152064, 0xf6e0783c
+0,         15,         15,        1,   152064, 0x417c8ca8
+0,         16,         16,        1,   152064, 0xd33d29d8
+0,         17,         17,        1,   152064, 0xc9723fa3
+0,         18,         18,        1,   152064, 0x3e4f22f4
+0,         19,         19,        1,   152064, 0xd5aa7bd8
+0,         20,         20,        1,   152064, 0x2a425b54
+0,         21,         21,        1,   152064, 0x2d400788
+0,         22,         22,        1,   152064, 0x12fab3a4
+0,         23,         23,        1,   152064, 0x5544f881
+0,         24,         24,        1,   152064, 0xd0612cc5
+0,         25,         25,        1,   152064, 0x157b3654
+0,         26,         26,        1,   152064, 0x04b61fe0
+0,         27,         27,        1,   152064, 0x897d600a
+0,         28,         28,        1,   152064, 0x0d94fa29
+0,         29,         29,        1,   152064, 0xc0fe249d
+0,         30,         30,        1,   152064, 0x65abc1d6
+0,         31,         31,        1,   152064, 0x2bd5f09d
+0,         32,         32,        1,   152064, 0xd3eebd28
+0,         33,         33,        1,   152064, 0x93458649
+0,         34,         34,        1,   152064, 0x55e793a6
+0,         35,         35,        1,   152064, 0x9fc378ce
+0,         36,         36,        1,   152064, 0x24c32731
+0,         37,         37,        1,   152064, 0x3c321c50
+0,         38,         38,        1,   152064, 0xcef3ca8b
+0,         39,         39,        1,   152064, 0x97116676
+0,         40,         40,        1,   152064, 0x73ae78f6
+0,         41,         41,        1,   152064, 0xdeec219e
+0,         42,         42,        1,   152064, 0xc061d584
+0,         43,         43,        1,   152064, 0xcf47f6c9
+0,         44,         44,        1,   152064, 0x280d3a2d
+0,         45,         45,        1,   152064, 0xb660c846
+0,         46,         46,        1,   152064, 0xe167c588
+0,         47,         47,        1,   152064, 0x08f808de
+0,         48,         48,        1,   152064, 0x9de65c0b
+0,         49,         49,        1,   152064, 0xc52a1937
+0,         50,         50,        1,   152064, 0xf5a4d86f
+0,         51,         51,        1,   152064, 0xbef86d37
+0,         52,         52,        1,   152064, 0xa227b21b
+0,         53,         53,        1,   152064, 0x0601ad35
+0,         54,         54,        1,   152064, 0x15198730
+0,         55,         55,        1,   152064, 0x9af764c6
+0,         56,         56,        1,   152064, 0x1a95e99a
+0,         57,         57,        1,   152064, 0x6bef5aa8
+0,         58,         58,        1,   152064, 0x92f03267
+0,         59,         59,        1,   152064, 0x0a3d56cb
+0,         60,         60,        1,   152064, 0xd9c9f62e
+0,         61,         61,        1,   152064, 0xcd81ea16
+0,         62,         62,        1,   152064, 0x8ed789c0
+0,         63,         63,        1,   152064, 0x5a5e356f
+0,         64,         64,        1,   152064, 0x2f260ebf
+0,         65,         65,        1,   152064, 0xa0379c89
+0,         66,         66,        1,   152064, 0x100cb40c
+0,         67,         67,        1,   152064, 0xaad2220a
+0,         68,         68,        1,   152064, 0xec82aa8d
+0,         69,         69,        1,   152064, 0x91088303
+0,         70,         70,        1,   152064, 0x0cce0e9e
+0,         71,         71,        1,   152064, 0xf3bc716a
+0,         72,         72,        1,   152064, 0x989879c5
+0,         73,         73,        1,   152064, 0x491297a0
+0,         74,         74,        1,   152064, 0xdc16f30d
+0,         75,         75,        1,   152064, 0xb9bfdd57
+0,         76,         76,        1,   152064, 0x5fba59c2
+0,         77,         77,        1,   152064, 0x89c40529
+0,         78,         78,        1,   152064, 0x1b3e7b54
+0,         79,         79,        1,   152064, 0x5d0d7903
+0,         80,         80,        1,   152064, 0x2e3434e1
+0,         81,         81,        1,   152064, 0x1f47a276
+0,         82,         82,        1,   152064, 0xa22de2b1
+0,         83,         83,        1,   152064, 0x77344844
+0,         84,         84,        1,   152064, 0x6a6b3fce
+0,         85,         85,        1,   152064, 0x82660651
+0,         86,         86,        1,   152064, 0x51e67cc9
+0,         87,         87,        1,   152064, 0xb790ae51
+0,         88,         88,        1,   152064, 0x906bc6b6
+0,         89,         89,        1,   152064, 0x55c5dc21
+0,         90,         90,        1,   152064, 0xb51f3004
+0,         91,         91,        1,   152064, 0x68500a25
+0,         92,         92,        1,   152064, 0x5dbc812e
+0,         93,         93,        1,   152064, 0x895eb6ed
+0,         94,         94,        1,   152064, 0x2f5594fc
+0,         95,         95,        1,   152064, 0x04a222a9
+0,         96,         96,        1,   152064, 0x90036f6a
+0,         97,         97,        1,   152064, 0x8b8b064c
+0,         98,         98,        1,   152064, 0xd47c7334
+0,         99,         99,        1,   152064, 0x13f06213
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh4 b/tests/ref/fate/h264-conformance-frext-brcm_freh4
index 019df15b1de..9898def9fde 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh4
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh4
@@ -3,103 +3,103 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x9744ac59
-0,          2,          2,        1,   152064, 0xe1c69d97
-0,          3,          3,        1,   152064, 0x9ae85f93
-0,          4,          4,        1,   152064, 0x452966a3
-0,          5,          5,        1,   152064, 0xe8192823
-0,          6,          6,        1,   152064, 0x58b764eb
-0,          7,          7,        1,   152064, 0x51b686b1
-0,          8,          8,        1,   152064, 0x4bca5822
-0,          9,          9,        1,   152064, 0x29abc41c
-0,         10,         10,        1,   152064, 0x850ec94f
-0,         11,         11,        1,   152064, 0xac2c34f8
-0,         12,         12,        1,   152064, 0x080c6e67
-0,         13,         13,        1,   152064, 0x5e4e14d2
-0,         14,         14,        1,   152064, 0x978b054c
-0,         15,         15,        1,   152064, 0x861d8c3c
-0,         16,         16,        1,   152064, 0xe0818918
-0,         17,         17,        1,   152064, 0x8b834511
-0,         18,         18,        1,   152064, 0x223f567c
-0,         19,         19,        1,   152064, 0x6d61298d
-0,         20,         20,        1,   152064, 0xfe30826e
-0,         21,         21,        1,   152064, 0x4bad4f98
-0,         22,         22,        1,   152064, 0x69d5fdca
-0,         23,         23,        1,   152064, 0xe45bba1b
-0,         24,         24,        1,   152064, 0xa6d81298
-0,         25,         25,        1,   152064, 0x7f3f2c91
-0,         26,         26,        1,   152064, 0x658754b9
-0,         27,         27,        1,   152064, 0x2c6d3eba
-0,         28,         28,        1,   152064, 0x4500600c
-0,         29,         29,        1,   152064, 0xa745f74b
-0,         30,         30,        1,   152064, 0x2bf21fca
-0,         31,         31,        1,   152064, 0x08b8bdb3
-0,         32,         32,        1,   152064, 0x5a9d0a8b
-0,         33,         33,        1,   152064, 0x3a57d523
-0,         34,         34,        1,   152064, 0x3606826e
-0,         35,         35,        1,   152064, 0x3b91a8fb
-0,         36,         36,        1,   152064, 0x37c28959
-0,         37,         37,        1,   152064, 0xb51d1e75
-0,         38,         38,        1,   152064, 0x13be3f58
-0,         39,         39,        1,   152064, 0x0ed0e7cf
-0,         40,         40,        1,   152064, 0x298560d4
-0,         41,         41,        1,   152064, 0x62b68373
-0,         42,         42,        1,   152064, 0xf8bb4520
-0,         43,         43,        1,   152064, 0x90dfd6af
-0,         44,         44,        1,   152064, 0xf4770d20
-0,         45,         45,        1,   152064, 0x0d9549a0
-0,         46,         46,        1,   152064, 0x004eccb1
-0,         47,         47,        1,   152064, 0x3146d46b
-0,         48,         48,        1,   152064, 0x078d1808
-0,         49,         49,        1,   152064, 0x5d8d60cd
-0,         50,         50,        1,   152064, 0x8ff52dd8
-0,         51,         51,        1,   152064, 0x5aa3ccf7
-0,         52,         52,        1,   152064, 0x5bec6c39
-0,         53,         53,        1,   152064, 0xd44cae9d
-0,         54,         54,        1,   152064, 0xa1b0a151
-0,         55,         55,        1,   152064, 0xe3be7bb2
-0,         56,         56,        1,   152064, 0x50096775
-0,         57,         57,        1,   152064, 0xdffff851
-0,         58,         58,        1,   152064, 0x1d7250eb
-0,         59,         59,        1,   152064, 0x69663ca7
-0,         60,         60,        1,   152064, 0x62f77fc7
-0,         61,         61,        1,   152064, 0xbab8f471
-0,         62,         62,        1,   152064, 0x6af31785
-0,         63,         63,        1,   152064, 0xcbb2a9aa
-0,         64,         64,        1,   152064, 0xc57c32b9
-0,         65,         65,        1,   152064, 0xecbe2ce0
-0,         66,         66,        1,   152064, 0x2fbebf81
-0,         67,         67,        1,   152064, 0xa168af68
-0,         68,         68,        1,   152064, 0x1e5631ac
-0,         69,         69,        1,   152064, 0xe69fc927
-0,         70,         70,        1,   152064, 0x8e5c81d8
-0,         71,         71,        1,   152064, 0x42402010
-0,         72,         72,        1,   152064, 0xd7267482
-0,         73,         73,        1,   152064, 0x64b280df
-0,         74,         74,        1,   152064, 0xc4cbafcc
-0,         75,         75,        1,   152064, 0xcf2f1e8b
-0,         76,         76,        1,   152064, 0x4d6fdb3f
-0,         77,         77,        1,   152064, 0xf22d6fed
-0,         78,         78,        1,   152064, 0x625b167c
-0,         79,         79,        1,   152064, 0x41348089
-0,         80,         80,        1,   152064, 0x6db2779b
-0,         81,         81,        1,   152064, 0xe87030a8
-0,         82,         82,        1,   152064, 0x91b29cdd
-0,         83,         83,        1,   152064, 0xe824f242
-0,         84,         84,        1,   152064, 0xac995380
-0,         85,         85,        1,   152064, 0x7efe361b
-0,         86,         86,        1,   152064, 0xe10c0c26
-0,         87,         87,        1,   152064, 0x93108260
-0,         88,         88,        1,   152064, 0xbf4caed7
-0,         89,         89,        1,   152064, 0xb6a4d826
-0,         90,         90,        1,   152064, 0x78beea4e
-0,         91,         91,        1,   152064, 0xdf612df9
-0,         92,         92,        1,   152064, 0xa9ef2830
-0,         93,         93,        1,   152064, 0x06448895
-0,         94,         94,        1,   152064, 0x332eb6d5
-0,         95,         95,        1,   152064, 0x935ba2c5
-0,         96,         96,        1,   152064, 0x62a22656
-0,         97,         97,        1,   152064, 0x06a670a7
-0,         98,         98,        1,   152064, 0xf60b1af0
-0,         99,         99,        1,   152064, 0x85177c10
-0,        100,        100,        1,   152064, 0x5e4e5c4b
+0,          0,          0,        1,   152064, 0x9744ac59
+0,          1,          1,        1,   152064, 0xe1c69d97
+0,          2,          2,        1,   152064, 0x9ae85f93
+0,          3,          3,        1,   152064, 0x452966a3
+0,          4,          4,        1,   152064, 0xe8192823
+0,          5,          5,        1,   152064, 0x58b764eb
+0,          6,          6,        1,   152064, 0x51b686b1
+0,          7,          7,        1,   152064, 0x4bca5822
+0,          8,          8,        1,   152064, 0x29abc41c
+0,          9,          9,        1,   152064, 0x850ec94f
+0,         10,         10,        1,   152064, 0xac2c34f8
+0,         11,         11,        1,   152064, 0x080c6e67
+0,         12,         12,        1,   152064, 0x5e4e14d2
+0,         13,         13,        1,   152064, 0x978b054c
+0,         14,         14,        1,   152064, 0x861d8c3c
+0,         15,         15,        1,   152064, 0xe0818918
+0,         16,         16,        1,   152064, 0x8b834511
+0,         17,         17,        1,   152064, 0x223f567c
+0,         18,         18,        1,   152064, 0x6d61298d
+0,         19,         19,        1,   152064, 0xfe30826e
+0,         20,         20,        1,   152064, 0x4bad4f98
+0,         21,         21,        1,   152064, 0x69d5fdca
+0,         22,         22,        1,   152064, 0xe45bba1b
+0,         23,         23,        1,   152064, 0xa6d81298
+0,         24,         24,        1,   152064, 0x7f3f2c91
+0,         25,         25,        1,   152064, 0x658754b9
+0,         26,         26,        1,   152064, 0x2c6d3eba
+0,         27,         27,        1,   152064, 0x4500600c
+0,         28,         28,        1,   152064, 0xa745f74b
+0,         29,         29,        1,   152064, 0x2bf21fca
+0,         30,         30,        1,   152064, 0x08b8bdb3
+0,         31,         31,        1,   152064, 0x5a9d0a8b
+0,         32,         32,        1,   152064, 0x3a57d523
+0,         33,         33,        1,   152064, 0x3606826e
+0,         34,         34,        1,   152064, 0x3b91a8fb
+0,         35,         35,        1,   152064, 0x37c28959
+0,         36,         36,        1,   152064, 0xb51d1e75
+0,         37,         37,        1,   152064, 0x13be3f58
+0,         38,         38,        1,   152064, 0x0ed0e7cf
+0,         39,         39,        1,   152064, 0x298560d4
+0,         40,         40,        1,   152064, 0x62b68373
+0,         41,         41,        1,   152064, 0xf8bb4520
+0,         42,         42,        1,   152064, 0x90dfd6af
+0,         43,         43,        1,   152064, 0xf4770d20
+0,         44,         44,        1,   152064, 0x0d9549a0
+0,         45,         45,        1,   152064, 0x004eccb1
+0,         46,         46,        1,   152064, 0x3146d46b
+0,         47,         47,        1,   152064, 0x078d1808
+0,         48,         48,        1,   152064, 0x5d8d60cd
+0,         49,         49,        1,   152064, 0x8ff52dd8
+0,         50,         50,        1,   152064, 0x5aa3ccf7
+0,         51,         51,        1,   152064, 0x5bec6c39
+0,         52,         52,        1,   152064, 0xd44cae9d
+0,         53,         53,        1,   152064, 0xa1b0a151
+0,         54,         54,        1,   152064, 0xe3be7bb2
+0,         55,         55,        1,   152064, 0x50096775
+0,         56,         56,        1,   152064, 0xdffff851
+0,         57,         57,        1,   152064, 0x1d7250eb
+0,         58,         58,        1,   152064, 0x69663ca7
+0,         59,         59,        1,   152064, 0x62f77fc7
+0,         60,         60,        1,   152064, 0xbab8f471
+0,         61,         61,        1,   152064, 0x6af31785
+0,         62,         62,        1,   152064, 0xcbb2a9aa
+0,         63,         63,        1,   152064, 0xc57c32b9
+0,         64,         64,        1,   152064, 0xecbe2ce0
+0,         65,         65,        1,   152064, 0x2fbebf81
+0,         66,         66,        1,   152064, 0xa168af68
+0,         67,         67,        1,   152064, 0x1e5631ac
+0,         68,         68,        1,   152064, 0xe69fc927
+0,         69,         69,        1,   152064, 0x8e5c81d8
+0,         70,         70,        1,   152064, 0x42402010
+0,         71,         71,        1,   152064, 0xd7267482
+0,         72,         72,        1,   152064, 0x64b280df
+0,         73,         73,        1,   152064, 0xc4cbafcc
+0,         74,         74,        1,   152064, 0xcf2f1e8b
+0,         75,         75,        1,   152064, 0x4d6fdb3f
+0,         76,         76,        1,   152064, 0xf22d6fed
+0,         77,         77,        1,   152064, 0x625b167c
+0,         78,         78,        1,   152064, 0x41348089
+0,         79,         79,        1,   152064, 0x6db2779b
+0,         80,         80,        1,   152064, 0xe87030a8
+0,         81,         81,        1,   152064, 0x91b29cdd
+0,         82,         82,        1,   152064, 0xe824f242
+0,         83,         83,        1,   152064, 0xac995380
+0,         84,         84,        1,   152064, 0x7efe361b
+0,         85,         85,        1,   152064, 0xe10c0c26
+0,         86,         86,        1,   152064, 0x93108260
+0,         87,         87,        1,   152064, 0xbf4caed7
+0,         88,         88,        1,   152064, 0xb6a4d826
+0,         89,         89,        1,   152064, 0x78beea4e
+0,         90,         90,        1,   152064, 0xdf612df9
+0,         91,         91,        1,   152064, 0xa9ef2830
+0,         92,         92,        1,   152064, 0x06448895
+0,         93,         93,        1,   152064, 0x332eb6d5
+0,         94,         94,        1,   152064, 0x935ba2c5
+0,         95,         95,        1,   152064, 0x62a22656
+0,         96,         96,        1,   152064, 0x06a670a7
+0,         97,         97,        1,   152064, 0xf60b1af0
+0,         98,         98,        1,   152064, 0x85177c10
+0,         99,         99,        1,   152064, 0x5e4e5c4b
diff --git a/tests/ref/fate/h264-conformance-frext-freh6 b/tests/ref/fate/h264-conformance-frext-freh6
index a5264d61dce..57ac261800a 100644
--- a/tests/ref/fate/h264-conformance-frext-freh6
+++ b/tests/ref/fate/h264-conformance-frext-freh6
@@ -3,103 +3,103 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x3b21d6cd
-0,          2,          2,        1,   152064, 0xc32088c6
-0,          3,          3,        1,   152064, 0x65a64cee
-0,          4,          4,        1,   152064, 0x0bd45a5b
-0,          5,          5,        1,   152064, 0xb2210d4d
-0,          6,          6,        1,   152064, 0xf5b15527
-0,          7,          7,        1,   152064, 0x806572ad
-0,          8,          8,        1,   152064, 0x6ecb1fc8
-0,          9,          9,        1,   152064, 0xc25e96d5
-0,         10,         10,        1,   152064, 0x5593b825
-0,         11,         11,        1,   152064, 0xf3be1cff
-0,         12,         12,        1,   152064, 0xa9155072
-0,         13,         13,        1,   152064, 0xd5552e26
-0,         14,         14,        1,   152064, 0x7bf0dbee
-0,         15,         15,        1,   152064, 0x998b4911
-0,         16,         16,        1,   152064, 0xcc71bbe0
-0,         17,         17,        1,   152064, 0x602415b8
-0,         18,         18,        1,   152064, 0xcfff37cf
-0,         19,         19,        1,   152064, 0x7cf824a8
-0,         20,         20,        1,   152064, 0x34816ee5
-0,         21,         21,        1,   152064, 0x1480540c
-0,         22,         22,        1,   152064, 0xc2351aaf
-0,         23,         23,        1,   152064, 0x3b8eac9f
-0,         24,         24,        1,   152064, 0x92a8faf8
-0,         25,         25,        1,   152064, 0x7b6121c8
-0,         26,         26,        1,   152064, 0xe73a3bac
-0,         27,         27,        1,   152064, 0xcd6e1e36
-0,         28,         28,        1,   152064, 0xb24660b1
-0,         29,         29,        1,   152064, 0xa290ec25
-0,         30,         30,        1,   152064, 0x308915ff
-0,         31,         31,        1,   152064, 0x1e8dd4db
-0,         32,         32,        1,   152064, 0x1372f2e0
-0,         33,         33,        1,   152064, 0xa07cc1d0
-0,         34,         34,        1,   152064, 0x34bb872c
-0,         35,         35,        1,   152064, 0x59e6a565
-0,         36,         36,        1,   152064, 0x9a097932
-0,         37,         37,        1,   152064, 0x938f2e20
-0,         38,         38,        1,   152064, 0x59a8157d
-0,         39,         39,        1,   152064, 0x5cacd404
-0,         40,         40,        1,   152064, 0xdad068f5
-0,         41,         41,        1,   152064, 0x7ba67d47
-0,         42,         42,        1,   152064, 0xc2a11e2d
-0,         43,         43,        1,   152064, 0xd37fdef7
-0,         44,         44,        1,   152064, 0x19a3f80a
-0,         45,         45,        1,   152064, 0x7ec7426a
-0,         46,         46,        1,   152064, 0x8ffedb61
-0,         47,         47,        1,   152064, 0x82aebdd0
-0,         48,         48,        1,   152064, 0xdfc920cc
-0,         49,         49,        1,   152064, 0x2a467698
-0,         50,         50,        1,   152064, 0xd08a37d5
-0,         51,         51,        1,   152064, 0xe606e66a
-0,         52,         52,        1,   152064, 0x0e7b8bd8
-0,         53,         53,        1,   152064, 0xf983c732
-0,         54,         54,        1,   152064, 0x9b82c2e7
-0,         55,         55,        1,   152064, 0xa990a47e
-0,         56,         56,        1,   152064, 0x2d5679f1
-0,         57,         57,        1,   152064, 0x7f1c0201
-0,         58,         58,        1,   152064, 0xc38b709d
-0,         59,         59,        1,   152064, 0x040246d8
-0,         60,         60,        1,   152064, 0xbc856021
-0,         61,         61,        1,   152064, 0x81e01a78
-0,         62,         62,        1,   152064, 0xaff1e7f1
-0,         63,         63,        1,   152064, 0x1fee7715
-0,         64,         64,        1,   152064, 0x65053711
-0,         65,         65,        1,   152064, 0x238a0118
-0,         66,         66,        1,   152064, 0x563491b4
-0,         67,         67,        1,   152064, 0x5974a6cc
-0,         68,         68,        1,   152064, 0xd8682c35
-0,         69,         69,        1,   152064, 0x85c49e96
-0,         70,         70,        1,   152064, 0x29486faa
-0,         71,         71,        1,   152064, 0x1a4f0579
-0,         72,         72,        1,   152064, 0x6ab86c2f
-0,         73,         73,        1,   152064, 0x36a36d2b
-0,         74,         74,        1,   152064, 0x3bd77543
-0,         75,         75,        1,   152064, 0x8fbddc41
-0,         76,         76,        1,   152064, 0xccc6e0a5
-0,         77,         77,        1,   152064, 0x00a9539e
-0,         78,         78,        1,   152064, 0x07ba0714
-0,         79,         79,        1,   152064, 0xbab2735d
-0,         80,         80,        1,   152064, 0x79cb5ba0
-0,         81,         81,        1,   152064, 0xdbcc1c92
-0,         82,         82,        1,   152064, 0xffec952c
-0,         83,         83,        1,   152064, 0xc31ac68e
-0,         84,         84,        1,   152064, 0x24293eb9
-0,         85,         85,        1,   152064, 0x7b9b2cb4
-0,         86,         86,        1,   152064, 0x9dd4fe95
-0,         87,         87,        1,   152064, 0xb62e8baf
-0,         88,         88,        1,   152064, 0x9fefc174
-0,         89,         89,        1,   152064, 0xe027c24e
-0,         90,         90,        1,   152064, 0xe38adc70
-0,         91,         91,        1,   152064, 0xc7bf536f
-0,         92,         92,        1,   152064, 0x4448f330
-0,         93,         93,        1,   152064, 0x4dad5339
-0,         94,         94,        1,   152064, 0x48fbab15
-0,         95,         95,        1,   152064, 0xe6c97b2c
-0,         96,         96,        1,   152064, 0x3c3829ee
-0,         97,         97,        1,   152064, 0x927772c0
-0,         98,         98,        1,   152064, 0xbb0f0ef4
-0,         99,         99,        1,   152064, 0xe65780a7
-0,        100,        100,        1,   152064, 0xaf8f6d72
+0,          0,          0,        1,   152064, 0x3b21d6cd
+0,          1,          1,        1,   152064, 0xc32088c6
+0,          2,          2,        1,   152064, 0x65a64cee
+0,          3,          3,        1,   152064, 0x0bd45a5b
+0,          4,          4,        1,   152064, 0xb2210d4d
+0,          5,          5,        1,   152064, 0xf5b15527
+0,          6,          6,        1,   152064, 0x806572ad
+0,          7,          7,        1,   152064, 0x6ecb1fc8
+0,          8,          8,        1,   152064, 0xc25e96d5
+0,          9,          9,        1,   152064, 0x5593b825
+0,         10,         10,        1,   152064, 0xf3be1cff
+0,         11,         11,        1,   152064, 0xa9155072
+0,         12,         12,        1,   152064, 0xd5552e26
+0,         13,         13,        1,   152064, 0x7bf0dbee
+0,         14,         14,        1,   152064, 0x998b4911
+0,         15,         15,        1,   152064, 0xcc71bbe0
+0,         16,         16,        1,   152064, 0x602415b8
+0,         17,         17,        1,   152064, 0xcfff37cf
+0,         18,         18,        1,   152064, 0x7cf824a8
+0,         19,         19,        1,   152064, 0x34816ee5
+0,         20,         20,        1,   152064, 0x1480540c
+0,         21,         21,        1,   152064, 0xc2351aaf
+0,         22,         22,        1,   152064, 0x3b8eac9f
+0,         23,         23,        1,   152064, 0x92a8faf8
+0,         24,         24,        1,   152064, 0x7b6121c8
+0,         25,         25,        1,   152064, 0xe73a3bac
+0,         26,         26,        1,   152064, 0xcd6e1e36
+0,         27,         27,        1,   152064, 0xb24660b1
+0,         28,         28,        1,   152064, 0xa290ec25
+0,         29,         29,        1,   152064, 0x308915ff
+0,         30,         30,        1,   152064, 0x1e8dd4db
+0,         31,         31,        1,   152064, 0x1372f2e0
+0,         32,         32,        1,   152064, 0xa07cc1d0
+0,         33,         33,        1,   152064, 0x34bb872c
+0,         34,         34,        1,   152064, 0x59e6a565
+0,         35,         35,        1,   152064, 0x9a097932
+0,         36,         36,        1,   152064, 0x938f2e20
+0,         37,         37,        1,   152064, 0x59a8157d
+0,         38,         38,        1,   152064, 0x5cacd404
+0,         39,         39,        1,   152064, 0xdad068f5
+0,         40,         40,        1,   152064, 0x7ba67d47
+0,         41,         41,        1,   152064, 0xc2a11e2d
+0,         42,         42,        1,   152064, 0xd37fdef7
+0,         43,         43,        1,   152064, 0x19a3f80a
+0,         44,         44,        1,   152064, 0x7ec7426a
+0,         45,         45,        1,   152064, 0x8ffedb61
+0,         46,         46,        1,   152064, 0x82aebdd0
+0,         47,         47,        1,   152064, 0xdfc920cc
+0,         48,         48,        1,   152064, 0x2a467698
+0,         49,         49,        1,   152064, 0xd08a37d5
+0,         50,         50,        1,   152064, 0xe606e66a
+0,         51,         51,        1,   152064, 0x0e7b8bd8
+0,         52,         52,        1,   152064, 0xf983c732
+0,         53,         53,        1,   152064, 0x9b82c2e7
+0,         54,         54,        1,   152064, 0xa990a47e
+0,         55,         55,        1,   152064, 0x2d5679f1
+0,         56,         56,        1,   152064, 0x7f1c0201
+0,         57,         57,        1,   152064, 0xc38b709d
+0,         58,         58,        1,   152064, 0x040246d8
+0,         59,         59,        1,   152064, 0xbc856021
+0,         60,         60,        1,   152064, 0x81e01a78
+0,         61,         61,        1,   152064, 0xaff1e7f1
+0,         62,         62,        1,   152064, 0x1fee7715
+0,         63,         63,        1,   152064, 0x65053711
+0,         64,         64,        1,   152064, 0x238a0118
+0,         65,         65,        1,   152064, 0x563491b4
+0,         66,         66,        1,   152064, 0x5974a6cc
+0,         67,         67,        1,   152064, 0xd8682c35
+0,         68,         68,        1,   152064, 0x85c49e96
+0,         69,         69,        1,   152064, 0x29486faa
+0,         70,         70,        1,   152064, 0x1a4f0579
+0,         71,         71,        1,   152064, 0x6ab86c2f
+0,         72,         72,        1,   152064, 0x36a36d2b
+0,         73,         73,        1,   152064, 0x3bd77543
+0,         74,         74,        1,   152064, 0x8fbddc41
+0,         75,         75,        1,   152064, 0xccc6e0a5
+0,         76,         76,        1,   152064, 0x00a9539e
+0,         77,         77,        1,   152064, 0x07ba0714
+0,         78,         78,        1,   152064, 0xbab2735d
+0,         79,         79,        1,   152064, 0x79cb5ba0
+0,         80,         80,        1,   152064, 0xdbcc1c92
+0,         81,         81,        1,   152064, 0xffec952c
+0,         82,         82,        1,   152064, 0xc31ac68e
+0,         83,         83,        1,   152064, 0x24293eb9
+0,         84,         84,        1,   152064, 0x7b9b2cb4
+0,         85,         85,        1,   152064, 0x9dd4fe95
+0,         86,         86,        1,   152064, 0xb62e8baf
+0,         87,         87,        1,   152064, 0x9fefc174
+0,         88,         88,        1,   152064, 0xe027c24e
+0,         89,         89,        1,   152064, 0xe38adc70
+0,         90,         90,        1,   152064, 0xc7bf536f
+0,         91,         91,        1,   152064, 0x4448f330
+0,         92,         92,        1,   152064, 0x4dad5339
+0,         93,         93,        1,   152064, 0x48fbab15
+0,         94,         94,        1,   152064, 0xe6c97b2c
+0,         95,         95,        1,   152064, 0x3c3829ee
+0,         96,         96,        1,   152064, 0x927772c0
+0,         97,         97,        1,   152064, 0xbb0f0ef4
+0,         98,         98,        1,   152064, 0xe65780a7
+0,         99,         99,        1,   152064, 0xaf8f6d72
diff --git a/tests/ref/fate/h264-conformance-frext-freh7_b b/tests/ref/fate/h264-conformance-frext-freh7_b
index cb56f627cf0..b078cf1b353 100644
--- a/tests/ref/fate/h264-conformance-frext-freh7_b
+++ b/tests/ref/fate/h264-conformance-frext-freh7_b
@@ -3,103 +3,103 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x89f2e8d5
-0,          2,          2,        1,   152064, 0x35b99397
-0,          3,          3,        1,   152064, 0x6ef46744
-0,          4,          4,        1,   152064, 0xec4d6c1c
-0,          5,          5,        1,   152064, 0xad6e0c70
-0,          6,          6,        1,   152064, 0x2db534b3
-0,          7,          7,        1,   152064, 0xcbd25ddd
-0,          8,          8,        1,   152064, 0xd90708b4
-0,          9,          9,        1,   152064, 0xc2aa52df
-0,         10,         10,        1,   152064, 0xbcfc84dc
-0,         11,         11,        1,   152064, 0xa5a6d269
-0,         12,         12,        1,   152064, 0x27220ce9
-0,         13,         13,        1,   152064, 0xf075ee6d
-0,         14,         14,        1,   152064, 0x9fd3c2ac
-0,         15,         15,        1,   152064, 0xcba24c2d
-0,         16,         16,        1,   152064, 0x41cd9441
-0,         17,         17,        1,   152064, 0x0126efa3
-0,         18,         18,        1,   152064, 0xf62112af
-0,         19,         19,        1,   152064, 0x35aff50f
-0,         20,         20,        1,   152064, 0xcb0b276f
-0,         21,         21,        1,   152064, 0xc7ef0214
-0,         22,         22,        1,   152064, 0x7f78d387
-0,         23,         23,        1,   152064, 0x266c673d
-0,         24,         24,        1,   152064, 0x1d39c073
-0,         25,         25,        1,   152064, 0x6a3ae455
-0,         26,         26,        1,   152064, 0xe4ce0230
-0,         27,         27,        1,   152064, 0x7f95e87b
-0,         28,         28,        1,   152064, 0x7c552236
-0,         29,         29,        1,   152064, 0x24c799b9
-0,         30,         30,        1,   152064, 0x5042d974
-0,         31,         31,        1,   152064, 0xe934a5b8
-0,         32,         32,        1,   152064, 0x6d59c884
-0,         33,         33,        1,   152064, 0xd00f7fdb
-0,         34,         34,        1,   152064, 0x62ac3ebd
-0,         35,         35,        1,   152064, 0xb40a6c25
-0,         36,         36,        1,   152064, 0x8706188c
-0,         37,         37,        1,   152064, 0x7682e339
-0,         38,         38,        1,   152064, 0x1061d943
-0,         39,         39,        1,   152064, 0x50fa684a
-0,         40,         40,        1,   152064, 0xab4b1975
-0,         41,         41,        1,   152064, 0x2d043acb
-0,         42,         42,        1,   152064, 0xe3c2ec0a
-0,         43,         43,        1,   152064, 0xb9bc99dc
-0,         44,         44,        1,   152064, 0x051fb857
-0,         45,         45,        1,   152064, 0x71d1fe52
-0,         46,         46,        1,   152064, 0x4230c694
-0,         47,         47,        1,   152064, 0xb412a137
-0,         48,         48,        1,   152064, 0x2f50f90d
-0,         49,         49,        1,   152064, 0x68a1466f
-0,         50,         50,        1,   152064, 0x77e3f47b
-0,         51,         51,        1,   152064, 0x4d08de2b
-0,         52,         52,        1,   152064, 0x1fc663be
-0,         53,         53,        1,   152064, 0x2c8ba712
-0,         54,         54,        1,   152064, 0xd50d85b9
-0,         55,         55,        1,   152064, 0xe8483437
-0,         56,         56,        1,   152064, 0x4e331e4c
-0,         57,         57,        1,   152064, 0x0f64a7a0
-0,         58,         58,        1,   152064, 0x797b0b8c
-0,         59,         59,        1,   152064, 0x1b91e6d8
-0,         60,         60,        1,   152064, 0xf3a1f3b6
-0,         61,         61,        1,   152064, 0x2b94bd52
-0,         62,         62,        1,   152064, 0x1f30962e
-0,         63,         63,        1,   152064, 0x853321cf
-0,         64,         64,        1,   152064, 0x8266c0ac
-0,         65,         65,        1,   152064, 0x25498be0
-0,         66,         66,        1,   152064, 0x0f653af9
-0,         67,         67,        1,   152064, 0x0a025f7e
-0,         68,         68,        1,   152064, 0x1cfbae04
-0,         69,         69,        1,   152064, 0x3a874757
-0,         70,         70,        1,   152064, 0x2c67006e
-0,         71,         71,        1,   152064, 0x1d409bce
-0,         72,         72,        1,   152064, 0xfe43121f
-0,         73,         73,        1,   152064, 0x43411830
-0,         74,         74,        1,   152064, 0x536d26ca
-0,         75,         75,        1,   152064, 0x9eb873ea
-0,         76,         76,        1,   152064, 0x093f93ec
-0,         77,         77,        1,   152064, 0xdf6f0381
-0,         78,         78,        1,   152064, 0xa9f4b5e5
-0,         79,         79,        1,   152064, 0x08f71ef8
-0,         80,         80,        1,   152064, 0x7a68f820
-0,         81,         81,        1,   152064, 0xae0c73e7
-0,         82,         82,        1,   152064, 0x886ae6c7
-0,         83,         83,        1,   152064, 0x9357f433
-0,         84,         84,        1,   152064, 0xcc335068
-0,         85,         85,        1,   152064, 0x2ea108ab
-0,         86,         86,        1,   152064, 0x06d7dcb0
-0,         87,         87,        1,   152064, 0x81dc81bc
-0,         88,         88,        1,   152064, 0xfb32b626
-0,         89,         89,        1,   152064, 0x2787d1c7
-0,         90,         90,        1,   152064, 0x69e51118
-0,         91,         91,        1,   152064, 0xba15d94d
-0,         92,         92,        1,   152064, 0xc41c09cf
-0,         93,         93,        1,   152064, 0x7e50e12f
-0,         94,         94,        1,   152064, 0x0763ddbe
-0,         95,         95,        1,   152064, 0x8a09bb88
-0,         96,         96,        1,   152064, 0x530752b7
-0,         97,         97,        1,   152064, 0x9b159923
-0,         98,         98,        1,   152064, 0xcbb83ed3
-0,         99,         99,        1,   152064, 0xdeb5ac0e
-0,        100,        100,        1,   152064, 0x189299d4
+0,          0,          0,        1,   152064, 0x89f2e8d5
+0,          1,          1,        1,   152064, 0x35b99397
+0,          2,          2,        1,   152064, 0x6ef46744
+0,          3,          3,        1,   152064, 0xec4d6c1c
+0,          4,          4,        1,   152064, 0xad6e0c70
+0,          5,          5,        1,   152064, 0x2db534b3
+0,          6,          6,        1,   152064, 0xcbd25ddd
+0,          7,          7,        1,   152064, 0xd90708b4
+0,          8,          8,        1,   152064, 0xc2aa52df
+0,          9,          9,        1,   152064, 0xbcfc84dc
+0,         10,         10,        1,   152064, 0xa5a6d269
+0,         11,         11,        1,   152064, 0x27220ce9
+0,         12,         12,        1,   152064, 0xf075ee6d
+0,         13,         13,        1,   152064, 0x9fd3c2ac
+0,         14,         14,        1,   152064, 0xcba24c2d
+0,         15,         15,        1,   152064, 0x41cd9441
+0,         16,         16,        1,   152064, 0x0126efa3
+0,         17,         17,        1,   152064, 0xf62112af
+0,         18,         18,        1,   152064, 0x35aff50f
+0,         19,         19,        1,   152064, 0xcb0b276f
+0,         20,         20,        1,   152064, 0xc7ef0214
+0,         21,         21,        1,   152064, 0x7f78d387
+0,         22,         22,        1,   152064, 0x266c673d
+0,         23,         23,        1,   152064, 0x1d39c073
+0,         24,         24,        1,   152064, 0x6a3ae455
+0,         25,         25,        1,   152064, 0xe4ce0230
+0,         26,         26,        1,   152064, 0x7f95e87b
+0,         27,         27,        1,   152064, 0x7c552236
+0,         28,         28,        1,   152064, 0x24c799b9
+0,         29,         29,        1,   152064, 0x5042d974
+0,         30,         30,        1,   152064, 0xe934a5b8
+0,         31,         31,        1,   152064, 0x6d59c884
+0,         32,         32,        1,   152064, 0xd00f7fdb
+0,         33,         33,        1,   152064, 0x62ac3ebd
+0,         34,         34,        1,   152064, 0xb40a6c25
+0,         35,         35,        1,   152064, 0x8706188c
+0,         36,         36,        1,   152064, 0x7682e339
+0,         37,         37,        1,   152064, 0x1061d943
+0,         38,         38,        1,   152064, 0x50fa684a
+0,         39,         39,        1,   152064, 0xab4b1975
+0,         40,         40,        1,   152064, 0x2d043acb
+0,         41,         41,        1,   152064, 0xe3c2ec0a
+0,         42,         42,        1,   152064, 0xb9bc99dc
+0,         43,         43,        1,   152064, 0x051fb857
+0,         44,         44,        1,   152064, 0x71d1fe52
+0,         45,         45,        1,   152064, 0x4230c694
+0,         46,         46,        1,   152064, 0xb412a137
+0,         47,         47,        1,   152064, 0x2f50f90d
+0,         48,         48,        1,   152064, 0x68a1466f
+0,         49,         49,        1,   152064, 0x77e3f47b
+0,         50,         50,        1,   152064, 0x4d08de2b
+0,         51,         51,        1,   152064, 0x1fc663be
+0,         52,         52,        1,   152064, 0x2c8ba712
+0,         53,         53,        1,   152064, 0xd50d85b9
+0,         54,         54,        1,   152064, 0xe8483437
+0,         55,         55,        1,   152064, 0x4e331e4c
+0,         56,         56,        1,   152064, 0x0f64a7a0
+0,         57,         57,        1,   152064, 0x797b0b8c
+0,         58,         58,        1,   152064, 0x1b91e6d8
+0,         59,         59,        1,   152064, 0xf3a1f3b6
+0,         60,         60,        1,   152064, 0x2b94bd52
+0,         61,         61,        1,   152064, 0x1f30962e
+0,         62,         62,        1,   152064, 0x853321cf
+0,         63,         63,        1,   152064, 0x8266c0ac
+0,         64,         64,        1,   152064, 0x25498be0
+0,         65,         65,        1,   152064, 0x0f653af9
+0,         66,         66,        1,   152064, 0x0a025f7e
+0,         67,         67,        1,   152064, 0x1cfbae04
+0,         68,         68,        1,   152064, 0x3a874757
+0,         69,         69,        1,   152064, 0x2c67006e
+0,         70,         70,        1,   152064, 0x1d409bce
+0,         71,         71,        1,   152064, 0xfe43121f
+0,         72,         72,        1,   152064, 0x43411830
+0,         73,         73,        1,   152064, 0x536d26ca
+0,         74,         74,        1,   152064, 0x9eb873ea
+0,         75,         75,        1,   152064, 0x093f93ec
+0,         76,         76,        1,   152064, 0xdf6f0381
+0,         77,         77,        1,   152064, 0xa9f4b5e5
+0,         78,         78,        1,   152064, 0x08f71ef8
+0,         79,         79,        1,   152064, 0x7a68f820
+0,         80,         80,        1,   152064, 0xae0c73e7
+0,         81,         81,        1,   152064, 0x886ae6c7
+0,         82,         82,        1,   152064, 0x9357f433
+0,         83,         83,        1,   152064, 0xcc335068
+0,         84,         84,        1,   152064, 0x2ea108ab
+0,         85,         85,        1,   152064, 0x06d7dcb0
+0,         86,         86,        1,   152064, 0x81dc81bc
+0,         87,         87,        1,   152064, 0xfb32b626
+0,         88,         88,        1,   152064, 0x2787d1c7
+0,         89,         89,        1,   152064, 0x69e51118
+0,         90,         90,        1,   152064, 0xba15d94d
+0,         91,         91,        1,   152064, 0xc41c09cf
+0,         92,         92,        1,   152064, 0x7e50e12f
+0,         93,         93,        1,   152064, 0x0763ddbe
+0,         94,         94,        1,   152064, 0x8a09bb88
+0,         95,         95,        1,   152064, 0x530752b7
+0,         96,         96,        1,   152064, 0x9b159923
+0,         97,         97,        1,   152064, 0xcbb83ed3
+0,         98,         98,        1,   152064, 0xdeb5ac0e
+0,         99,         99,        1,   152064, 0x189299d4
diff --git a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
index d4435700828..76e4d26cf8f 100644
--- a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
+++ b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
@@ -3,18 +3,18 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x0147a2a9
-0,          2,          2,        1,   152064, 0xe2365351
-0,          3,          3,        1,   152064, 0xb5f9daee
-0,          4,          4,        1,   152064, 0xd60818b2
-0,          5,          5,        1,   152064, 0x21b528e5
-0,          6,          6,        1,   152064, 0x9c9dda18
-0,          7,          7,        1,   152064, 0x387fe7de
-0,          8,          8,        1,   152064, 0x8f0c5a1e
-0,          9,          9,        1,   152064, 0x02409694
-0,         10,         10,        1,   152064, 0x2b36a7a7
-0,         11,         11,        1,   152064, 0x3c6d3863
-0,         12,         12,        1,   152064, 0xaa7835e1
-0,         13,         13,        1,   152064, 0x6d105fe7
-0,         14,         14,        1,   152064, 0x9a348732
-0,         15,         15,        1,   152064, 0x96a3af13
+0,          0,          0,        1,   152064, 0x0147a2a9
+0,          1,          1,        1,   152064, 0xe2365351
+0,          2,          2,        1,   152064, 0xb5f9daee
+0,          3,          3,        1,   152064, 0xd60818b2
+0,          4,          4,        1,   152064, 0x21b528e5
+0,          5,          5,        1,   152064, 0x9c9dda18
+0,          6,          6,        1,   152064, 0x387fe7de
+0,          7,          7,        1,   152064, 0x8f0c5a1e
+0,          8,          8,        1,   152064, 0x02409694
+0,          9,          9,        1,   152064, 0x2b36a7a7
+0,         10,         10,        1,   152064, 0x3c6d3863
+0,         11,         11,        1,   152064, 0xaa7835e1
+0,         12,         12,        1,   152064, 0x6d105fe7
+0,         13,         13,        1,   152064, 0x9a348732
+0,         14,         14,        1,   152064, 0x96a3af13
diff --git a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
index 1f678d1122c..5640228a263 100644
--- a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
@@ -3,13 +3,13 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0xd604d440
-0,          2,          2,        1,   152064, 0x08ef262c
-0,          3,          3,        1,   152064, 0x992fca8e
-0,          4,          4,        1,   152064, 0x5a02ee15
-0,          5,          5,        1,   152064, 0xf15d5c66
-0,          6,          6,        1,   152064, 0x360dda12
-0,          7,          7,        1,   152064, 0x18b54985
-0,          8,          8,        1,   152064, 0xf12b6cde
-0,          9,          9,        1,   152064, 0x3b2e63f7
-0,         10,         10,        1,   152064, 0x140abcfd
+0,          0,          0,        1,   152064, 0xd604d440
+0,          1,          1,        1,   152064, 0x08ef262c
+0,          2,          2,        1,   152064, 0x992fca8e
+0,          3,          3,        1,   152064, 0x5a02ee15
+0,          4,          4,        1,   152064, 0xf15d5c66
+0,          5,          5,        1,   152064, 0x360dda12
+0,          6,          6,        1,   152064, 0x18b54985
+0,          7,          7,        1,   152064, 0xf12b6cde
+0,          8,          8,        1,   152064, 0x3b2e63f7
+0,          9,          9,        1,   152064, 0x140abcfd
diff --git a/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b b/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
index f541135929e..67badb6c2b6 100644
--- a/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
+++ b/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
@@ -3,13 +3,13 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0xb055a9bd
-0,          2,          2,        1,   152064, 0x9e1eadb6
-0,          3,          3,        1,   152064, 0x48f117d2
-0,          4,          4,        1,   152064, 0x3e3ff049
-0,          5,          5,        1,   152064, 0x2ff80943
-0,          6,          6,        1,   152064, 0xc5ee16a6
-0,          7,          7,        1,   152064, 0x38c33f28
-0,          8,          8,        1,   152064, 0x3e8444c7
-0,          9,          9,        1,   152064, 0x14ca4ab2
-0,         10,         10,        1,   152064, 0xe20e78f7
+0,          0,          0,        1,   152064, 0xb055a9bd
+0,          1,          1,        1,   152064, 0x9e1eadb6
+0,          2,          2,        1,   152064, 0x48f117d2
+0,          3,          3,        1,   152064, 0x3e3ff049
+0,          4,          4,        1,   152064, 0x2ff80943
+0,          5,          5,        1,   152064, 0xc5ee16a6
+0,          6,          6,        1,   152064, 0x38c33f28
+0,          7,          7,        1,   152064, 0x3e8444c7
+0,          8,          8,        1,   152064, 0x14ca4ab2
+0,          9,          9,        1,   152064, 0xe20e78f7
diff --git a/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
index 25551fb0210..0febed6d6f2 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
@@ -3,303 +3,303 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x502ec077
-0,          2,          2,        1,   152064, 0x84807243
-0,          3,          3,        1,   152064, 0xd7474a6e
-0,          4,          4,        1,   152064, 0x793469bb
-0,          5,          5,        1,   152064, 0xb7a0faf7
-0,          6,          6,        1,   152064, 0x1d3d3cba
-0,          7,          7,        1,   152064, 0xb62583de
-0,          8,          8,        1,   152064, 0xc8422fb1
-0,          9,          9,        1,   152064, 0x321dc699
-0,         10,         10,        1,   152064, 0x7a34d350
-0,         11,         11,        1,   152064, 0xaa4c302d
-0,         12,         12,        1,   152064, 0x45fa7ab0
-0,         13,         13,        1,   152064, 0xc7262e41
-0,         14,         14,        1,   152064, 0x3550000c
-0,         15,         15,        1,   152064, 0xf4bab54b
-0,         16,         16,        1,   152064, 0xaccf9c1a
-0,         17,         17,        1,   152064, 0x9bee20e9
-0,         18,         18,        1,   152064, 0x47fb7720
-0,         19,         19,        1,   152064, 0x12c63ffb
-0,         20,         20,        1,   152064, 0xfa2b8b4d
-0,         21,         21,        1,   152064, 0x279964bd
-0,         22,         22,        1,   152064, 0xb8b01c7e
-0,         23,         23,        1,   152064, 0x816fa010
-0,         24,         24,        1,   152064, 0x59fe1c8c
-0,         25,         25,        1,   152064, 0x13393fad
-0,         26,         26,        1,   152064, 0x991a50a4
-0,         27,         27,        1,   152064, 0x57df3eb7
-0,         28,         28,        1,   152064, 0x744371df
-0,         29,         29,        1,   152064, 0xe9f6d3ff
-0,         30,         30,        1,   152064, 0xc506fba0
-0,         31,         31,        1,   152064, 0x6295b90e
-0,         32,         32,        1,   152064, 0xa19cee2d
-0,         33,         33,        1,   152064, 0xf8c1b3ca
-0,         34,         34,        1,   152064, 0x69f68ce0
-0,         35,         35,        1,   152064, 0x80558bb6
-0,         36,         36,        1,   152064, 0x27824fa5
-0,         37,         37,        1,   152064, 0x27c929a1
-0,         38,         38,        1,   152064, 0xc0fe06d1
-0,         39,         39,        1,   152064, 0xc52bc58c
-0,         40,         40,        1,   152064, 0x0a5363c7
-0,         41,         41,        1,   152064, 0xd0f45a0d
-0,         42,         42,        1,   152064, 0x274710f9
-0,         43,         43,        1,   152064, 0x89d2d390
-0,         44,         44,        1,   152064, 0x12a9bfb0
-0,         45,         45,        1,   152064, 0x04501a93
-0,         46,         46,        1,   152064, 0xf92cbbf4
-0,         47,         47,        1,   152064, 0xf6d1b27d
-0,         48,         48,        1,   152064, 0xe3e904c3
-0,         49,         49,        1,   152064, 0x58f8516d
-0,         50,         50,        1,   152064, 0x70370c2b
-0,         51,         51,        1,   152064, 0xfeebc88c
-0,         52,         52,        1,   152064, 0x974c6ed6
-0,         53,         53,        1,   152064, 0x401bdcf2
-0,         54,         54,        1,   152064, 0xfe61e278
-0,         55,         55,        1,   152064, 0x96ba8bb9
-0,         56,         56,        1,   152064, 0x988492fd
-0,         57,         57,        1,   152064, 0xd1d913a9
-0,         58,         58,        1,   152064, 0x6bc46f0e
-0,         59,         59,        1,   152064, 0x695ef706
-0,         60,         60,        1,   152064, 0x142045c9
-0,         61,         61,        1,   152064, 0xb390ed87
-0,         62,         62,        1,   152064, 0xb9e6d2e5
-0,         63,         63,        1,   152064, 0xe348797f
-0,         64,         64,        1,   152064, 0x1cbd29d6
-0,         65,         65,        1,   152064, 0xbd7dd694
-0,         66,         66,        1,   152064, 0x516873c3
-0,         67,         67,        1,   152064, 0x27bba182
-0,         68,         68,        1,   152064, 0x7541f920
-0,         69,         69,        1,   152064, 0xfdf67042
-0,         70,         70,        1,   152064, 0x6c3c7896
-0,         71,         71,        1,   152064, 0xed86c467
-0,         72,         72,        1,   152064, 0x4ea83ca2
-0,         73,         73,        1,   152064, 0xa3e6725b
-0,         74,         74,        1,   152064, 0x917f5f16
-0,         75,         75,        1,   152064, 0x8cf2d2e1
-0,         76,         76,        1,   152064, 0x57a8d116
-0,         77,         77,        1,   152064, 0x0db267d4
-0,         78,         78,        1,   152064, 0xce782ac5
-0,         79,         79,        1,   152064, 0x1c9d8518
-0,         80,         80,        1,   152064, 0x47598ac7
-0,         81,         81,        1,   152064, 0xc5033d97
-0,         82,         82,        1,   152064, 0xd7aaa3a4
-0,         83,         83,        1,   152064, 0x078afc96
-0,         84,         84,        1,   152064, 0xc9fe673d
-0,         85,         85,        1,   152064, 0xe9284066
-0,         86,         86,        1,   152064, 0xbc570982
-0,         87,         87,        1,   152064, 0x0aac8574
-0,         88,         88,        1,   152064, 0x098cbeee
-0,         89,         89,        1,   152064, 0x19c36a9d
-0,         90,         90,        1,   152064, 0x8fe4a893
-0,         91,         91,        1,   152064, 0x0b652f17
-0,         92,         92,        1,   152064, 0x10f2e6bf
-0,         93,         93,        1,   152064, 0x7ce5634e
-0,         94,         94,        1,   152064, 0x8fe4ac6c
-0,         95,         95,        1,   152064, 0xcaba749e
-0,         96,         96,        1,   152064, 0x5f8a0d5c
-0,         97,         97,        1,   152064, 0xcaa66bbc
-0,         98,         98,        1,   152064, 0xc87ae617
-0,         99,         99,        1,   152064, 0xe8ef4dd7
-0,        100,        100,        1,   152064, 0xdfca5a07
-0,        101,        101,        1,   152064, 0x5f7eab7d
-0,        102,        102,        1,   152064, 0x8a65ebbb
-0,        103,        103,        1,   152064, 0x4beab4a0
-0,        104,        104,        1,   152064, 0xb5e6ab30
-0,        105,        105,        1,   152064, 0x8fe4f4d4
-0,        106,        106,        1,   152064, 0x95bde1ca
-0,        107,        107,        1,   152064, 0xcc5e3a53
-0,        108,        108,        1,   152064, 0xf09f1dd7
-0,        109,        109,        1,   152064, 0x10179672
-0,        110,        110,        1,   152064, 0x4ad16184
-0,        111,        111,        1,   152064, 0x9efa0e23
-0,        112,        112,        1,   152064, 0x22f59522
-0,        113,        113,        1,   152064, 0x4d38f09d
-0,        114,        114,        1,   152064, 0x4c5ebf56
-0,        115,        115,        1,   152064, 0xb19d5077
-0,        116,        116,        1,   152064, 0xa98576b9
-0,        117,        117,        1,   152064, 0x65324239
-0,        118,        118,        1,   152064, 0x709e4031
-0,        119,        119,        1,   152064, 0xf8e81681
-0,        120,        120,        1,   152064, 0x058514e5
-0,        121,        121,        1,   152064, 0xd1d1c806
-0,        122,        122,        1,   152064, 0x0e4dde57
-0,        123,        123,        1,   152064, 0x49e9c2bb
-0,        124,        124,        1,   152064, 0x01417ce6
-0,        125,        125,        1,   152064, 0xda7ebbf1
-0,        126,        126,        1,   152064, 0xa22906b7
-0,        127,        127,        1,   152064, 0x32e2df87
-0,        128,        128,        1,   152064, 0x69917c8f
-0,        129,        129,        1,   152064, 0xea8ed2cc
-0,        130,        130,        1,   152064, 0x0b8d57f1
-0,        131,        131,        1,   152064, 0x5f683bcd
-0,        132,        132,        1,   152064, 0x5162fe2f
-0,        133,        133,        1,   152064, 0x49c052f8
-0,        134,        134,        1,   152064, 0x990b69ba
-0,        135,        135,        1,   152064, 0xa6d4f99f
-0,        136,        136,        1,   152064, 0xe79ef4da
-0,        137,        137,        1,   152064, 0x5e8a3847
-0,        138,        138,        1,   152064, 0x38b1e75f
-0,        139,        139,        1,   152064, 0xf5c91bed
-0,        140,        140,        1,   152064, 0xd59a6d26
-0,        141,        141,        1,   152064, 0xc361de06
-0,        142,        142,        1,   152064, 0x63ed2229
-0,        143,        143,        1,   152064, 0xb8229205
-0,        144,        144,        1,   152064, 0x7c6619af
-0,        145,        145,        1,   152064, 0x4126b02f
-0,        146,        146,        1,   152064, 0x9250b99b
-0,        147,        147,        1,   152064, 0x589778f9
-0,        148,        148,        1,   152064, 0xed1fa45b
-0,        149,        149,        1,   152064, 0x700b6f32
-0,        150,        150,        1,   152064, 0x0590df55
-0,        151,        151,        1,   152064, 0x3e9c4018
-0,        152,        152,        1,   152064, 0x957b8860
-0,        153,        153,        1,   152064, 0x56161560
-0,        154,        154,        1,   152064, 0xbc43bc3b
-0,        155,        155,        1,   152064, 0x508d8632
-0,        156,        156,        1,   152064, 0xbc5736d8
-0,        157,        157,        1,   152064, 0xed7d3aef
-0,        158,        158,        1,   152064, 0x1dcdda9f
-0,        159,        159,        1,   152064, 0x8ef6d5c9
-0,        160,        160,        1,   152064, 0x15466acc
-0,        161,        161,        1,   152064, 0x45d4cf67
-0,        162,        162,        1,   152064, 0x8c900b9d
-0,        163,        163,        1,   152064, 0x747006e0
-0,        164,        164,        1,   152064, 0xac920a0c
-0,        165,        165,        1,   152064, 0xb8210c27
-0,        166,        166,        1,   152064, 0x7dbb873a
-0,        167,        167,        1,   152064, 0x0d4d7584
-0,        168,        168,        1,   152064, 0xefb3fe60
-0,        169,        169,        1,   152064, 0x905e2644
-0,        170,        170,        1,   152064, 0x7c04e534
-0,        171,        171,        1,   152064, 0x8889972a
-0,        172,        172,        1,   152064, 0x21c7d8ad
-0,        173,        173,        1,   152064, 0x1c641176
-0,        174,        174,        1,   152064, 0xf71489a4
-0,        175,        175,        1,   152064, 0xd7ac5555
-0,        176,        176,        1,   152064, 0xb4609c6d
-0,        177,        177,        1,   152064, 0xf5b2bd5e
-0,        178,        178,        1,   152064, 0x9f43ce57
-0,        179,        179,        1,   152064, 0x77642dd3
-0,        180,        180,        1,   152064, 0x3e79565c
-0,        181,        181,        1,   152064, 0x95f40b8e
-0,        182,        182,        1,   152064, 0x3c8ca4d4
-0,        183,        183,        1,   152064, 0xa02ac497
-0,        184,        184,        1,   152064, 0x4c93b377
-0,        185,        185,        1,   152064, 0x55f5ac68
-0,        186,        186,        1,   152064, 0xf8652eca
-0,        187,        187,        1,   152064, 0x56e94574
-0,        188,        188,        1,   152064, 0x6d8302e1
-0,        189,        189,        1,   152064, 0x29a57061
-0,        190,        190,        1,   152064, 0x24e4cfdc
-0,        191,        191,        1,   152064, 0xf5a5d62a
-0,        192,        192,        1,   152064, 0x998870c1
-0,        193,        193,        1,   152064, 0xa15b1f4e
-0,        194,        194,        1,   152064, 0xb0ccb51f
-0,        195,        195,        1,   152064, 0xeaaf59ab
-0,        196,        196,        1,   152064, 0x7e2b4fe6
-0,        197,        197,        1,   152064, 0x72299fea
-0,        198,        198,        1,   152064, 0x769da8b2
-0,        199,        199,        1,   152064, 0xefad7ef8
-0,        200,        200,        1,   152064, 0x24819983
-0,        201,        201,        1,   152064, 0x2aad32ab
-0,        202,        202,        1,   152064, 0xc80cac79
-0,        203,        203,        1,   152064, 0x1659d628
-0,        204,        204,        1,   152064, 0xef941f66
-0,        205,        205,        1,   152064, 0x0d7fcdb5
-0,        206,        206,        1,   152064, 0x7c1853fa
-0,        207,        207,        1,   152064, 0xb94c4d3c
-0,        208,        208,        1,   152064, 0xc47adfc2
-0,        209,        209,        1,   152064, 0x366a6729
-0,        210,        210,        1,   152064, 0x7eb37b70
-0,        211,        211,        1,   152064, 0xafd54c27
-0,        212,        212,        1,   152064, 0x67b18636
-0,        213,        213,        1,   152064, 0x93b22dcf
-0,        214,        214,        1,   152064, 0xa64991f1
-0,        215,        215,        1,   152064, 0xd32a7102
-0,        216,        216,        1,   152064, 0xff665d1c
-0,        217,        217,        1,   152064, 0xf107cc31
-0,        218,        218,        1,   152064, 0xf5b25652
-0,        219,        219,        1,   152064, 0x8caf783d
-0,        220,        220,        1,   152064, 0x72f3eb00
-0,        221,        221,        1,   152064, 0xb5aea5f8
-0,        222,        222,        1,   152064, 0xee70e870
-0,        223,        223,        1,   152064, 0x7c3a0156
-0,        224,        224,        1,   152064, 0x871b6383
-0,        225,        225,        1,   152064, 0x48d831ff
-0,        226,        226,        1,   152064, 0xca233913
-0,        227,        227,        1,   152064, 0xe14bc5eb
-0,        228,        228,        1,   152064, 0x9b1d27e7
-0,        229,        229,        1,   152064, 0xfb9637f7
-0,        230,        230,        1,   152064, 0x0c022157
-0,        231,        231,        1,   152064, 0x16d35fc9
-0,        232,        232,        1,   152064, 0x6d935f71
-0,        233,        233,        1,   152064, 0xae4066fa
-0,        234,        234,        1,   152064, 0xcef94fdc
-0,        235,        235,        1,   152064, 0xc234edb9
-0,        236,        236,        1,   152064, 0x26a4f2e2
-0,        237,        237,        1,   152064, 0xd29ac23e
-0,        238,        238,        1,   152064, 0xb7604395
-0,        239,        239,        1,   152064, 0x408084f6
-0,        240,        240,        1,   152064, 0x0a02026c
-0,        241,        241,        1,   152064, 0x78b33c7c
-0,        242,        242,        1,   152064, 0xcb02b874
-0,        243,        243,        1,   152064, 0xf566513b
-0,        244,        244,        1,   152064, 0xb34e52b1
-0,        245,        245,        1,   152064, 0xf55ff493
-0,        246,        246,        1,   152064, 0xb0e8282a
-0,        247,        247,        1,   152064, 0xe9510bbe
-0,        248,        248,        1,   152064, 0x292e8c5a
-0,        249,        249,        1,   152064, 0x62b9d2b0
-0,        250,        250,        1,   152064, 0x3a8cc827
-0,        251,        251,        1,   152064, 0x25cc465e
-0,        252,        252,        1,   152064, 0xf2bc32e2
-0,        253,        253,        1,   152064, 0x6141f914
-0,        254,        254,        1,   152064, 0x1171256f
-0,        255,        255,        1,   152064, 0x13cb2ded
-0,        256,        256,        1,   152064, 0x3d4ca557
-0,        257,        257,        1,   152064, 0xf2b9e72e
-0,        258,        258,        1,   152064, 0x03f7547a
-0,        259,        259,        1,   152064, 0xc7302955
-0,        260,        260,        1,   152064, 0xe78a46d3
-0,        261,        261,        1,   152064, 0x3726a270
-0,        262,        262,        1,   152064, 0x2f65722a
-0,        263,        263,        1,   152064, 0x55acce40
-0,        264,        264,        1,   152064, 0xf6fa9db2
-0,        265,        265,        1,   152064, 0x70a36937
-0,        266,        266,        1,   152064, 0x9313742d
-0,        267,        267,        1,   152064, 0x2eb14e53
-0,        268,        268,        1,   152064, 0x3d47c9c3
-0,        269,        269,        1,   152064, 0xd0a90348
-0,        270,        270,        1,   152064, 0x6ad48088
-0,        271,        271,        1,   152064, 0x68e64738
-0,        272,        272,        1,   152064, 0x04c3735a
-0,        273,        273,        1,   152064, 0x51d0593f
-0,        274,        274,        1,   152064, 0x42cf2b48
-0,        275,        275,        1,   152064, 0xa5496a0c
-0,        276,        276,        1,   152064, 0x84c25549
-0,        277,        277,        1,   152064, 0x96691600
-0,        278,        278,        1,   152064, 0x423135db
-0,        279,        279,        1,   152064, 0x8d2e08b6
-0,        280,        280,        1,   152064, 0xaeb4c840
-0,        281,        281,        1,   152064, 0xf3e71780
-0,        282,        282,        1,   152064, 0x8858228b
-0,        283,        283,        1,   152064, 0xf28613f8
-0,        284,        284,        1,   152064, 0xb5327882
-0,        285,        285,        1,   152064, 0xbb60bb85
-0,        286,        286,        1,   152064, 0x345ab1c9
-0,        287,        287,        1,   152064, 0x8aac2cba
-0,        288,        288,        1,   152064, 0x7ce15b4c
-0,        289,        289,        1,   152064, 0xc09c55c0
-0,        290,        290,        1,   152064, 0x8482ddd6
-0,        291,        291,        1,   152064, 0xab222a13
-0,        292,        292,        1,   152064, 0xd39b0dea
-0,        293,        293,        1,   152064, 0x6dab6e06
-0,        294,        294,        1,   152064, 0xec0891bd
-0,        295,        295,        1,   152064, 0x88bd9701
-0,        296,        296,        1,   152064, 0xdf13072a
-0,        297,        297,        1,   152064, 0x23b33081
-0,        298,        298,        1,   152064, 0x63943137
-0,        299,        299,        1,   152064, 0xab6a9052
-0,        300,        300,        1,   152064, 0x05485494
+0,          0,          0,        1,   152064, 0x502ec077
+0,          1,          1,        1,   152064, 0x84807243
+0,          2,          2,        1,   152064, 0xd7474a6e
+0,          3,          3,        1,   152064, 0x793469bb
+0,          4,          4,        1,   152064, 0xb7a0faf7
+0,          5,          5,        1,   152064, 0x1d3d3cba
+0,          6,          6,        1,   152064, 0xb62583de
+0,          7,          7,        1,   152064, 0xc8422fb1
+0,          8,          8,        1,   152064, 0x321dc699
+0,          9,          9,        1,   152064, 0x7a34d350
+0,         10,         10,        1,   152064, 0xaa4c302d
+0,         11,         11,        1,   152064, 0x45fa7ab0
+0,         12,         12,        1,   152064, 0xc7262e41
+0,         13,         13,        1,   152064, 0x3550000c
+0,         14,         14,        1,   152064, 0xf4bab54b
+0,         15,         15,        1,   152064, 0xaccf9c1a
+0,         16,         16,        1,   152064, 0x9bee20e9
+0,         17,         17,        1,   152064, 0x47fb7720
+0,         18,         18,        1,   152064, 0x12c63ffb
+0,         19,         19,        1,   152064, 0xfa2b8b4d
+0,         20,         20,        1,   152064, 0x279964bd
+0,         21,         21,        1,   152064, 0xb8b01c7e
+0,         22,         22,        1,   152064, 0x816fa010
+0,         23,         23,        1,   152064, 0x59fe1c8c
+0,         24,         24,        1,   152064, 0x13393fad
+0,         25,         25,        1,   152064, 0x991a50a4
+0,         26,         26,        1,   152064, 0x57df3eb7
+0,         27,         27,        1,   152064, 0x744371df
+0,         28,         28,        1,   152064, 0xe9f6d3ff
+0,         29,         29,        1,   152064, 0xc506fba0
+0,         30,         30,        1,   152064, 0x6295b90e
+0,         31,         31,        1,   152064, 0xa19cee2d
+0,         32,         32,        1,   152064, 0xf8c1b3ca
+0,         33,         33,        1,   152064, 0x69f68ce0
+0,         34,         34,        1,   152064, 0x80558bb6
+0,         35,         35,        1,   152064, 0x27824fa5
+0,         36,         36,        1,   152064, 0x27c929a1
+0,         37,         37,        1,   152064, 0xc0fe06d1
+0,         38,         38,        1,   152064, 0xc52bc58c
+0,         39,         39,        1,   152064, 0x0a5363c7
+0,         40,         40,        1,   152064, 0xd0f45a0d
+0,         41,         41,        1,   152064, 0x274710f9
+0,         42,         42,        1,   152064, 0x89d2d390
+0,         43,         43,        1,   152064, 0x12a9bfb0
+0,         44,         44,        1,   152064, 0x04501a93
+0,         45,         45,        1,   152064, 0xf92cbbf4
+0,         46,         46,        1,   152064, 0xf6d1b27d
+0,         47,         47,        1,   152064, 0xe3e904c3
+0,         48,         48,        1,   152064, 0x58f8516d
+0,         49,         49,        1,   152064, 0x70370c2b
+0,         50,         50,        1,   152064, 0xfeebc88c
+0,         51,         51,        1,   152064, 0x974c6ed6
+0,         52,         52,        1,   152064, 0x401bdcf2
+0,         53,         53,        1,   152064, 0xfe61e278
+0,         54,         54,        1,   152064, 0x96ba8bb9
+0,         55,         55,        1,   152064, 0x988492fd
+0,         56,         56,        1,   152064, 0xd1d913a9
+0,         57,         57,        1,   152064, 0x6bc46f0e
+0,         58,         58,        1,   152064, 0x695ef706
+0,         59,         59,        1,   152064, 0x142045c9
+0,         60,         60,        1,   152064, 0xb390ed87
+0,         61,         61,        1,   152064, 0xb9e6d2e5
+0,         62,         62,        1,   152064, 0xe348797f
+0,         63,         63,        1,   152064, 0x1cbd29d6
+0,         64,         64,        1,   152064, 0xbd7dd694
+0,         65,         65,        1,   152064, 0x516873c3
+0,         66,         66,        1,   152064, 0x27bba182
+0,         67,         67,        1,   152064, 0x7541f920
+0,         68,         68,        1,   152064, 0xfdf67042
+0,         69,         69,        1,   152064, 0x6c3c7896
+0,         70,         70,        1,   152064, 0xed86c467
+0,         71,         71,        1,   152064, 0x4ea83ca2
+0,         72,         72,        1,   152064, 0xa3e6725b
+0,         73,         73,        1,   152064, 0x917f5f16
+0,         74,         74,        1,   152064, 0x8cf2d2e1
+0,         75,         75,        1,   152064, 0x57a8d116
+0,         76,         76,        1,   152064, 0x0db267d4
+0,         77,         77,        1,   152064, 0xce782ac5
+0,         78,         78,        1,   152064, 0x1c9d8518
+0,         79,         79,        1,   152064, 0x47598ac7
+0,         80,         80,        1,   152064, 0xc5033d97
+0,         81,         81,        1,   152064, 0xd7aaa3a4
+0,         82,         82,        1,   152064, 0x078afc96
+0,         83,         83,        1,   152064, 0xc9fe673d
+0,         84,         84,        1,   152064, 0xe9284066
+0,         85,         85,        1,   152064, 0xbc570982
+0,         86,         86,        1,   152064, 0x0aac8574
+0,         87,         87,        1,   152064, 0x098cbeee
+0,         88,         88,        1,   152064, 0x19c36a9d
+0,         89,         89,        1,   152064, 0x8fe4a893
+0,         90,         90,        1,   152064, 0x0b652f17
+0,         91,         91,        1,   152064, 0x10f2e6bf
+0,         92,         92,        1,   152064, 0x7ce5634e
+0,         93,         93,        1,   152064, 0x8fe4ac6c
+0,         94,         94,        1,   152064, 0xcaba749e
+0,         95,         95,        1,   152064, 0x5f8a0d5c
+0,         96,         96,        1,   152064, 0xcaa66bbc
+0,         97,         97,        1,   152064, 0xc87ae617
+0,         98,         98,        1,   152064, 0xe8ef4dd7
+0,         99,         99,        1,   152064, 0xdfca5a07
+0,        100,        100,        1,   152064, 0x5f7eab7d
+0,        101,        101,        1,   152064, 0x8a65ebbb
+0,        102,        102,        1,   152064, 0x4beab4a0
+0,        103,        103,        1,   152064, 0xb5e6ab30
+0,        104,        104,        1,   152064, 0x8fe4f4d4
+0,        105,        105,        1,   152064, 0x95bde1ca
+0,        106,        106,        1,   152064, 0xcc5e3a53
+0,        107,        107,        1,   152064, 0xf09f1dd7
+0,        108,        108,        1,   152064, 0x10179672
+0,        109,        109,        1,   152064, 0x4ad16184
+0,        110,        110,        1,   152064, 0x9efa0e23
+0,        111,        111,        1,   152064, 0x22f59522
+0,        112,        112,        1,   152064, 0x4d38f09d
+0,        113,        113,        1,   152064, 0x4c5ebf56
+0,        114,        114,        1,   152064, 0xb19d5077
+0,        115,        115,        1,   152064, 0xa98576b9
+0,        116,        116,        1,   152064, 0x65324239
+0,        117,        117,        1,   152064, 0x709e4031
+0,        118,        118,        1,   152064, 0xf8e81681
+0,        119,        119,        1,   152064, 0x058514e5
+0,        120,        120,        1,   152064, 0xd1d1c806
+0,        121,        121,        1,   152064, 0x0e4dde57
+0,        122,        122,        1,   152064, 0x49e9c2bb
+0,        123,        123,        1,   152064, 0x01417ce6
+0,        124,        124,        1,   152064, 0xda7ebbf1
+0,        125,        125,        1,   152064, 0xa22906b7
+0,        126,        126,        1,   152064, 0x32e2df87
+0,        127,        127,        1,   152064, 0x69917c8f
+0,        128,        128,        1,   152064, 0xea8ed2cc
+0,        129,        129,        1,   152064, 0x0b8d57f1
+0,        130,        130,        1,   152064, 0x5f683bcd
+0,        131,        131,        1,   152064, 0x5162fe2f
+0,        132,        132,        1,   152064, 0x49c052f8
+0,        133,        133,        1,   152064, 0x990b69ba
+0,        134,        134,        1,   152064, 0xa6d4f99f
+0,        135,        135,        1,   152064, 0xe79ef4da
+0,        136,        136,        1,   152064, 0x5e8a3847
+0,        137,        137,        1,   152064, 0x38b1e75f
+0,        138,        138,        1,   152064, 0xf5c91bed
+0,        139,        139,        1,   152064, 0xd59a6d26
+0,        140,        140,        1,   152064, 0xc361de06
+0,        141,        141,        1,   152064, 0x63ed2229
+0,        142,        142,        1,   152064, 0xb8229205
+0,        143,        143,        1,   152064, 0x7c6619af
+0,        144,        144,        1,   152064, 0x4126b02f
+0,        145,        145,        1,   152064, 0x9250b99b
+0,        146,        146,        1,   152064, 0x589778f9
+0,        147,        147,        1,   152064, 0xed1fa45b
+0,        148,        148,        1,   152064, 0x700b6f32
+0,        149,        149,        1,   152064, 0x0590df55
+0,        150,        150,        1,   152064, 0x3e9c4018
+0,        151,        151,        1,   152064, 0x957b8860
+0,        152,        152,        1,   152064, 0x56161560
+0,        153,        153,        1,   152064, 0xbc43bc3b
+0,        154,        154,        1,   152064, 0x508d8632
+0,        155,        155,        1,   152064, 0xbc5736d8
+0,        156,        156,        1,   152064, 0xed7d3aef
+0,        157,        157,        1,   152064, 0x1dcdda9f
+0,        158,        158,        1,   152064, 0x8ef6d5c9
+0,        159,        159,        1,   152064, 0x15466acc
+0,        160,        160,        1,   152064, 0x45d4cf67
+0,        161,        161,        1,   152064, 0x8c900b9d
+0,        162,        162,        1,   152064, 0x747006e0
+0,        163,        163,        1,   152064, 0xac920a0c
+0,        164,        164,        1,   152064, 0xb8210c27
+0,        165,        165,        1,   152064, 0x7dbb873a
+0,        166,        166,        1,   152064, 0x0d4d7584
+0,        167,        167,        1,   152064, 0xefb3fe60
+0,        168,        168,        1,   152064, 0x905e2644
+0,        169,        169,        1,   152064, 0x7c04e534
+0,        170,        170,        1,   152064, 0x8889972a
+0,        171,        171,        1,   152064, 0x21c7d8ad
+0,        172,        172,        1,   152064, 0x1c641176
+0,        173,        173,        1,   152064, 0xf71489a4
+0,        174,        174,        1,   152064, 0xd7ac5555
+0,        175,        175,        1,   152064, 0xb4609c6d
+0,        176,        176,        1,   152064, 0xf5b2bd5e
+0,        177,        177,        1,   152064, 0x9f43ce57
+0,        178,        178,        1,   152064, 0x77642dd3
+0,        179,        179,        1,   152064, 0x3e79565c
+0,        180,        180,        1,   152064, 0x95f40b8e
+0,        181,        181,        1,   152064, 0x3c8ca4d4
+0,        182,        182,        1,   152064, 0xa02ac497
+0,        183,        183,        1,   152064, 0x4c93b377
+0,        184,        184,        1,   152064, 0x55f5ac68
+0,        185,        185,        1,   152064, 0xf8652eca
+0,        186,        186,        1,   152064, 0x56e94574
+0,        187,        187,        1,   152064, 0x6d8302e1
+0,        188,        188,        1,   152064, 0x29a57061
+0,        189,        189,        1,   152064, 0x24e4cfdc
+0,        190,        190,        1,   152064, 0xf5a5d62a
+0,        191,        191,        1,   152064, 0x998870c1
+0,        192,        192,        1,   152064, 0xa15b1f4e
+0,        193,        193,        1,   152064, 0xb0ccb51f
+0,        194,        194,        1,   152064, 0xeaaf59ab
+0,        195,        195,        1,   152064, 0x7e2b4fe6
+0,        196,        196,        1,   152064, 0x72299fea
+0,        197,        197,        1,   152064, 0x769da8b2
+0,        198,        198,        1,   152064, 0xefad7ef8
+0,        199,        199,        1,   152064, 0x24819983
+0,        200,        200,        1,   152064, 0x2aad32ab
+0,        201,        201,        1,   152064, 0xc80cac79
+0,        202,        202,        1,   152064, 0x1659d628
+0,        203,        203,        1,   152064, 0xef941f66
+0,        204,        204,        1,   152064, 0x0d7fcdb5
+0,        205,        205,        1,   152064, 0x7c1853fa
+0,        206,        206,        1,   152064, 0xb94c4d3c
+0,        207,        207,        1,   152064, 0xc47adfc2
+0,        208,        208,        1,   152064, 0x366a6729
+0,        209,        209,        1,   152064, 0x7eb37b70
+0,        210,        210,        1,   152064, 0xafd54c27
+0,        211,        211,        1,   152064, 0x67b18636
+0,        212,        212,        1,   152064, 0x93b22dcf
+0,        213,        213,        1,   152064, 0xa64991f1
+0,        214,        214,        1,   152064, 0xd32a7102
+0,        215,        215,        1,   152064, 0xff665d1c
+0,        216,        216,        1,   152064, 0xf107cc31
+0,        217,        217,        1,   152064, 0xf5b25652
+0,        218,        218,        1,   152064, 0x8caf783d
+0,        219,        219,        1,   152064, 0x72f3eb00
+0,        220,        220,        1,   152064, 0xb5aea5f8
+0,        221,        221,        1,   152064, 0xee70e870
+0,        222,        222,        1,   152064, 0x7c3a0156
+0,        223,        223,        1,   152064, 0x871b6383
+0,        224,        224,        1,   152064, 0x48d831ff
+0,        225,        225,        1,   152064, 0xca233913
+0,        226,        226,        1,   152064, 0xe14bc5eb
+0,        227,        227,        1,   152064, 0x9b1d27e7
+0,        228,        228,        1,   152064, 0xfb9637f7
+0,        229,        229,        1,   152064, 0x0c022157
+0,        230,        230,        1,   152064, 0x16d35fc9
+0,        231,        231,        1,   152064, 0x6d935f71
+0,        232,        232,        1,   152064, 0xae4066fa
+0,        233,        233,        1,   152064, 0xcef94fdc
+0,        234,        234,        1,   152064, 0xc234edb9
+0,        235,        235,        1,   152064, 0x26a4f2e2
+0,        236,        236,        1,   152064, 0xd29ac23e
+0,        237,        237,        1,   152064, 0xb7604395
+0,        238,        238,        1,   152064, 0x408084f6
+0,        239,        239,        1,   152064, 0x0a02026c
+0,        240,        240,        1,   152064, 0x78b33c7c
+0,        241,        241,        1,   152064, 0xcb02b874
+0,        242,        242,        1,   152064, 0xf566513b
+0,        243,        243,        1,   152064, 0xb34e52b1
+0,        244,        244,        1,   152064, 0xf55ff493
+0,        245,        245,        1,   152064, 0xb0e8282a
+0,        246,        246,        1,   152064, 0xe9510bbe
+0,        247,        247,        1,   152064, 0x292e8c5a
+0,        248,        248,        1,   152064, 0x62b9d2b0
+0,        249,        249,        1,   152064, 0x3a8cc827
+0,        250,        250,        1,   152064, 0x25cc465e
+0,        251,        251,        1,   152064, 0xf2bc32e2
+0,        252,        252,        1,   152064, 0x6141f914
+0,        253,        253,        1,   152064, 0x1171256f
+0,        254,        254,        1,   152064, 0x13cb2ded
+0,        255,        255,        1,   152064, 0x3d4ca557
+0,        256,        256,        1,   152064, 0xf2b9e72e
+0,        257,        257,        1,   152064, 0x03f7547a
+0,        258,        258,        1,   152064, 0xc7302955
+0,        259,        259,        1,   152064, 0xe78a46d3
+0,        260,        260,        1,   152064, 0x3726a270
+0,        261,        261,        1,   152064, 0x2f65722a
+0,        262,        262,        1,   152064, 0x55acce40
+0,        263,        263,        1,   152064, 0xf6fa9db2
+0,        264,        264,        1,   152064, 0x70a36937
+0,        265,        265,        1,   152064, 0x9313742d
+0,        266,        266,        1,   152064, 0x2eb14e53
+0,        267,        267,        1,   152064, 0x3d47c9c3
+0,        268,        268,        1,   152064, 0xd0a90348
+0,        269,        269,        1,   152064, 0x6ad48088
+0,        270,        270,        1,   152064, 0x68e64738
+0,        271,        271,        1,   152064, 0x04c3735a
+0,        272,        272,        1,   152064, 0x51d0593f
+0,        273,        273,        1,   152064, 0x42cf2b48
+0,        274,        274,        1,   152064, 0xa5496a0c
+0,        275,        275,        1,   152064, 0x84c25549
+0,        276,        276,        1,   152064, 0x96691600
+0,        277,        277,        1,   152064, 0x423135db
+0,        278,        278,        1,   152064, 0x8d2e08b6
+0,        279,        279,        1,   152064, 0xaeb4c840
+0,        280,        280,        1,   152064, 0xf3e71780
+0,        281,        281,        1,   152064, 0x8858228b
+0,        282,        282,        1,   152064, 0xf28613f8
+0,        283,        283,        1,   152064, 0xb5327882
+0,        284,        284,        1,   152064, 0xbb60bb85
+0,        285,        285,        1,   152064, 0x345ab1c9
+0,        286,        286,        1,   152064, 0x8aac2cba
+0,        287,        287,        1,   152064, 0x7ce15b4c
+0,        288,        288,        1,   152064, 0xc09c55c0
+0,        289,        289,        1,   152064, 0x8482ddd6
+0,        290,        290,        1,   152064, 0xab222a13
+0,        291,        291,        1,   152064, 0xd39b0dea
+0,        292,        292,        1,   152064, 0x6dab6e06
+0,        293,        293,        1,   152064, 0xec0891bd
+0,        294,        294,        1,   152064, 0x88bd9701
+0,        295,        295,        1,   152064, 0xdf13072a
+0,        296,        296,        1,   152064, 0x23b33081
+0,        297,        297,        1,   152064, 0x63943137
+0,        298,        298,        1,   152064, 0xab6a9052
+0,        299,        299,        1,   152064, 0x05485494
diff --git a/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
index d6c41dd6430..9958f1616f4 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
@@ -3,303 +3,303 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x3e39c08b
-0,          2,          2,        1,   152064, 0xabc67990
-0,          3,          3,        1,   152064, 0x19614e74
-0,          4,          4,        1,   152064, 0xa3776beb
-0,          5,          5,        1,   152064, 0xcce6ffdf
-0,          6,          6,        1,   152064, 0xb0e94746
-0,          7,          7,        1,   152064, 0xdb1a84ef
-0,          8,          8,        1,   152064, 0xb2624509
-0,          9,          9,        1,   152064, 0x32e2d826
-0,         10,         10,        1,   152064, 0xb3bddf0b
-0,         11,         11,        1,   152064, 0x2e273ce3
-0,         12,         12,        1,   152064, 0x67af7e4d
-0,         13,         13,        1,   152064, 0x505c3261
-0,         14,         14,        1,   152064, 0xa43d015e
-0,         15,         15,        1,   152064, 0xad41c1f6
-0,         16,         16,        1,   152064, 0x633ba55f
-0,         17,         17,        1,   152064, 0xe80634f0
-0,         18,         18,        1,   152064, 0x80a07dc9
-0,         19,         19,        1,   152064, 0x0e7a3bbf
-0,         20,         20,        1,   152064, 0xcb099196
-0,         21,         21,        1,   152064, 0x57c96db5
-0,         22,         22,        1,   152064, 0xccd422fa
-0,         23,         23,        1,   152064, 0x0850b7a7
-0,         24,         24,        1,   152064, 0x30e33156
-0,         25,         25,        1,   152064, 0x34e13f9a
-0,         26,         26,        1,   152064, 0x03d36000
-0,         27,         27,        1,   152064, 0xbf7d49da
-0,         28,         28,        1,   152064, 0x77336d09
-0,         29,         29,        1,   152064, 0xca8be5a9
-0,         30,         30,        1,   152064, 0xe57c0b08
-0,         31,         31,        1,   152064, 0xbe77c093
-0,         32,         32,        1,   152064, 0x6bf1ff05
-0,         33,         33,        1,   152064, 0x9142babf
-0,         34,         34,        1,   152064, 0x08db8e67
-0,         35,         35,        1,   152064, 0x69ac8cb6
-0,         36,         36,        1,   152064, 0xaa3b5c88
-0,         37,         37,        1,   152064, 0x9bd32638
-0,         38,         38,        1,   152064, 0x7972115a
-0,         39,         39,        1,   152064, 0x5c1dd47b
-0,         40,         40,        1,   152064, 0x8a196e02
-0,         41,         41,        1,   152064, 0xa89672bc
-0,         42,         42,        1,   152064, 0x27b220e4
-0,         43,         43,        1,   152064, 0xfa38dc4a
-0,         44,         44,        1,   152064, 0x4784c639
-0,         45,         45,        1,   152064, 0xa5e4229a
-0,         46,         46,        1,   152064, 0xa986bdfc
-0,         47,         47,        1,   152064, 0x2951b47b
-0,         48,         48,        1,   152064, 0x4df404a6
-0,         49,         49,        1,   152064, 0xc75155e8
-0,         50,         50,        1,   152064, 0xfc05248c
-0,         51,         51,        1,   152064, 0x5d53da10
-0,         52,         52,        1,   152064, 0x284376ec
-0,         53,         53,        1,   152064, 0x19fce380
-0,         54,         54,        1,   152064, 0x876be6c9
-0,         55,         55,        1,   152064, 0x39eb8ff9
-0,         56,         56,        1,   152064, 0x289c9543
-0,         57,         57,        1,   152064, 0x24dd2356
-0,         58,         58,        1,   152064, 0x1dc17d3c
-0,         59,         59,        1,   152064, 0xd17c00ac
-0,         60,         60,        1,   152064, 0xc2ad54de
-0,         61,         61,        1,   152064, 0xbe11ee2f
-0,         62,         62,        1,   152064, 0x3db9dc89
-0,         63,         63,        1,   152064, 0xac0d7bc2
-0,         64,         64,        1,   152064, 0x8dab2dde
-0,         65,         65,        1,   152064, 0x566ad225
-0,         66,         66,        1,   152064, 0x587c7853
-0,         67,         67,        1,   152064, 0x601c9c80
-0,         68,         68,        1,   152064, 0x2afaf751
-0,         69,         69,        1,   152064, 0x1c9f7e3a
-0,         70,         70,        1,   152064, 0x899475bf
-0,         71,         71,        1,   152064, 0x0d65c7d9
-0,         72,         72,        1,   152064, 0xafd63d12
-0,         73,         73,        1,   152064, 0x162e62b9
-0,         74,         74,        1,   152064, 0x5c9554be
-0,         75,         75,        1,   152064, 0x35fbdaa2
-0,         76,         76,        1,   152064, 0x6438cbd8
-0,         77,         77,        1,   152064, 0xde0772c9
-0,         78,         78,        1,   152064, 0x79f82854
-0,         79,         79,        1,   152064, 0x86957840
-0,         80,         80,        1,   152064, 0xd9468cbf
-0,         81,         81,        1,   152064, 0x23e74609
-0,         82,         82,        1,   152064, 0x3919a146
-0,         83,         83,        1,   152064, 0xd641078b
-0,         84,         84,        1,   152064, 0x24397220
-0,         85,         85,        1,   152064, 0xe7fc3a7c
-0,         86,         86,        1,   152064, 0x3997154a
-0,         87,         87,        1,   152064, 0x2af3952c
-0,         88,         88,        1,   152064, 0x274ac07a
-0,         89,         89,        1,   152064, 0x288f7b09
-0,         90,         90,        1,   152064, 0xe6f9b022
-0,         91,         91,        1,   152064, 0xf09e2fbb
-0,         92,         92,        1,   152064, 0x7244e477
-0,         93,         93,        1,   152064, 0x0dfc72eb
-0,         94,         94,        1,   152064, 0x0322b21f
-0,         95,         95,        1,   152064, 0x18b08205
-0,         96,         96,        1,   152064, 0x6606153e
-0,         97,         97,        1,   152064, 0x85186272
-0,         98,         98,        1,   152064, 0x3369f064
-0,         99,         99,        1,   152064, 0xbe0d5a44
-0,        100,        100,        1,   152064, 0x320258bb
-0,        101,        101,        1,   152064, 0x4d6fb091
-0,        102,        102,        1,   152064, 0xc9bbf5e7
-0,        103,        103,        1,   152064, 0x0aa1b69b
-0,        104,        104,        1,   152064, 0x85b9ac11
-0,        105,        105,        1,   152064, 0xb25ff818
-0,        106,        106,        1,   152064, 0xa155dc25
-0,        107,        107,        1,   152064, 0xa8e03bfd
-0,        108,        108,        1,   152064, 0x0a862956
-0,        109,        109,        1,   152064, 0x11b49264
-0,        110,        110,        1,   152064, 0xa94e664e
-0,        111,        111,        1,   152064, 0x330e0fa2
-0,        112,        112,        1,   152064, 0xaf3d9518
-0,        113,        113,        1,   152064, 0x0836f2e8
-0,        114,        114,        1,   152064, 0xbf6dc578
-0,        115,        115,        1,   152064, 0x7b524d20
-0,        116,        116,        1,   152064, 0x9ef7677f
-0,        117,        117,        1,   152064, 0xeacf3f34
-0,        118,        118,        1,   152064, 0xfb4e3dbe
-0,        119,        119,        1,   152064, 0xb46e25cb
-0,        120,        120,        1,   152064, 0x363c1603
-0,        121,        121,        1,   152064, 0x263fc542
-0,        122,        122,        1,   152064, 0xf106e548
-0,        123,        123,        1,   152064, 0xde43c56a
-0,        124,        124,        1,   152064, 0xc2c4770a
-0,        125,        125,        1,   152064, 0x122fce19
-0,        126,        126,        1,   152064, 0x3ba01434
-0,        127,        127,        1,   152064, 0x0e8ce5ee
-0,        128,        128,        1,   152064, 0x6ceb82e1
-0,        129,        129,        1,   152064, 0xa23ee21c
-0,        130,        130,        1,   152064, 0xc6d960f9
-0,        131,        131,        1,   152064, 0x0de15258
-0,        132,        132,        1,   152064, 0x187b0333
-0,        133,        133,        1,   152064, 0x92e6582f
-0,        134,        134,        1,   152064, 0xb9586ce0
-0,        135,        135,        1,   152064, 0xefd803b5
-0,        136,        136,        1,   152064, 0x24eafb29
-0,        137,        137,        1,   152064, 0x20c73b14
-0,        138,        138,        1,   152064, 0xbd7ceaaa
-0,        139,        139,        1,   152064, 0x775216c8
-0,        140,        140,        1,   152064, 0xa08971c7
-0,        141,        141,        1,   152064, 0xef0ee865
-0,        142,        142,        1,   152064, 0x9ac61c2f
-0,        143,        143,        1,   152064, 0x52ae8ea9
-0,        144,        144,        1,   152064, 0x06571c14
-0,        145,        145,        1,   152064, 0x6e78ad33
-0,        146,        146,        1,   152064, 0xad01c627
-0,        147,        147,        1,   152064, 0xbfe074d3
-0,        148,        148,        1,   152064, 0x9357a183
-0,        149,        149,        1,   152064, 0x8de7767f
-0,        150,        150,        1,   152064, 0xa5e6e76e
-0,        151,        151,        1,   152064, 0xa6f646fe
-0,        152,        152,        1,   152064, 0x132e99f8
-0,        153,        153,        1,   152064, 0xb79f27de
-0,        154,        154,        1,   152064, 0x36d3cdcf
-0,        155,        155,        1,   152064, 0xdc938336
-0,        156,        156,        1,   152064, 0xacaa3a7f
-0,        157,        157,        1,   152064, 0xc61a37fd
-0,        158,        158,        1,   152064, 0x4fe1ddf0
-0,        159,        159,        1,   152064, 0xc0f7d660
-0,        160,        160,        1,   152064, 0xd72458ea
-0,        161,        161,        1,   152064, 0x6978d123
-0,        162,        162,        1,   152064, 0x64e60ccf
-0,        163,        163,        1,   152064, 0xaa07004c
-0,        164,        164,        1,   152064, 0x07cd1064
-0,        165,        165,        1,   152064, 0xa82320e5
-0,        166,        166,        1,   152064, 0xaedd8d30
-0,        167,        167,        1,   152064, 0x79b082ea
-0,        168,        168,        1,   152064, 0x9ed800ab
-0,        169,        169,        1,   152064, 0xde592bb4
-0,        170,        170,        1,   152064, 0xd966df88
-0,        171,        171,        1,   152064, 0xf921988a
-0,        172,        172,        1,   152064, 0x557ad9ae
-0,        173,        173,        1,   152064, 0xc3f31a9a
-0,        174,        174,        1,   152064, 0x65248561
-0,        175,        175,        1,   152064, 0x63df4aa6
-0,        176,        176,        1,   152064, 0x618da0a9
-0,        177,        177,        1,   152064, 0xe6f1c435
-0,        178,        178,        1,   152064, 0x9f90c38f
-0,        179,        179,        1,   152064, 0xd2853e14
-0,        180,        180,        1,   152064, 0x6e0268a9
-0,        181,        181,        1,   152064, 0x393712d1
-0,        182,        182,        1,   152064, 0x470da25f
-0,        183,        183,        1,   152064, 0xaf55cb3d
-0,        184,        184,        1,   152064, 0x6935b8b9
-0,        185,        185,        1,   152064, 0x5409a15f
-0,        186,        186,        1,   152064, 0x09073fee
-0,        187,        187,        1,   152064, 0xfb274e82
-0,        188,        188,        1,   152064, 0x1a770581
-0,        189,        189,        1,   152064, 0x17277d0d
-0,        190,        190,        1,   152064, 0xd4dcd982
-0,        191,        191,        1,   152064, 0x6b04eaf3
-0,        192,        192,        1,   152064, 0x8a3d822e
-0,        193,        193,        1,   152064, 0x1b971ec9
-0,        194,        194,        1,   152064, 0x14e0c0f6
-0,        195,        195,        1,   152064, 0x00667450
-0,        196,        196,        1,   152064, 0xd2385902
-0,        197,        197,        1,   152064, 0x905da6ab
-0,        198,        198,        1,   152064, 0xa3ffb18b
-0,        199,        199,        1,   152064, 0x10d48b19
-0,        200,        200,        1,   152064, 0xb2c7a3bd
-0,        201,        201,        1,   152064, 0x45593e96
-0,        202,        202,        1,   152064, 0x47a0b60c
-0,        203,        203,        1,   152064, 0x68c6d1b9
-0,        204,        204,        1,   152064, 0xbc881fcc
-0,        205,        205,        1,   152064, 0x422cc6f2
-0,        206,        206,        1,   152064, 0x9b686410
-0,        207,        207,        1,   152064, 0x35dc5e86
-0,        208,        208,        1,   152064, 0x247bedaa
-0,        209,        209,        1,   152064, 0x22b76fd1
-0,        210,        210,        1,   152064, 0x67cc7a75
-0,        211,        211,        1,   152064, 0xa197521e
-0,        212,        212,        1,   152064, 0x428c8662
-0,        213,        213,        1,   152064, 0x33dc2c73
-0,        214,        214,        1,   152064, 0x5b538903
-0,        215,        215,        1,   152064, 0x3c4176b6
-0,        216,        216,        1,   152064, 0x774364ba
-0,        217,        217,        1,   152064, 0xf237d03e
-0,        218,        218,        1,   152064, 0xac8746fb
-0,        219,        219,        1,   152064, 0x6b306a84
-0,        220,        220,        1,   152064, 0xa2ace513
-0,        221,        221,        1,   152064, 0x709c9be7
-0,        222,        222,        1,   152064, 0x2403f373
-0,        223,        223,        1,   152064, 0x147bf717
-0,        224,        224,        1,   152064, 0xe58964c8
-0,        225,        225,        1,   152064, 0xa0da36fc
-0,        226,        226,        1,   152064, 0x1ac1355c
-0,        227,        227,        1,   152064, 0x8a31c9f2
-0,        228,        228,        1,   152064, 0x42ba205c
-0,        229,        229,        1,   152064, 0xa11b3575
-0,        230,        230,        1,   152064, 0xcb35207c
-0,        231,        231,        1,   152064, 0x528f6189
-0,        232,        232,        1,   152064, 0x34f05bd7
-0,        233,        233,        1,   152064, 0x72317356
-0,        234,        234,        1,   152064, 0xaabd5028
-0,        235,        235,        1,   152064, 0x13dbeb7b
-0,        236,        236,        1,   152064, 0x62f1e8a8
-0,        237,        237,        1,   152064, 0x1723bfcd
-0,        238,        238,        1,   152064, 0x5c083c00
-0,        239,        239,        1,   152064, 0x52137894
-0,        240,        240,        1,   152064, 0xef1e082c
-0,        241,        241,        1,   152064, 0x664b3d53
-0,        242,        242,        1,   152064, 0x2eb9b296
-0,        243,        243,        1,   152064, 0xd0ca511e
-0,        244,        244,        1,   152064, 0x012d4724
-0,        245,        245,        1,   152064, 0xa847f5af
-0,        246,        246,        1,   152064, 0x483a2fde
-0,        247,        247,        1,   152064, 0xd1ab0257
-0,        248,        248,        1,   152064, 0x414692c7
-0,        249,        249,        1,   152064, 0x0b79df88
-0,        250,        250,        1,   152064, 0xdaa2c4a3
-0,        251,        251,        1,   152064, 0xd1b44500
-0,        252,        252,        1,   152064, 0xfd3d2cf3
-0,        253,        253,        1,   152064, 0xfdc0f748
-0,        254,        254,        1,   152064, 0xce762a2a
-0,        255,        255,        1,   152064, 0x08b63572
-0,        256,        256,        1,   152064, 0x5a46a38d
-0,        257,        257,        1,   152064, 0x03cee9c0
-0,        258,        258,        1,   152064, 0x9ee45473
-0,        259,        259,        1,   152064, 0x5a432386
-0,        260,        260,        1,   152064, 0x54c83d87
-0,        261,        261,        1,   152064, 0xc9caa1de
-0,        262,        262,        1,   152064, 0xa28367f1
-0,        263,        263,        1,   152064, 0x2607cdf1
-0,        264,        264,        1,   152064, 0x06baa8de
-0,        265,        265,        1,   152064, 0xf5346e32
-0,        266,        266,        1,   152064, 0x6d3e732b
-0,        267,        267,        1,   152064, 0x798c584b
-0,        268,        268,        1,   152064, 0x4076c948
-0,        269,        269,        1,   152064, 0x868cf63a
-0,        270,        270,        1,   152064, 0x23107ac5
-0,        271,        271,        1,   152064, 0x306f3fe2
-0,        272,        272,        1,   152064, 0xbd1d71d6
-0,        273,        273,        1,   152064, 0x1429545f
-0,        274,        274,        1,   152064, 0xaded29aa
-0,        275,        275,        1,   152064, 0x9b455a94
-0,        276,        276,        1,   152064, 0xb3774ce7
-0,        277,        277,        1,   152064, 0x92580986
-0,        278,        278,        1,   152064, 0x0eae2f95
-0,        279,        279,        1,   152064, 0x599208b2
-0,        280,        280,        1,   152064, 0x4804c04c
-0,        281,        281,        1,   152064, 0x5f730e8f
-0,        282,        282,        1,   152064, 0x3e501d1e
-0,        283,        283,        1,   152064, 0x32100740
-0,        284,        284,        1,   152064, 0x62226ff8
-0,        285,        285,        1,   152064, 0x7683b622
-0,        286,        286,        1,   152064, 0xc3e0aec1
-0,        287,        287,        1,   152064, 0xfac12608
-0,        288,        288,        1,   152064, 0xb21a5781
-0,        289,        289,        1,   152064, 0x8f1e4964
-0,        290,        290,        1,   152064, 0x0f62dd6e
-0,        291,        291,        1,   152064, 0xac062ac4
-0,        292,        292,        1,   152064, 0x1b320f7a
-0,        293,        293,        1,   152064, 0x346e7211
-0,        294,        294,        1,   152064, 0xe47592f3
-0,        295,        295,        1,   152064, 0xa3a7919c
-0,        296,        296,        1,   152064, 0xa3580fa6
-0,        297,        297,        1,   152064, 0xc73430c1
-0,        298,        298,        1,   152064, 0x994a2c18
-0,        299,        299,        1,   152064, 0x0b5d8d45
-0,        300,        300,        1,   152064, 0x9eed5109
+0,          0,          0,        1,   152064, 0x3e39c08b
+0,          1,          1,        1,   152064, 0xabc67990
+0,          2,          2,        1,   152064, 0x19614e74
+0,          3,          3,        1,   152064, 0xa3776beb
+0,          4,          4,        1,   152064, 0xcce6ffdf
+0,          5,          5,        1,   152064, 0xb0e94746
+0,          6,          6,        1,   152064, 0xdb1a84ef
+0,          7,          7,        1,   152064, 0xb2624509
+0,          8,          8,        1,   152064, 0x32e2d826
+0,          9,          9,        1,   152064, 0xb3bddf0b
+0,         10,         10,        1,   152064, 0x2e273ce3
+0,         11,         11,        1,   152064, 0x67af7e4d
+0,         12,         12,        1,   152064, 0x505c3261
+0,         13,         13,        1,   152064, 0xa43d015e
+0,         14,         14,        1,   152064, 0xad41c1f6
+0,         15,         15,        1,   152064, 0x633ba55f
+0,         16,         16,        1,   152064, 0xe80634f0
+0,         17,         17,        1,   152064, 0x80a07dc9
+0,         18,         18,        1,   152064, 0x0e7a3bbf
+0,         19,         19,        1,   152064, 0xcb099196
+0,         20,         20,        1,   152064, 0x57c96db5
+0,         21,         21,        1,   152064, 0xccd422fa
+0,         22,         22,        1,   152064, 0x0850b7a7
+0,         23,         23,        1,   152064, 0x30e33156
+0,         24,         24,        1,   152064, 0x34e13f9a
+0,         25,         25,        1,   152064, 0x03d36000
+0,         26,         26,        1,   152064, 0xbf7d49da
+0,         27,         27,        1,   152064, 0x77336d09
+0,         28,         28,        1,   152064, 0xca8be5a9
+0,         29,         29,        1,   152064, 0xe57c0b08
+0,         30,         30,        1,   152064, 0xbe77c093
+0,         31,         31,        1,   152064, 0x6bf1ff05
+0,         32,         32,        1,   152064, 0x9142babf
+0,         33,         33,        1,   152064, 0x08db8e67
+0,         34,         34,        1,   152064, 0x69ac8cb6
+0,         35,         35,        1,   152064, 0xaa3b5c88
+0,         36,         36,        1,   152064, 0x9bd32638
+0,         37,         37,        1,   152064, 0x7972115a
+0,         38,         38,        1,   152064, 0x5c1dd47b
+0,         39,         39,        1,   152064, 0x8a196e02
+0,         40,         40,        1,   152064, 0xa89672bc
+0,         41,         41,        1,   152064, 0x27b220e4
+0,         42,         42,        1,   152064, 0xfa38dc4a
+0,         43,         43,        1,   152064, 0x4784c639
+0,         44,         44,        1,   152064, 0xa5e4229a
+0,         45,         45,        1,   152064, 0xa986bdfc
+0,         46,         46,        1,   152064, 0x2951b47b
+0,         47,         47,        1,   152064, 0x4df404a6
+0,         48,         48,        1,   152064, 0xc75155e8
+0,         49,         49,        1,   152064, 0xfc05248c
+0,         50,         50,        1,   152064, 0x5d53da10
+0,         51,         51,        1,   152064, 0x284376ec
+0,         52,         52,        1,   152064, 0x19fce380
+0,         53,         53,        1,   152064, 0x876be6c9
+0,         54,         54,        1,   152064, 0x39eb8ff9
+0,         55,         55,        1,   152064, 0x289c9543
+0,         56,         56,        1,   152064, 0x24dd2356
+0,         57,         57,        1,   152064, 0x1dc17d3c
+0,         58,         58,        1,   152064, 0xd17c00ac
+0,         59,         59,        1,   152064, 0xc2ad54de
+0,         60,         60,        1,   152064, 0xbe11ee2f
+0,         61,         61,        1,   152064, 0x3db9dc89
+0,         62,         62,        1,   152064, 0xac0d7bc2
+0,         63,         63,        1,   152064, 0x8dab2dde
+0,         64,         64,        1,   152064, 0x566ad225
+0,         65,         65,        1,   152064, 0x587c7853
+0,         66,         66,        1,   152064, 0x601c9c80
+0,         67,         67,        1,   152064, 0x2afaf751
+0,         68,         68,        1,   152064, 0x1c9f7e3a
+0,         69,         69,        1,   152064, 0x899475bf
+0,         70,         70,        1,   152064, 0x0d65c7d9
+0,         71,         71,        1,   152064, 0xafd63d12
+0,         72,         72,        1,   152064, 0x162e62b9
+0,         73,         73,        1,   152064, 0x5c9554be
+0,         74,         74,        1,   152064, 0x35fbdaa2
+0,         75,         75,        1,   152064, 0x6438cbd8
+0,         76,         76,        1,   152064, 0xde0772c9
+0,         77,         77,        1,   152064, 0x79f82854
+0,         78,         78,        1,   152064, 0x86957840
+0,         79,         79,        1,   152064, 0xd9468cbf
+0,         80,         80,        1,   152064, 0x23e74609
+0,         81,         81,        1,   152064, 0x3919a146
+0,         82,         82,        1,   152064, 0xd641078b
+0,         83,         83,        1,   152064, 0x24397220
+0,         84,         84,        1,   152064, 0xe7fc3a7c
+0,         85,         85,        1,   152064, 0x3997154a
+0,         86,         86,        1,   152064, 0x2af3952c
+0,         87,         87,        1,   152064, 0x274ac07a
+0,         88,         88,        1,   152064, 0x288f7b09
+0,         89,         89,        1,   152064, 0xe6f9b022
+0,         90,         90,        1,   152064, 0xf09e2fbb
+0,         91,         91,        1,   152064, 0x7244e477
+0,         92,         92,        1,   152064, 0x0dfc72eb
+0,         93,         93,        1,   152064, 0x0322b21f
+0,         94,         94,        1,   152064, 0x18b08205
+0,         95,         95,        1,   152064, 0x6606153e
+0,         96,         96,        1,   152064, 0x85186272
+0,         97,         97,        1,   152064, 0x3369f064
+0,         98,         98,        1,   152064, 0xbe0d5a44
+0,         99,         99,        1,   152064, 0x320258bb
+0,        100,        100,        1,   152064, 0x4d6fb091
+0,        101,        101,        1,   152064, 0xc9bbf5e7
+0,        102,        102,        1,   152064, 0x0aa1b69b
+0,        103,        103,        1,   152064, 0x85b9ac11
+0,        104,        104,        1,   152064, 0xb25ff818
+0,        105,        105,        1,   152064, 0xa155dc25
+0,        106,        106,        1,   152064, 0xa8e03bfd
+0,        107,        107,        1,   152064, 0x0a862956
+0,        108,        108,        1,   152064, 0x11b49264
+0,        109,        109,        1,   152064, 0xa94e664e
+0,        110,        110,        1,   152064, 0x330e0fa2
+0,        111,        111,        1,   152064, 0xaf3d9518
+0,        112,        112,        1,   152064, 0x0836f2e8
+0,        113,        113,        1,   152064, 0xbf6dc578
+0,        114,        114,        1,   152064, 0x7b524d20
+0,        115,        115,        1,   152064, 0x9ef7677f
+0,        116,        116,        1,   152064, 0xeacf3f34
+0,        117,        117,        1,   152064, 0xfb4e3dbe
+0,        118,        118,        1,   152064, 0xb46e25cb
+0,        119,        119,        1,   152064, 0x363c1603
+0,        120,        120,        1,   152064, 0x263fc542
+0,        121,        121,        1,   152064, 0xf106e548
+0,        122,        122,        1,   152064, 0xde43c56a
+0,        123,        123,        1,   152064, 0xc2c4770a
+0,        124,        124,        1,   152064, 0x122fce19
+0,        125,        125,        1,   152064, 0x3ba01434
+0,        126,        126,        1,   152064, 0x0e8ce5ee
+0,        127,        127,        1,   152064, 0x6ceb82e1
+0,        128,        128,        1,   152064, 0xa23ee21c
+0,        129,        129,        1,   152064, 0xc6d960f9
+0,        130,        130,        1,   152064, 0x0de15258
+0,        131,        131,        1,   152064, 0x187b0333
+0,        132,        132,        1,   152064, 0x92e6582f
+0,        133,        133,        1,   152064, 0xb9586ce0
+0,        134,        134,        1,   152064, 0xefd803b5
+0,        135,        135,        1,   152064, 0x24eafb29
+0,        136,        136,        1,   152064, 0x20c73b14
+0,        137,        137,        1,   152064, 0xbd7ceaaa
+0,        138,        138,        1,   152064, 0x775216c8
+0,        139,        139,        1,   152064, 0xa08971c7
+0,        140,        140,        1,   152064, 0xef0ee865
+0,        141,        141,        1,   152064, 0x9ac61c2f
+0,        142,        142,        1,   152064, 0x52ae8ea9
+0,        143,        143,        1,   152064, 0x06571c14
+0,        144,        144,        1,   152064, 0x6e78ad33
+0,        145,        145,        1,   152064, 0xad01c627
+0,        146,        146,        1,   152064, 0xbfe074d3
+0,        147,        147,        1,   152064, 0x9357a183
+0,        148,        148,        1,   152064, 0x8de7767f
+0,        149,        149,        1,   152064, 0xa5e6e76e
+0,        150,        150,        1,   152064, 0xa6f646fe
+0,        151,        151,        1,   152064, 0x132e99f8
+0,        152,        152,        1,   152064, 0xb79f27de
+0,        153,        153,        1,   152064, 0x36d3cdcf
+0,        154,        154,        1,   152064, 0xdc938336
+0,        155,        155,        1,   152064, 0xacaa3a7f
+0,        156,        156,        1,   152064, 0xc61a37fd
+0,        157,        157,        1,   152064, 0x4fe1ddf0
+0,        158,        158,        1,   152064, 0xc0f7d660
+0,        159,        159,        1,   152064, 0xd72458ea
+0,        160,        160,        1,   152064, 0x6978d123
+0,        161,        161,        1,   152064, 0x64e60ccf
+0,        162,        162,        1,   152064, 0xaa07004c
+0,        163,        163,        1,   152064, 0x07cd1064
+0,        164,        164,        1,   152064, 0xa82320e5
+0,        165,        165,        1,   152064, 0xaedd8d30
+0,        166,        166,        1,   152064, 0x79b082ea
+0,        167,        167,        1,   152064, 0x9ed800ab
+0,        168,        168,        1,   152064, 0xde592bb4
+0,        169,        169,        1,   152064, 0xd966df88
+0,        170,        170,        1,   152064, 0xf921988a
+0,        171,        171,        1,   152064, 0x557ad9ae
+0,        172,        172,        1,   152064, 0xc3f31a9a
+0,        173,        173,        1,   152064, 0x65248561
+0,        174,        174,        1,   152064, 0x63df4aa6
+0,        175,        175,        1,   152064, 0x618da0a9
+0,        176,        176,        1,   152064, 0xe6f1c435
+0,        177,        177,        1,   152064, 0x9f90c38f
+0,        178,        178,        1,   152064, 0xd2853e14
+0,        179,        179,        1,   152064, 0x6e0268a9
+0,        180,        180,        1,   152064, 0x393712d1
+0,        181,        181,        1,   152064, 0x470da25f
+0,        182,        182,        1,   152064, 0xaf55cb3d
+0,        183,        183,        1,   152064, 0x6935b8b9
+0,        184,        184,        1,   152064, 0x5409a15f
+0,        185,        185,        1,   152064, 0x09073fee
+0,        186,        186,        1,   152064, 0xfb274e82
+0,        187,        187,        1,   152064, 0x1a770581
+0,        188,        188,        1,   152064, 0x17277d0d
+0,        189,        189,        1,   152064, 0xd4dcd982
+0,        190,        190,        1,   152064, 0x6b04eaf3
+0,        191,        191,        1,   152064, 0x8a3d822e
+0,        192,        192,        1,   152064, 0x1b971ec9
+0,        193,        193,        1,   152064, 0x14e0c0f6
+0,        194,        194,        1,   152064, 0x00667450
+0,        195,        195,        1,   152064, 0xd2385902
+0,        196,        196,        1,   152064, 0x905da6ab
+0,        197,        197,        1,   152064, 0xa3ffb18b
+0,        198,        198,        1,   152064, 0x10d48b19
+0,        199,        199,        1,   152064, 0xb2c7a3bd
+0,        200,        200,        1,   152064, 0x45593e96
+0,        201,        201,        1,   152064, 0x47a0b60c
+0,        202,        202,        1,   152064, 0x68c6d1b9
+0,        203,        203,        1,   152064, 0xbc881fcc
+0,        204,        204,        1,   152064, 0x422cc6f2
+0,        205,        205,        1,   152064, 0x9b686410
+0,        206,        206,        1,   152064, 0x35dc5e86
+0,        207,        207,        1,   152064, 0x247bedaa
+0,        208,        208,        1,   152064, 0x22b76fd1
+0,        209,        209,        1,   152064, 0x67cc7a75
+0,        210,        210,        1,   152064, 0xa197521e
+0,        211,        211,        1,   152064, 0x428c8662
+0,        212,        212,        1,   152064, 0x33dc2c73
+0,        213,        213,        1,   152064, 0x5b538903
+0,        214,        214,        1,   152064, 0x3c4176b6
+0,        215,        215,        1,   152064, 0x774364ba
+0,        216,        216,        1,   152064, 0xf237d03e
+0,        217,        217,        1,   152064, 0xac8746fb
+0,        218,        218,        1,   152064, 0x6b306a84
+0,        219,        219,        1,   152064, 0xa2ace513
+0,        220,        220,        1,   152064, 0x709c9be7
+0,        221,        221,        1,   152064, 0x2403f373
+0,        222,        222,        1,   152064, 0x147bf717
+0,        223,        223,        1,   152064, 0xe58964c8
+0,        224,        224,        1,   152064, 0xa0da36fc
+0,        225,        225,        1,   152064, 0x1ac1355c
+0,        226,        226,        1,   152064, 0x8a31c9f2
+0,        227,        227,        1,   152064, 0x42ba205c
+0,        228,        228,        1,   152064, 0xa11b3575
+0,        229,        229,        1,   152064, 0xcb35207c
+0,        230,        230,        1,   152064, 0x528f6189
+0,        231,        231,        1,   152064, 0x34f05bd7
+0,        232,        232,        1,   152064, 0x72317356
+0,        233,        233,        1,   152064, 0xaabd5028
+0,        234,        234,        1,   152064, 0x13dbeb7b
+0,        235,        235,        1,   152064, 0x62f1e8a8
+0,        236,        236,        1,   152064, 0x1723bfcd
+0,        237,        237,        1,   152064, 0x5c083c00
+0,        238,        238,        1,   152064, 0x52137894
+0,        239,        239,        1,   152064, 0xef1e082c
+0,        240,        240,        1,   152064, 0x664b3d53
+0,        241,        241,        1,   152064, 0x2eb9b296
+0,        242,        242,        1,   152064, 0xd0ca511e
+0,        243,        243,        1,   152064, 0x012d4724
+0,        244,        244,        1,   152064, 0xa847f5af
+0,        245,        245,        1,   152064, 0x483a2fde
+0,        246,        246,        1,   152064, 0xd1ab0257
+0,        247,        247,        1,   152064, 0x414692c7
+0,        248,        248,        1,   152064, 0x0b79df88
+0,        249,        249,        1,   152064, 0xdaa2c4a3
+0,        250,        250,        1,   152064, 0xd1b44500
+0,        251,        251,        1,   152064, 0xfd3d2cf3
+0,        252,        252,        1,   152064, 0xfdc0f748
+0,        253,        253,        1,   152064, 0xce762a2a
+0,        254,        254,        1,   152064, 0x08b63572
+0,        255,        255,        1,   152064, 0x5a46a38d
+0,        256,        256,        1,   152064, 0x03cee9c0
+0,        257,        257,        1,   152064, 0x9ee45473
+0,        258,        258,        1,   152064, 0x5a432386
+0,        259,        259,        1,   152064, 0x54c83d87
+0,        260,        260,        1,   152064, 0xc9caa1de
+0,        261,        261,        1,   152064, 0xa28367f1
+0,        262,        262,        1,   152064, 0x2607cdf1
+0,        263,        263,        1,   152064, 0x06baa8de
+0,        264,        264,        1,   152064, 0xf5346e32
+0,        265,        265,        1,   152064, 0x6d3e732b
+0,        266,        266,        1,   152064, 0x798c584b
+0,        267,        267,        1,   152064, 0x4076c948
+0,        268,        268,        1,   152064, 0x868cf63a
+0,        269,        269,        1,   152064, 0x23107ac5
+0,        270,        270,        1,   152064, 0x306f3fe2
+0,        271,        271,        1,   152064, 0xbd1d71d6
+0,        272,        272,        1,   152064, 0x1429545f
+0,        273,        273,        1,   152064, 0xaded29aa
+0,        274,        274,        1,   152064, 0x9b455a94
+0,        275,        275,        1,   152064, 0xb3774ce7
+0,        276,        276,        1,   152064, 0x92580986
+0,        277,        277,        1,   152064, 0x0eae2f95
+0,        278,        278,        1,   152064, 0x599208b2
+0,        279,        279,        1,   152064, 0x4804c04c
+0,        280,        280,        1,   152064, 0x5f730e8f
+0,        281,        281,        1,   152064, 0x3e501d1e
+0,        282,        282,        1,   152064, 0x32100740
+0,        283,        283,        1,   152064, 0x62226ff8
+0,        284,        284,        1,   152064, 0x7683b622
+0,        285,        285,        1,   152064, 0xc3e0aec1
+0,        286,        286,        1,   152064, 0xfac12608
+0,        287,        287,        1,   152064, 0xb21a5781
+0,        288,        288,        1,   152064, 0x8f1e4964
+0,        289,        289,        1,   152064, 0x0f62dd6e
+0,        290,        290,        1,   152064, 0xac062ac4
+0,        291,        291,        1,   152064, 0x1b320f7a
+0,        292,        292,        1,   152064, 0x346e7211
+0,        293,        293,        1,   152064, 0xe47592f3
+0,        294,        294,        1,   152064, 0xa3a7919c
+0,        295,        295,        1,   152064, 0xa3580fa6
+0,        296,        296,        1,   152064, 0xc73430c1
+0,        297,        297,        1,   152064, 0x994a2c18
+0,        298,        298,        1,   152064, 0x0b5d8d45
+0,        299,        299,        1,   152064, 0x9eed5109
diff --git a/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b b/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
index 72b15b11e16..1b03e88a1f1 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
@@ -3,78 +3,78 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0xf8248ceb
-0,          2,          2,        1,   152064, 0xb6204c81
+0,          0,          0,        1,   152064, 0xf8248ceb
+0,          1,          1,        1,   152064, 0xb6204c81
 0,          2,          2,        1,   152064, 0x22fb1737
 0,          3,          3,        1,   152064, 0xce8c3fd7
-0,          5,          5,        1,   152064, 0xee88cedc
+0,          4,          4,        1,   152064, 0xee88cedc
 0,          5,          5,        1,   152064, 0x1d4209ca
-0,          7,          7,        1,   152064, 0x6fb15238
-0,          8,          8,        1,   152064, 0x505200c2
+0,          6,          6,        1,   152064, 0x6fb15238
+0,          7,          7,        1,   152064, 0x505200c2
 0,          8,          8,        1,   152064, 0xb73574ba
 0,          9,          9,        1,   152064, 0x0586a097
-0,         11,         11,        1,   152064, 0xed50fe02
+0,         10,         10,        1,   152064, 0xed50fe02
 0,         11,         11,        1,   152064, 0x222221ab
 0,         12,         12,        1,   152064, 0x8afefd46
-0,         14,         14,        1,   152064, 0x6832c5cc
-0,         15,         15,        1,   152064, 0xba4c8110
+0,         13,         13,        1,   152064, 0x6832c5cc
+0,         14,         14,        1,   152064, 0xba4c8110
 0,         15,         15,        1,   152064, 0x95c07e1e
 0,         16,         16,        1,   152064, 0xc5d6fde9
-0,         18,         18,        1,   152064, 0xe75a4921
-0,         19,         19,        1,   152064, 0x53b61688
+0,         17,         17,        1,   152064, 0xe75a4921
+0,         18,         18,        1,   152064, 0x53b61688
 0,         19,         19,        1,   152064, 0x0335424b
-0,         21,         21,        1,   152064, 0x621742c7
-0,         22,         22,        1,   152064, 0x4f69f41b
+0,         20,         20,        1,   152064, 0x621742c7
+0,         21,         21,        1,   152064, 0x4f69f41b
 0,         22,         22,        1,   152064, 0x6b3f65d7
-0,         24,         24,        1,   152064, 0x8dfde04f
+0,         23,         23,        1,   152064, 0x8dfde04f
 0,         24,         24,        1,   152064, 0x30750ff5
-0,         26,         26,        1,   152064, 0xe3d70f3c
+0,         25,         25,        1,   152064, 0xe3d70f3c
 0,         26,         26,        1,   152064, 0x0c1af825
-0,         28,         28,        1,   152064, 0x58a53935
+0,         27,         27,        1,   152064, 0x58a53935
 0,         28,         28,        1,   152064, 0xc63d9e98
-0,         30,         30,        1,   152064, 0xa85fdc48
+0,         29,         29,        1,   152064, 0xa85fdc48
 0,         30,         30,        1,   152064, 0x01bb9784
-0,         32,         32,        1,   152064, 0xdd5cb509
+0,         31,         31,        1,   152064, 0xdd5cb509
 0,         32,         32,        1,   152064, 0x29ae7d2b
-0,         34,         34,        1,   152064, 0xdb08593e
-0,         35,         35,        1,   152064, 0x372d5d4e
-0,         36,         36,        1,   152064, 0x31522664
-0,         37,         37,        1,   152064, 0x3f13f335
+0,         33,         33,        1,   152064, 0xdb08593e
+0,         34,         34,        1,   152064, 0x372d5d4e
+0,         35,         35,        1,   152064, 0x31522664
+0,         36,         36,        1,   152064, 0x3f13f335
 0,         37,         37,        1,   152064, 0xfd10c19a
-0,         39,         39,        1,   152064, 0xef728975
-0,         40,         40,        1,   152064, 0x8e79234d
-0,         41,         41,        1,   152064, 0x47022791
+0,         38,         38,        1,   152064, 0xef728975
+0,         39,         39,        1,   152064, 0x8e79234d
+0,         40,         40,        1,   152064, 0x47022791
 0,         41,         41,        1,   152064, 0x1ef9d297
 0,         42,         42,        1,   152064, 0x77bf9738
 0,         43,         43,        1,   152064, 0xd6bc8f03
-0,         45,         45,        1,   152064, 0x283ded4a
-0,         46,         46,        1,   152064, 0xd87098d1
+0,         44,         44,        1,   152064, 0x283ded4a
+0,         45,         45,        1,   152064, 0xd87098d1
 0,         46,         46,        1,   152064, 0x300077a2
 0,         47,         47,        1,   152064, 0x30ffbea4
-0,         49,         49,        1,   152064, 0x5dc5356b
+0,         48,         48,        1,   152064, 0x5dc5356b
 0,         49,         49,        1,   152064, 0x31cce185
 0,         50,         50,        1,   152064, 0x47fc9148
-0,         52,         52,        1,   152064, 0x1641491e
+0,         51,         51,        1,   152064, 0x1641491e
 0,         52,         52,        1,   152064, 0x2184937d
-0,         54,         54,        1,   152064, 0x126eb74a
+0,         53,         53,        1,   152064, 0x126eb74a
 0,         54,         54,        1,   152064, 0x25c07593
 0,         55,         55,        1,   152064, 0xb1294e7e
-0,         57,         57,        1,   152064, 0x8b35f45d
-0,         58,         58,        1,   152064, 0x54765025
+0,         56,         56,        1,   152064, 0x8b35f45d
+0,         57,         57,        1,   152064, 0x54765025
 0,         58,         58,        1,   152064, 0x1d17e901
-0,         60,         60,        1,   152064, 0xaeab358d
-0,         61,         61,        1,   152064, 0xf682c91f
+0,         59,         59,        1,   152064, 0xaeab358d
+0,         60,         60,        1,   152064, 0xf682c91f
 0,         61,         61,        1,   152064, 0x0b4c9b06
 0,         62,         62,        1,   152064, 0x45f326dc
-0,         64,         64,        1,   152064, 0x132eeda3
+0,         63,         63,        1,   152064, 0x132eeda3
 0,         64,         64,        1,   152064, 0x3c9b8e16
 0,         65,         65,        1,   152064, 0x1be133c1
 0,         66,         66,        1,   152064, 0xfa876720
-0,         68,         68,        1,   152064, 0x1666cdb8
+0,         67,         67,        1,   152064, 0x1666cdb8
 0,         68,         68,        1,   152064, 0x362f418f
 0,         69,         69,        1,   152064, 0x926b4a96
 0,         70,         70,        1,   152064, 0xee3da1df
-0,         72,         72,        1,   152064, 0xc11f025d
+0,         71,         71,        1,   152064, 0xc11f025d
 0,         72,         72,        1,   152064, 0x9ba62c19
 0,         73,         73,        1,   152064, 0x0d66194f
 0,         74,         74,        1,   152064, 0x2fd09340
@@ -82,224 +82,224 @@
 0,         76,         76,        1,   152064, 0xa3192ce6
 0,         77,         77,        1,   152064, 0x6bfce0e1
 0,         78,         78,        1,   152064, 0x3b7c5286
-0,         80,         80,        1,   152064, 0xb52f4bf5
-0,         81,         81,        1,   152064, 0x30870027
+0,         79,         79,        1,   152064, 0xb52f4bf5
+0,         80,         80,        1,   152064, 0x30870027
 0,         81,         81,        1,   152064, 0x6f8e71c3
 0,         82,         82,        1,   152064, 0x8d41b09a
 0,         83,         83,        1,   152064, 0xc1ff1d05
 0,         84,         84,        1,   152064, 0xca54125c
 0,         85,         85,        1,   152064, 0x3342d823
-0,         87,         87,        1,   152064, 0xcc4a7542
-0,         88,         88,        1,   152064, 0x21fc9a9d
+0,         86,         86,        1,   152064, 0xcc4a7542
+0,         87,         87,        1,   152064, 0x21fc9a9d
 0,         88,         88,        1,   152064, 0x91587574
 0,         89,         89,        1,   152064, 0x30929cc2
 0,         90,         90,        1,   152064, 0xf07606b7
-0,         92,         92,        1,   152064, 0x0476b876
-0,         93,         93,        1,   152064, 0x213333dc
+0,         91,         91,        1,   152064, 0x0476b876
+0,         92,         92,        1,   152064, 0x213333dc
 0,         93,         93,        1,   152064, 0x87c67597
-0,         95,         95,        1,   152064, 0x05434641
-0,         96,         96,        1,   152064, 0x959eeffc
+0,         94,         94,        1,   152064, 0x05434641
+0,         95,         95,        1,   152064, 0x959eeffc
 0,         96,         96,        1,   152064, 0x92a130b4
-0,         98,         98,        1,   152064, 0x53d0b544
-0,         99,         99,        1,   152064, 0xaf8c233e
-0,        100,        100,        1,   152064, 0xd3d4259a
-0,        101,        101,        1,   152064, 0xa0287753
+0,         97,         97,        1,   152064, 0x53d0b544
+0,         98,         98,        1,   152064, 0xaf8c233e
+0,         99,         99,        1,   152064, 0xd3d4259a
+0,        100,        100,        1,   152064, 0xa0287753
 0,        101,        101,        1,   152064, 0xfa23972a
 0,        102,        102,        1,   152064, 0xacae756d
-0,        104,        104,        1,   152064, 0xd8b58b5c
+0,        103,        103,        1,   152064, 0xd8b58b5c
 0,        104,        104,        1,   152064, 0x7db2c755
-0,        106,        106,        1,   152064, 0x31e7b79a
-0,        107,        107,        1,   152064, 0xd8660d98
+0,        105,        105,        1,   152064, 0x31e7b79a
+0,        106,        106,        1,   152064, 0xd8660d98
 0,        107,        107,        1,   152064, 0xdcf0d10d
 0,        108,        108,        1,   152064, 0x3e6567e6
-0,        110,        110,        1,   152064, 0xec3530fd
+0,        109,        109,        1,   152064, 0xec3530fd
 0,        110,        110,        1,   152064, 0xf686c61a
 0,        111,        111,        1,   152064, 0x6e706804
-0,        113,        113,        1,   152064, 0x5fd4a1a3
-0,        114,        114,        1,   152064, 0xbb3384f7
+0,        112,        112,        1,   152064, 0x5fd4a1a3
+0,        113,        113,        1,   152064, 0xbb3384f7
 0,        114,        114,        1,   152064, 0x8ffb14dd
-0,        116,        116,        1,   152064, 0x01253a73
-0,        117,        117,        1,   152064, 0xf89c15df
+0,        115,        115,        1,   152064, 0x01253a73
+0,        116,        116,        1,   152064, 0xf89c15df
 0,        117,        117,        1,   152064, 0xda2b0b4c
-0,        119,        119,        1,   152064, 0xfc9dfcc1
-0,        120,        120,        1,   152064, 0xfef4f0fa
+0,        118,        118,        1,   152064, 0xfc9dfcc1
+0,        119,        119,        1,   152064, 0xfef4f0fa
 0,        120,        120,        1,   152064, 0x91669bea
-0,        122,        122,        1,   152064, 0x3664a565
+0,        121,        121,        1,   152064, 0x3664a565
 0,        122,        122,        1,   152064, 0x32dd7923
 0,        123,        123,        1,   152064, 0x26825231
 0,        124,        124,        1,   152064, 0x5f81896e
-0,        126,        126,        1,   152064, 0x0c64ca2f
+0,        125,        125,        1,   152064, 0x0c64ca2f
 0,        126,        126,        1,   152064, 0x488bb665
-0,        128,        128,        1,   152064, 0x4d183a0f
+0,        127,        127,        1,   152064, 0x4d183a0f
 0,        128,        128,        1,   152064, 0xed169321
 0,        129,        129,        1,   152064, 0xcec22917
 0,        130,        130,        1,   152064, 0xbe04ea6c
-0,        132,        132,        1,   152064, 0x32b8bf9f
-0,        133,        133,        1,   152064, 0x9c7c2e13
-0,        134,        134,        1,   152064, 0x232e3016
-0,        135,        135,        1,   152064, 0x1b76c08e
-0,        136,        136,        1,   152064, 0x7425d821
+0,        131,        131,        1,   152064, 0x32b8bf9f
+0,        132,        132,        1,   152064, 0x9c7c2e13
+0,        133,        133,        1,   152064, 0x232e3016
+0,        134,        134,        1,   152064, 0x1b76c08e
+0,        135,        135,        1,   152064, 0x7425d821
 0,        136,        136,        1,   152064, 0x0818ff3c
 0,        137,        137,        1,   152064, 0xb4f2c42b
 0,        138,        138,        1,   152064, 0xe029f979
-0,        140,        140,        1,   152064, 0x97c54c2f
-0,        141,        141,        1,   152064, 0xd101c3b5
+0,        139,        139,        1,   152064, 0x97c54c2f
+0,        140,        140,        1,   152064, 0xd101c3b5
 0,        141,        141,        1,   152064, 0x5ed1f5d4
-0,        143,        143,        1,   152064, 0xc28264d1
+0,        142,        142,        1,   152064, 0xc28264d1
 0,        143,        143,        1,   152064, 0xa162dd31
 0,        144,        144,        1,   152064, 0x2ee872ce
-0,        146,        146,        1,   152064, 0x809a8fce
+0,        145,        145,        1,   152064, 0x809a8fce
 0,        146,        146,        1,   152064, 0xcfcc3ef9
-0,        148,        148,        1,   152064, 0xa5be6ce3
+0,        147,        147,        1,   152064, 0xa5be6ce3
 0,        148,        148,        1,   152064, 0xd75930a0
-0,        150,        150,        1,   152064, 0x28acb80f
-0,        151,        151,        1,   152064, 0x223f2152
-0,        152,        152,        1,   152064, 0x0cf070cb
+0,        149,        149,        1,   152064, 0x28acb80f
+0,        150,        150,        1,   152064, 0x223f2152
+0,        151,        151,        1,   152064, 0x0cf070cb
 0,        152,        152,        1,   152064, 0xcc7d011e
-0,        154,        154,        1,   152064, 0xb2c2a63c
+0,        153,        153,        1,   152064, 0xb2c2a63c
 0,        154,        154,        1,   152064, 0x15514caa
-0,        156,        156,        1,   152064, 0x0c6d18ee
+0,        155,        155,        1,   152064, 0x0c6d18ee
 0,        156,        156,        1,   152064, 0x33b4265d
 0,        157,        157,        1,   152064, 0xb4abaaaf
-0,        159,        159,        1,   152064, 0x26a7a856
+0,        158,        158,        1,   152064, 0x26a7a856
 0,        159,        159,        1,   152064, 0xc75249cc
-0,        161,        161,        1,   152064, 0x59ccb0e1
-0,        162,        162,        1,   152064, 0xc613f202
-0,        163,        163,        1,   152064, 0xd1c0e171
+0,        160,        160,        1,   152064, 0x59ccb0e1
+0,        161,        161,        1,   152064, 0xc613f202
+0,        162,        162,        1,   152064, 0xd1c0e171
 0,        163,        163,        1,   152064, 0xa195da2b
 0,        164,        164,        1,   152064, 0xbc7ed475
 0,        165,        165,        1,   152064, 0x99206e2c
-0,        167,        167,        1,   152064, 0x0ef04e03
-0,        168,        168,        1,   152064, 0x68cbc6a1
+0,        166,        166,        1,   152064, 0x0ef04e03
+0,        167,        167,        1,   152064, 0x68cbc6a1
 0,        168,        168,        1,   152064, 0x2a5304b1
 0,        169,        169,        1,   152064, 0xf017978b
 0,        170,        170,        1,   152064, 0x94f5641a
-0,        172,        172,        1,   152064, 0xd681bd8f
+0,        171,        171,        1,   152064, 0xd681bd8f
 0,        172,        172,        1,   152064, 0x16e1e3a3
-0,        174,        174,        1,   152064, 0xe4486c7e
-0,        175,        175,        1,   152064, 0xa1bd394e
+0,        173,        173,        1,   152064, 0xe4486c7e
+0,        174,        174,        1,   152064, 0xa1bd394e
 0,        175,        175,        1,   152064, 0x49ad5959
-0,        177,        177,        1,   152064, 0x82219b70
-0,        178,        178,        1,   152064, 0x64e2abcf
-0,        179,        179,        1,   152064, 0x6d7d05d8
-0,        180,        180,        1,   152064, 0xd9ac2251
+0,        176,        176,        1,   152064, 0x82219b70
+0,        177,        177,        1,   152064, 0x64e2abcf
+0,        178,        178,        1,   152064, 0x6d7d05d8
+0,        179,        179,        1,   152064, 0xd9ac2251
 0,        180,        180,        1,   152064, 0xf477eee5
-0,        182,        182,        1,   152064, 0xb9826a78
+0,        181,        181,        1,   152064, 0xb9826a78
 0,        182,        182,        1,   152064, 0x97828a37
-0,        184,        184,        1,   152064, 0x12099b1f
+0,        183,        183,        1,   152064, 0x12099b1f
 0,        184,        184,        1,   152064, 0x1ec45fa7
-0,        186,        186,        1,   152064, 0xfd5501c9
+0,        185,        185,        1,   152064, 0xfd5501c9
 0,        186,        186,        1,   152064, 0x6a8b26a3
-0,        188,        188,        1,   152064, 0xae58ff40
-0,        189,        189,        1,   152064, 0xc0f47aa1
+0,        187,        187,        1,   152064, 0xae58ff40
+0,        188,        188,        1,   152064, 0xc0f47aa1
 0,        189,        189,        1,   152064, 0x08bfa548
 0,        190,        190,        1,   152064, 0x7f2ff5ef
-0,        192,        192,        1,   152064, 0x5efa94a3
-0,        193,        193,        1,   152064, 0xf786f970
-0,        194,        194,        1,   152064, 0xab6bc712
+0,        191,        191,        1,   152064, 0x5efa94a3
+0,        192,        192,        1,   152064, 0xf786f970
+0,        193,        193,        1,   152064, 0xab6bc712
 0,        194,        194,        1,   152064, 0x25647bee
-0,        196,        196,        1,   152064, 0x54333ad5
-0,        197,        197,        1,   152064, 0xb3a99413
+0,        195,        195,        1,   152064, 0x54333ad5
+0,        196,        196,        1,   152064, 0xb3a99413
 0,        197,        197,        1,   152064, 0xe7a78a0d
-0,        199,        199,        1,   152064, 0xa5054abc
-0,        200,        200,        1,   152064, 0xb94896ea
+0,        198,        198,        1,   152064, 0xa5054abc
+0,        199,        199,        1,   152064, 0xb94896ea
 0,        200,        200,        1,   152064, 0x9f641bca
-0,        202,        202,        1,   152064, 0x7363901c
+0,        201,        201,        1,   152064, 0x7363901c
 0,        202,        202,        1,   152064, 0xd340a000
 0,        203,        203,        1,   152064, 0x0217f413
 0,        204,        204,        1,   152064, 0xbbdba6e6
 0,        205,        205,        1,   152064, 0xabc42617
-0,        207,        207,        1,   152064, 0xa3442925
-0,        208,        208,        1,   152064, 0x7d06c7e9
+0,        206,        206,        1,   152064, 0xa3442925
+0,        207,        207,        1,   152064, 0x7d06c7e9
 0,        208,        208,        1,   152064, 0xa45e32df
 0,        209,        209,        1,   152064, 0xf5ed407f
-0,        211,        211,        1,   152064, 0x5ec235d5
-0,        212,        212,        1,   152064, 0xa5706635
-0,        213,        213,        1,   152064, 0xa44a209b
-0,        214,        214,        1,   152064, 0xf2137e37
-0,        215,        215,        1,   152064, 0x5220508f
+0,        210,        210,        1,   152064, 0x5ec235d5
+0,        211,        211,        1,   152064, 0xa5706635
+0,        212,        212,        1,   152064, 0xa44a209b
+0,        213,        213,        1,   152064, 0xf2137e37
+0,        214,        214,        1,   152064, 0x5220508f
 0,        215,        215,        1,   152064, 0xae6b37da
-0,        217,        217,        1,   152064, 0xdf09b6cd
+0,        216,        216,        1,   152064, 0xdf09b6cd
 0,        217,        217,        1,   152064, 0x2d39e1c0
-0,        219,        219,        1,   152064, 0xc8284a76
-0,        220,        220,        1,   152064, 0x7d7bbe76
+0,        218,        218,        1,   152064, 0xc8284a76
+0,        219,        219,        1,   152064, 0x7d7bbe76
 0,        220,        220,        1,   152064, 0xcfed7416
 0,        221,        221,        1,   152064, 0x81caaedd
 0,        222,        222,        1,   152064, 0x9dcdd771
-0,        224,        224,        1,   152064, 0x46c1331b
-0,        225,        225,        1,   152064, 0xace60efa
+0,        223,        223,        1,   152064, 0x46c1331b
+0,        224,        224,        1,   152064, 0xace60efa
 0,        225,        225,        1,   152064, 0x9e0909f7
-0,        227,        227,        1,   152064, 0x72f5a321
+0,        226,        226,        1,   152064, 0x72f5a321
 0,        227,        227,        1,   152064, 0x68f8cdcc
 0,        228,        228,        1,   152064, 0xcc59fdd9
-0,        230,        230,        1,   152064, 0xc0a700c6
-0,        231,        231,        1,   152064, 0xf4254dcf
+0,        229,        229,        1,   152064, 0xc0a700c6
+0,        230,        230,        1,   152064, 0xf4254dcf
 0,        231,        231,        1,   152064, 0xc59b46d1
-0,        233,        233,        1,   152064, 0x2e5b2524
-0,        234,        234,        1,   152064, 0x46051293
+0,        232,        232,        1,   152064, 0x2e5b2524
+0,        233,        233,        1,   152064, 0x46051293
 0,        234,        234,        1,   152064, 0x3cbcd1cd
 0,        235,        235,        1,   152064, 0x9f308587
-0,        237,        237,        1,   152064, 0x6b91633f
+0,        236,        236,        1,   152064, 0x6b91633f
 0,        237,        237,        1,   152064, 0xb7191012
-0,        239,        239,        1,   152064, 0xd2fd030f
-0,        240,        240,        1,   152064, 0x15a0ae2e
-0,        241,        241,        1,   152064, 0xac3920d0
+0,        238,        238,        1,   152064, 0xd2fd030f
+0,        239,        239,        1,   152064, 0x15a0ae2e
+0,        240,        240,        1,   152064, 0xac3920d0
 0,        241,        241,        1,   152064, 0x0eef80aa
 0,        242,        242,        1,   152064, 0x319008f1
-0,        244,        244,        1,   152064, 0x7734450c
+0,        243,        243,        1,   152064, 0x7734450c
 0,        244,        244,        1,   152064, 0xf112df62
 0,        245,        245,        1,   152064, 0x1dd8ffae
-0,        247,        247,        1,   152064, 0x655ef429
+0,        246,        246,        1,   152064, 0x655ef429
 0,        247,        247,        1,   152064, 0x27026213
-0,        249,        249,        1,   152064, 0x5c14b015
-0,        250,        250,        1,   152064, 0x9512abeb
-0,        251,        251,        1,   152064, 0x961812b2
+0,        248,        248,        1,   152064, 0x5c14b015
+0,        249,        249,        1,   152064, 0x9512abeb
+0,        250,        250,        1,   152064, 0x961812b2
 0,        251,        251,        1,   152064, 0xb8890aea
 0,        252,        252,        1,   152064, 0x4519db9a
 0,        253,        253,        1,   152064, 0xf358034a
-0,        255,        255,        1,   152064, 0x45d9f2ab
+0,        254,        254,        1,   152064, 0x45d9f2ab
 0,        255,        255,        1,   152064, 0xebd47e7d
 0,        256,        256,        1,   152064, 0x15578be9
-0,        258,        258,        1,   152064, 0x1b373b2d
+0,        257,        257,        1,   152064, 0x1b373b2d
 0,        258,        258,        1,   152064, 0xbbe707e5
 0,        259,        259,        1,   152064, 0x5bf62385
-0,        261,        261,        1,   152064, 0x832e6ef5
-0,        262,        262,        1,   152064, 0x761e5968
+0,        260,        260,        1,   152064, 0x832e6ef5
+0,        261,        261,        1,   152064, 0x761e5968
 0,        262,        262,        1,   152064, 0x251f984d
-0,        264,        264,        1,   152064, 0xbda48899
+0,        263,        263,        1,   152064, 0xbda48899
 0,        264,        264,        1,   152064, 0x3fd843b9
-0,        266,        266,        1,   152064, 0x00485425
-0,        267,        267,        1,   152064, 0x4e282b39
-0,        268,        268,        1,   152064, 0x2630a8ea
-0,        269,        269,        1,   152064, 0x5ea5c973
-0,        270,        270,        1,   152064, 0xfc436d21
-0,        271,        271,        1,   152064, 0x69852ef5
-0,        272,        272,        1,   152064, 0x44cb5589
-0,        273,        273,        1,   152064, 0x32f32725
-0,        274,        274,        1,   152064, 0x54d50aca
-0,        275,        275,        1,   152064, 0xe7a639bb
-0,        276,        276,        1,   152064, 0x01be2ad5
-0,        277,        277,        1,   152064, 0x5c63eca4
-0,        278,        278,        1,   152064, 0x94e91116
+0,        265,        265,        1,   152064, 0x00485425
+0,        266,        266,        1,   152064, 0x4e282b39
+0,        267,        267,        1,   152064, 0x2630a8ea
+0,        268,        268,        1,   152064, 0x5ea5c973
+0,        269,        269,        1,   152064, 0xfc436d21
+0,        270,        270,        1,   152064, 0x69852ef5
+0,        271,        271,        1,   152064, 0x44cb5589
+0,        272,        272,        1,   152064, 0x32f32725
+0,        273,        273,        1,   152064, 0x54d50aca
+0,        274,        274,        1,   152064, 0xe7a639bb
+0,        275,        275,        1,   152064, 0x01be2ad5
+0,        276,        276,        1,   152064, 0x5c63eca4
+0,        277,        277,        1,   152064, 0x94e91116
 0,        278,        278,        1,   152064, 0x9a8be637
 0,        279,        279,        1,   152064, 0x165d9a12
-0,        281,        281,        1,   152064, 0x8c25ca0a
-0,        282,        282,        1,   152064, 0x4ee2ed32
-0,        283,        283,        1,   152064, 0x4b2fe0c6
-0,        284,        284,        1,   152064, 0x521e434e
-0,        285,        285,        1,   152064, 0x97679d7e
-0,        286,        286,        1,   152064, 0x886b9506
+0,        280,        280,        1,   152064, 0x8c25ca0a
+0,        281,        281,        1,   152064, 0x4ee2ed32
+0,        282,        282,        1,   152064, 0x4b2fe0c6
+0,        283,        283,        1,   152064, 0x521e434e
+0,        284,        284,        1,   152064, 0x97679d7e
+0,        285,        285,        1,   152064, 0x886b9506
 0,        286,        286,        1,   152064, 0x4283eda8
-0,        288,        288,        1,   152064, 0xef793c49
+0,        287,        287,        1,   152064, 0xef793c49
 0,        288,        288,        1,   152064, 0x68ac2afe
-0,        290,        290,        1,   152064, 0x3d1ab510
+0,        289,        289,        1,   152064, 0x3d1ab510
 0,        290,        290,        1,   152064, 0x98d3ec95
 0,        291,        291,        1,   152064, 0x09f7e512
-0,        293,        293,        1,   152064, 0x801355dd
-0,        294,        294,        1,   152064, 0xf2e87a11
+0,        292,        292,        1,   152064, 0x801355dd
+0,        293,        293,        1,   152064, 0xf2e87a11
 0,        294,        294,        1,   152064, 0x16757601
 0,        295,        295,        1,   152064, 0x3074d74a
-0,        297,        297,        1,   152064, 0xec8c1290
-0,        298,        298,        1,   152064, 0x46fb1877
+0,        296,        296,        1,   152064, 0xec8c1290
+0,        297,        297,        1,   152064, 0x46fb1877
 0,        298,        298,        1,   152064, 0xf0b662c4
 0,        299,        299,        1,   152064, 0xf8683940
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a b/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
index 25551fb0210..0febed6d6f2 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
@@ -3,303 +3,303 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x502ec077
-0,          2,          2,        1,   152064, 0x84807243
-0,          3,          3,        1,   152064, 0xd7474a6e
-0,          4,          4,        1,   152064, 0x793469bb
-0,          5,          5,        1,   152064, 0xb7a0faf7
-0,          6,          6,        1,   152064, 0x1d3d3cba
-0,          7,          7,        1,   152064, 0xb62583de
-0,          8,          8,        1,   152064, 0xc8422fb1
-0,          9,          9,        1,   152064, 0x321dc699
-0,         10,         10,        1,   152064, 0x7a34d350
-0,         11,         11,        1,   152064, 0xaa4c302d
-0,         12,         12,        1,   152064, 0x45fa7ab0
-0,         13,         13,        1,   152064, 0xc7262e41
-0,         14,         14,        1,   152064, 0x3550000c
-0,         15,         15,        1,   152064, 0xf4bab54b
-0,         16,         16,        1,   152064, 0xaccf9c1a
-0,         17,         17,        1,   152064, 0x9bee20e9
-0,         18,         18,        1,   152064, 0x47fb7720
-0,         19,         19,        1,   152064, 0x12c63ffb
-0,         20,         20,        1,   152064, 0xfa2b8b4d
-0,         21,         21,        1,   152064, 0x279964bd
-0,         22,         22,        1,   152064, 0xb8b01c7e
-0,         23,         23,        1,   152064, 0x816fa010
-0,         24,         24,        1,   152064, 0x59fe1c8c
-0,         25,         25,        1,   152064, 0x13393fad
-0,         26,         26,        1,   152064, 0x991a50a4
-0,         27,         27,        1,   152064, 0x57df3eb7
-0,         28,         28,        1,   152064, 0x744371df
-0,         29,         29,        1,   152064, 0xe9f6d3ff
-0,         30,         30,        1,   152064, 0xc506fba0
-0,         31,         31,        1,   152064, 0x6295b90e
-0,         32,         32,        1,   152064, 0xa19cee2d
-0,         33,         33,        1,   152064, 0xf8c1b3ca
-0,         34,         34,        1,   152064, 0x69f68ce0
-0,         35,         35,        1,   152064, 0x80558bb6
-0,         36,         36,        1,   152064, 0x27824fa5
-0,         37,         37,        1,   152064, 0x27c929a1
-0,         38,         38,        1,   152064, 0xc0fe06d1
-0,         39,         39,        1,   152064, 0xc52bc58c
-0,         40,         40,        1,   152064, 0x0a5363c7
-0,         41,         41,        1,   152064, 0xd0f45a0d
-0,         42,         42,        1,   152064, 0x274710f9
-0,         43,         43,        1,   152064, 0x89d2d390
-0,         44,         44,        1,   152064, 0x12a9bfb0
-0,         45,         45,        1,   152064, 0x04501a93
-0,         46,         46,        1,   152064, 0xf92cbbf4
-0,         47,         47,        1,   152064, 0xf6d1b27d
-0,         48,         48,        1,   152064, 0xe3e904c3
-0,         49,         49,        1,   152064, 0x58f8516d
-0,         50,         50,        1,   152064, 0x70370c2b
-0,         51,         51,        1,   152064, 0xfeebc88c
-0,         52,         52,        1,   152064, 0x974c6ed6
-0,         53,         53,        1,   152064, 0x401bdcf2
-0,         54,         54,        1,   152064, 0xfe61e278
-0,         55,         55,        1,   152064, 0x96ba8bb9
-0,         56,         56,        1,   152064, 0x988492fd
-0,         57,         57,        1,   152064, 0xd1d913a9
-0,         58,         58,        1,   152064, 0x6bc46f0e
-0,         59,         59,        1,   152064, 0x695ef706
-0,         60,         60,        1,   152064, 0x142045c9
-0,         61,         61,        1,   152064, 0xb390ed87
-0,         62,         62,        1,   152064, 0xb9e6d2e5
-0,         63,         63,        1,   152064, 0xe348797f
-0,         64,         64,        1,   152064, 0x1cbd29d6
-0,         65,         65,        1,   152064, 0xbd7dd694
-0,         66,         66,        1,   152064, 0x516873c3
-0,         67,         67,        1,   152064, 0x27bba182
-0,         68,         68,        1,   152064, 0x7541f920
-0,         69,         69,        1,   152064, 0xfdf67042
-0,         70,         70,        1,   152064, 0x6c3c7896
-0,         71,         71,        1,   152064, 0xed86c467
-0,         72,         72,        1,   152064, 0x4ea83ca2
-0,         73,         73,        1,   152064, 0xa3e6725b
-0,         74,         74,        1,   152064, 0x917f5f16
-0,         75,         75,        1,   152064, 0x8cf2d2e1
-0,         76,         76,        1,   152064, 0x57a8d116
-0,         77,         77,        1,   152064, 0x0db267d4
-0,         78,         78,        1,   152064, 0xce782ac5
-0,         79,         79,        1,   152064, 0x1c9d8518
-0,         80,         80,        1,   152064, 0x47598ac7
-0,         81,         81,        1,   152064, 0xc5033d97
-0,         82,         82,        1,   152064, 0xd7aaa3a4
-0,         83,         83,        1,   152064, 0x078afc96
-0,         84,         84,        1,   152064, 0xc9fe673d
-0,         85,         85,        1,   152064, 0xe9284066
-0,         86,         86,        1,   152064, 0xbc570982
-0,         87,         87,        1,   152064, 0x0aac8574
-0,         88,         88,        1,   152064, 0x098cbeee
-0,         89,         89,        1,   152064, 0x19c36a9d
-0,         90,         90,        1,   152064, 0x8fe4a893
-0,         91,         91,        1,   152064, 0x0b652f17
-0,         92,         92,        1,   152064, 0x10f2e6bf
-0,         93,         93,        1,   152064, 0x7ce5634e
-0,         94,         94,        1,   152064, 0x8fe4ac6c
-0,         95,         95,        1,   152064, 0xcaba749e
-0,         96,         96,        1,   152064, 0x5f8a0d5c
-0,         97,         97,        1,   152064, 0xcaa66bbc
-0,         98,         98,        1,   152064, 0xc87ae617
-0,         99,         99,        1,   152064, 0xe8ef4dd7
-0,        100,        100,        1,   152064, 0xdfca5a07
-0,        101,        101,        1,   152064, 0x5f7eab7d
-0,        102,        102,        1,   152064, 0x8a65ebbb
-0,        103,        103,        1,   152064, 0x4beab4a0
-0,        104,        104,        1,   152064, 0xb5e6ab30
-0,        105,        105,        1,   152064, 0x8fe4f4d4
-0,        106,        106,        1,   152064, 0x95bde1ca
-0,        107,        107,        1,   152064, 0xcc5e3a53
-0,        108,        108,        1,   152064, 0xf09f1dd7
-0,        109,        109,        1,   152064, 0x10179672
-0,        110,        110,        1,   152064, 0x4ad16184
-0,        111,        111,        1,   152064, 0x9efa0e23
-0,        112,        112,        1,   152064, 0x22f59522
-0,        113,        113,        1,   152064, 0x4d38f09d
-0,        114,        114,        1,   152064, 0x4c5ebf56
-0,        115,        115,        1,   152064, 0xb19d5077
-0,        116,        116,        1,   152064, 0xa98576b9
-0,        117,        117,        1,   152064, 0x65324239
-0,        118,        118,        1,   152064, 0x709e4031
-0,        119,        119,        1,   152064, 0xf8e81681
-0,        120,        120,        1,   152064, 0x058514e5
-0,        121,        121,        1,   152064, 0xd1d1c806
-0,        122,        122,        1,   152064, 0x0e4dde57
-0,        123,        123,        1,   152064, 0x49e9c2bb
-0,        124,        124,        1,   152064, 0x01417ce6
-0,        125,        125,        1,   152064, 0xda7ebbf1
-0,        126,        126,        1,   152064, 0xa22906b7
-0,        127,        127,        1,   152064, 0x32e2df87
-0,        128,        128,        1,   152064, 0x69917c8f
-0,        129,        129,        1,   152064, 0xea8ed2cc
-0,        130,        130,        1,   152064, 0x0b8d57f1
-0,        131,        131,        1,   152064, 0x5f683bcd
-0,        132,        132,        1,   152064, 0x5162fe2f
-0,        133,        133,        1,   152064, 0x49c052f8
-0,        134,        134,        1,   152064, 0x990b69ba
-0,        135,        135,        1,   152064, 0xa6d4f99f
-0,        136,        136,        1,   152064, 0xe79ef4da
-0,        137,        137,        1,   152064, 0x5e8a3847
-0,        138,        138,        1,   152064, 0x38b1e75f
-0,        139,        139,        1,   152064, 0xf5c91bed
-0,        140,        140,        1,   152064, 0xd59a6d26
-0,        141,        141,        1,   152064, 0xc361de06
-0,        142,        142,        1,   152064, 0x63ed2229
-0,        143,        143,        1,   152064, 0xb8229205
-0,        144,        144,        1,   152064, 0x7c6619af
-0,        145,        145,        1,   152064, 0x4126b02f
-0,        146,        146,        1,   152064, 0x9250b99b
-0,        147,        147,        1,   152064, 0x589778f9
-0,        148,        148,        1,   152064, 0xed1fa45b
-0,        149,        149,        1,   152064, 0x700b6f32
-0,        150,        150,        1,   152064, 0x0590df55
-0,        151,        151,        1,   152064, 0x3e9c4018
-0,        152,        152,        1,   152064, 0x957b8860
-0,        153,        153,        1,   152064, 0x56161560
-0,        154,        154,        1,   152064, 0xbc43bc3b
-0,        155,        155,        1,   152064, 0x508d8632
-0,        156,        156,        1,   152064, 0xbc5736d8
-0,        157,        157,        1,   152064, 0xed7d3aef
-0,        158,        158,        1,   152064, 0x1dcdda9f
-0,        159,        159,        1,   152064, 0x8ef6d5c9
-0,        160,        160,        1,   152064, 0x15466acc
-0,        161,        161,        1,   152064, 0x45d4cf67
-0,        162,        162,        1,   152064, 0x8c900b9d
-0,        163,        163,        1,   152064, 0x747006e0
-0,        164,        164,        1,   152064, 0xac920a0c
-0,        165,        165,        1,   152064, 0xb8210c27
-0,        166,        166,        1,   152064, 0x7dbb873a
-0,        167,        167,        1,   152064, 0x0d4d7584
-0,        168,        168,        1,   152064, 0xefb3fe60
-0,        169,        169,        1,   152064, 0x905e2644
-0,        170,        170,        1,   152064, 0x7c04e534
-0,        171,        171,        1,   152064, 0x8889972a
-0,        172,        172,        1,   152064, 0x21c7d8ad
-0,        173,        173,        1,   152064, 0x1c641176
-0,        174,        174,        1,   152064, 0xf71489a4
-0,        175,        175,        1,   152064, 0xd7ac5555
-0,        176,        176,        1,   152064, 0xb4609c6d
-0,        177,        177,        1,   152064, 0xf5b2bd5e
-0,        178,        178,        1,   152064, 0x9f43ce57
-0,        179,        179,        1,   152064, 0x77642dd3
-0,        180,        180,        1,   152064, 0x3e79565c
-0,        181,        181,        1,   152064, 0x95f40b8e
-0,        182,        182,        1,   152064, 0x3c8ca4d4
-0,        183,        183,        1,   152064, 0xa02ac497
-0,        184,        184,        1,   152064, 0x4c93b377
-0,        185,        185,        1,   152064, 0x55f5ac68
-0,        186,        186,        1,   152064, 0xf8652eca
-0,        187,        187,        1,   152064, 0x56e94574
-0,        188,        188,        1,   152064, 0x6d8302e1
-0,        189,        189,        1,   152064, 0x29a57061
-0,        190,        190,        1,   152064, 0x24e4cfdc
-0,        191,        191,        1,   152064, 0xf5a5d62a
-0,        192,        192,        1,   152064, 0x998870c1
-0,        193,        193,        1,   152064, 0xa15b1f4e
-0,        194,        194,        1,   152064, 0xb0ccb51f
-0,        195,        195,        1,   152064, 0xeaaf59ab
-0,        196,        196,        1,   152064, 0x7e2b4fe6
-0,        197,        197,        1,   152064, 0x72299fea
-0,        198,        198,        1,   152064, 0x769da8b2
-0,        199,        199,        1,   152064, 0xefad7ef8
-0,        200,        200,        1,   152064, 0x24819983
-0,        201,        201,        1,   152064, 0x2aad32ab
-0,        202,        202,        1,   152064, 0xc80cac79
-0,        203,        203,        1,   152064, 0x1659d628
-0,        204,        204,        1,   152064, 0xef941f66
-0,        205,        205,        1,   152064, 0x0d7fcdb5
-0,        206,        206,        1,   152064, 0x7c1853fa
-0,        207,        207,        1,   152064, 0xb94c4d3c
-0,        208,        208,        1,   152064, 0xc47adfc2
-0,        209,        209,        1,   152064, 0x366a6729
-0,        210,        210,        1,   152064, 0x7eb37b70
-0,        211,        211,        1,   152064, 0xafd54c27
-0,        212,        212,        1,   152064, 0x67b18636
-0,        213,        213,        1,   152064, 0x93b22dcf
-0,        214,        214,        1,   152064, 0xa64991f1
-0,        215,        215,        1,   152064, 0xd32a7102
-0,        216,        216,        1,   152064, 0xff665d1c
-0,        217,        217,        1,   152064, 0xf107cc31
-0,        218,        218,        1,   152064, 0xf5b25652
-0,        219,        219,        1,   152064, 0x8caf783d
-0,        220,        220,        1,   152064, 0x72f3eb00
-0,        221,        221,        1,   152064, 0xb5aea5f8
-0,        222,        222,        1,   152064, 0xee70e870
-0,        223,        223,        1,   152064, 0x7c3a0156
-0,        224,        224,        1,   152064, 0x871b6383
-0,        225,        225,        1,   152064, 0x48d831ff
-0,        226,        226,        1,   152064, 0xca233913
-0,        227,        227,        1,   152064, 0xe14bc5eb
-0,        228,        228,        1,   152064, 0x9b1d27e7
-0,        229,        229,        1,   152064, 0xfb9637f7
-0,        230,        230,        1,   152064, 0x0c022157
-0,        231,        231,        1,   152064, 0x16d35fc9
-0,        232,        232,        1,   152064, 0x6d935f71
-0,        233,        233,        1,   152064, 0xae4066fa
-0,        234,        234,        1,   152064, 0xcef94fdc
-0,        235,        235,        1,   152064, 0xc234edb9
-0,        236,        236,        1,   152064, 0x26a4f2e2
-0,        237,        237,        1,   152064, 0xd29ac23e
-0,        238,        238,        1,   152064, 0xb7604395
-0,        239,        239,        1,   152064, 0x408084f6
-0,        240,        240,        1,   152064, 0x0a02026c
-0,        241,        241,        1,   152064, 0x78b33c7c
-0,        242,        242,        1,   152064, 0xcb02b874
-0,        243,        243,        1,   152064, 0xf566513b
-0,        244,        244,        1,   152064, 0xb34e52b1
-0,        245,        245,        1,   152064, 0xf55ff493
-0,        246,        246,        1,   152064, 0xb0e8282a
-0,        247,        247,        1,   152064, 0xe9510bbe
-0,        248,        248,        1,   152064, 0x292e8c5a
-0,        249,        249,        1,   152064, 0x62b9d2b0
-0,        250,        250,        1,   152064, 0x3a8cc827
-0,        251,        251,        1,   152064, 0x25cc465e
-0,        252,        252,        1,   152064, 0xf2bc32e2
-0,        253,        253,        1,   152064, 0x6141f914
-0,        254,        254,        1,   152064, 0x1171256f
-0,        255,        255,        1,   152064, 0x13cb2ded
-0,        256,        256,        1,   152064, 0x3d4ca557
-0,        257,        257,        1,   152064, 0xf2b9e72e
-0,        258,        258,        1,   152064, 0x03f7547a
-0,        259,        259,        1,   152064, 0xc7302955
-0,        260,        260,        1,   152064, 0xe78a46d3
-0,        261,        261,        1,   152064, 0x3726a270
-0,        262,        262,        1,   152064, 0x2f65722a
-0,        263,        263,        1,   152064, 0x55acce40
-0,        264,        264,        1,   152064, 0xf6fa9db2
-0,        265,        265,        1,   152064, 0x70a36937
-0,        266,        266,        1,   152064, 0x9313742d
-0,        267,        267,        1,   152064, 0x2eb14e53
-0,        268,        268,        1,   152064, 0x3d47c9c3
-0,        269,        269,        1,   152064, 0xd0a90348
-0,        270,        270,        1,   152064, 0x6ad48088
-0,        271,        271,        1,   152064, 0x68e64738
-0,        272,        272,        1,   152064, 0x04c3735a
-0,        273,        273,        1,   152064, 0x51d0593f
-0,        274,        274,        1,   152064, 0x42cf2b48
-0,        275,        275,        1,   152064, 0xa5496a0c
-0,        276,        276,        1,   152064, 0x84c25549
-0,        277,        277,        1,   152064, 0x96691600
-0,        278,        278,        1,   152064, 0x423135db
-0,        279,        279,        1,   152064, 0x8d2e08b6
-0,        280,        280,        1,   152064, 0xaeb4c840
-0,        281,        281,        1,   152064, 0xf3e71780
-0,        282,        282,        1,   152064, 0x8858228b
-0,        283,        283,        1,   152064, 0xf28613f8
-0,        284,        284,        1,   152064, 0xb5327882
-0,        285,        285,        1,   152064, 0xbb60bb85
-0,        286,        286,        1,   152064, 0x345ab1c9
-0,        287,        287,        1,   152064, 0x8aac2cba
-0,        288,        288,        1,   152064, 0x7ce15b4c
-0,        289,        289,        1,   152064, 0xc09c55c0
-0,        290,        290,        1,   152064, 0x8482ddd6
-0,        291,        291,        1,   152064, 0xab222a13
-0,        292,        292,        1,   152064, 0xd39b0dea
-0,        293,        293,        1,   152064, 0x6dab6e06
-0,        294,        294,        1,   152064, 0xec0891bd
-0,        295,        295,        1,   152064, 0x88bd9701
-0,        296,        296,        1,   152064, 0xdf13072a
-0,        297,        297,        1,   152064, 0x23b33081
-0,        298,        298,        1,   152064, 0x63943137
-0,        299,        299,        1,   152064, 0xab6a9052
-0,        300,        300,        1,   152064, 0x05485494
+0,          0,          0,        1,   152064, 0x502ec077
+0,          1,          1,        1,   152064, 0x84807243
+0,          2,          2,        1,   152064, 0xd7474a6e
+0,          3,          3,        1,   152064, 0x793469bb
+0,          4,          4,        1,   152064, 0xb7a0faf7
+0,          5,          5,        1,   152064, 0x1d3d3cba
+0,          6,          6,        1,   152064, 0xb62583de
+0,          7,          7,        1,   152064, 0xc8422fb1
+0,          8,          8,        1,   152064, 0x321dc699
+0,          9,          9,        1,   152064, 0x7a34d350
+0,         10,         10,        1,   152064, 0xaa4c302d
+0,         11,         11,        1,   152064, 0x45fa7ab0
+0,         12,         12,        1,   152064, 0xc7262e41
+0,         13,         13,        1,   152064, 0x3550000c
+0,         14,         14,        1,   152064, 0xf4bab54b
+0,         15,         15,        1,   152064, 0xaccf9c1a
+0,         16,         16,        1,   152064, 0x9bee20e9
+0,         17,         17,        1,   152064, 0x47fb7720
+0,         18,         18,        1,   152064, 0x12c63ffb
+0,         19,         19,        1,   152064, 0xfa2b8b4d
+0,         20,         20,        1,   152064, 0x279964bd
+0,         21,         21,        1,   152064, 0xb8b01c7e
+0,         22,         22,        1,   152064, 0x816fa010
+0,         23,         23,        1,   152064, 0x59fe1c8c
+0,         24,         24,        1,   152064, 0x13393fad
+0,         25,         25,        1,   152064, 0x991a50a4
+0,         26,         26,        1,   152064, 0x57df3eb7
+0,         27,         27,        1,   152064, 0x744371df
+0,         28,         28,        1,   152064, 0xe9f6d3ff
+0,         29,         29,        1,   152064, 0xc506fba0
+0,         30,         30,        1,   152064, 0x6295b90e
+0,         31,         31,        1,   152064, 0xa19cee2d
+0,         32,         32,        1,   152064, 0xf8c1b3ca
+0,         33,         33,        1,   152064, 0x69f68ce0
+0,         34,         34,        1,   152064, 0x80558bb6
+0,         35,         35,        1,   152064, 0x27824fa5
+0,         36,         36,        1,   152064, 0x27c929a1
+0,         37,         37,        1,   152064, 0xc0fe06d1
+0,         38,         38,        1,   152064, 0xc52bc58c
+0,         39,         39,        1,   152064, 0x0a5363c7
+0,         40,         40,        1,   152064, 0xd0f45a0d
+0,         41,         41,        1,   152064, 0x274710f9
+0,         42,         42,        1,   152064, 0x89d2d390
+0,         43,         43,        1,   152064, 0x12a9bfb0
+0,         44,         44,        1,   152064, 0x04501a93
+0,         45,         45,        1,   152064, 0xf92cbbf4
+0,         46,         46,        1,   152064, 0xf6d1b27d
+0,         47,         47,        1,   152064, 0xe3e904c3
+0,         48,         48,        1,   152064, 0x58f8516d
+0,         49,         49,        1,   152064, 0x70370c2b
+0,         50,         50,        1,   152064, 0xfeebc88c
+0,         51,         51,        1,   152064, 0x974c6ed6
+0,         52,         52,        1,   152064, 0x401bdcf2
+0,         53,         53,        1,   152064, 0xfe61e278
+0,         54,         54,        1,   152064, 0x96ba8bb9
+0,         55,         55,        1,   152064, 0x988492fd
+0,         56,         56,        1,   152064, 0xd1d913a9
+0,         57,         57,        1,   152064, 0x6bc46f0e
+0,         58,         58,        1,   152064, 0x695ef706
+0,         59,         59,        1,   152064, 0x142045c9
+0,         60,         60,        1,   152064, 0xb390ed87
+0,         61,         61,        1,   152064, 0xb9e6d2e5
+0,         62,         62,        1,   152064, 0xe348797f
+0,         63,         63,        1,   152064, 0x1cbd29d6
+0,         64,         64,        1,   152064, 0xbd7dd694
+0,         65,         65,        1,   152064, 0x516873c3
+0,         66,         66,        1,   152064, 0x27bba182
+0,         67,         67,        1,   152064, 0x7541f920
+0,         68,         68,        1,   152064, 0xfdf67042
+0,         69,         69,        1,   152064, 0x6c3c7896
+0,         70,         70,        1,   152064, 0xed86c467
+0,         71,         71,        1,   152064, 0x4ea83ca2
+0,         72,         72,        1,   152064, 0xa3e6725b
+0,         73,         73,        1,   152064, 0x917f5f16
+0,         74,         74,        1,   152064, 0x8cf2d2e1
+0,         75,         75,        1,   152064, 0x57a8d116
+0,         76,         76,        1,   152064, 0x0db267d4
+0,         77,         77,        1,   152064, 0xce782ac5
+0,         78,         78,        1,   152064, 0x1c9d8518
+0,         79,         79,        1,   152064, 0x47598ac7
+0,         80,         80,        1,   152064, 0xc5033d97
+0,         81,         81,        1,   152064, 0xd7aaa3a4
+0,         82,         82,        1,   152064, 0x078afc96
+0,         83,         83,        1,   152064, 0xc9fe673d
+0,         84,         84,        1,   152064, 0xe9284066
+0,         85,         85,        1,   152064, 0xbc570982
+0,         86,         86,        1,   152064, 0x0aac8574
+0,         87,         87,        1,   152064, 0x098cbeee
+0,         88,         88,        1,   152064, 0x19c36a9d
+0,         89,         89,        1,   152064, 0x8fe4a893
+0,         90,         90,        1,   152064, 0x0b652f17
+0,         91,         91,        1,   152064, 0x10f2e6bf
+0,         92,         92,        1,   152064, 0x7ce5634e
+0,         93,         93,        1,   152064, 0x8fe4ac6c
+0,         94,         94,        1,   152064, 0xcaba749e
+0,         95,         95,        1,   152064, 0x5f8a0d5c
+0,         96,         96,        1,   152064, 0xcaa66bbc
+0,         97,         97,        1,   152064, 0xc87ae617
+0,         98,         98,        1,   152064, 0xe8ef4dd7
+0,         99,         99,        1,   152064, 0xdfca5a07
+0,        100,        100,        1,   152064, 0x5f7eab7d
+0,        101,        101,        1,   152064, 0x8a65ebbb
+0,        102,        102,        1,   152064, 0x4beab4a0
+0,        103,        103,        1,   152064, 0xb5e6ab30
+0,        104,        104,        1,   152064, 0x8fe4f4d4
+0,        105,        105,        1,   152064, 0x95bde1ca
+0,        106,        106,        1,   152064, 0xcc5e3a53
+0,        107,        107,        1,   152064, 0xf09f1dd7
+0,        108,        108,        1,   152064, 0x10179672
+0,        109,        109,        1,   152064, 0x4ad16184
+0,        110,        110,        1,   152064, 0x9efa0e23
+0,        111,        111,        1,   152064, 0x22f59522
+0,        112,        112,        1,   152064, 0x4d38f09d
+0,        113,        113,        1,   152064, 0x4c5ebf56
+0,        114,        114,        1,   152064, 0xb19d5077
+0,        115,        115,        1,   152064, 0xa98576b9
+0,        116,        116,        1,   152064, 0x65324239
+0,        117,        117,        1,   152064, 0x709e4031
+0,        118,        118,        1,   152064, 0xf8e81681
+0,        119,        119,        1,   152064, 0x058514e5
+0,        120,        120,        1,   152064, 0xd1d1c806
+0,        121,        121,        1,   152064, 0x0e4dde57
+0,        122,        122,        1,   152064, 0x49e9c2bb
+0,        123,        123,        1,   152064, 0x01417ce6
+0,        124,        124,        1,   152064, 0xda7ebbf1
+0,        125,        125,        1,   152064, 0xa22906b7
+0,        126,        126,        1,   152064, 0x32e2df87
+0,        127,        127,        1,   152064, 0x69917c8f
+0,        128,        128,        1,   152064, 0xea8ed2cc
+0,        129,        129,        1,   152064, 0x0b8d57f1
+0,        130,        130,        1,   152064, 0x5f683bcd
+0,        131,        131,        1,   152064, 0x5162fe2f
+0,        132,        132,        1,   152064, 0x49c052f8
+0,        133,        133,        1,   152064, 0x990b69ba
+0,        134,        134,        1,   152064, 0xa6d4f99f
+0,        135,        135,        1,   152064, 0xe79ef4da
+0,        136,        136,        1,   152064, 0x5e8a3847
+0,        137,        137,        1,   152064, 0x38b1e75f
+0,        138,        138,        1,   152064, 0xf5c91bed
+0,        139,        139,        1,   152064, 0xd59a6d26
+0,        140,        140,        1,   152064, 0xc361de06
+0,        141,        141,        1,   152064, 0x63ed2229
+0,        142,        142,        1,   152064, 0xb8229205
+0,        143,        143,        1,   152064, 0x7c6619af
+0,        144,        144,        1,   152064, 0x4126b02f
+0,        145,        145,        1,   152064, 0x9250b99b
+0,        146,        146,        1,   152064, 0x589778f9
+0,        147,        147,        1,   152064, 0xed1fa45b
+0,        148,        148,        1,   152064, 0x700b6f32
+0,        149,        149,        1,   152064, 0x0590df55
+0,        150,        150,        1,   152064, 0x3e9c4018
+0,        151,        151,        1,   152064, 0x957b8860
+0,        152,        152,        1,   152064, 0x56161560
+0,        153,        153,        1,   152064, 0xbc43bc3b
+0,        154,        154,        1,   152064, 0x508d8632
+0,        155,        155,        1,   152064, 0xbc5736d8
+0,        156,        156,        1,   152064, 0xed7d3aef
+0,        157,        157,        1,   152064, 0x1dcdda9f
+0,        158,        158,        1,   152064, 0x8ef6d5c9
+0,        159,        159,        1,   152064, 0x15466acc
+0,        160,        160,        1,   152064, 0x45d4cf67
+0,        161,        161,        1,   152064, 0x8c900b9d
+0,        162,        162,        1,   152064, 0x747006e0
+0,        163,        163,        1,   152064, 0xac920a0c
+0,        164,        164,        1,   152064, 0xb8210c27
+0,        165,        165,        1,   152064, 0x7dbb873a
+0,        166,        166,        1,   152064, 0x0d4d7584
+0,        167,        167,        1,   152064, 0xefb3fe60
+0,        168,        168,        1,   152064, 0x905e2644
+0,        169,        169,        1,   152064, 0x7c04e534
+0,        170,        170,        1,   152064, 0x8889972a
+0,        171,        171,        1,   152064, 0x21c7d8ad
+0,        172,        172,        1,   152064, 0x1c641176
+0,        173,        173,        1,   152064, 0xf71489a4
+0,        174,        174,        1,   152064, 0xd7ac5555
+0,        175,        175,        1,   152064, 0xb4609c6d
+0,        176,        176,        1,   152064, 0xf5b2bd5e
+0,        177,        177,        1,   152064, 0x9f43ce57
+0,        178,        178,        1,   152064, 0x77642dd3
+0,        179,        179,        1,   152064, 0x3e79565c
+0,        180,        180,        1,   152064, 0x95f40b8e
+0,        181,        181,        1,   152064, 0x3c8ca4d4
+0,        182,        182,        1,   152064, 0xa02ac497
+0,        183,        183,        1,   152064, 0x4c93b377
+0,        184,        184,        1,   152064, 0x55f5ac68
+0,        185,        185,        1,   152064, 0xf8652eca
+0,        186,        186,        1,   152064, 0x56e94574
+0,        187,        187,        1,   152064, 0x6d8302e1
+0,        188,        188,        1,   152064, 0x29a57061
+0,        189,        189,        1,   152064, 0x24e4cfdc
+0,        190,        190,        1,   152064, 0xf5a5d62a
+0,        191,        191,        1,   152064, 0x998870c1
+0,        192,        192,        1,   152064, 0xa15b1f4e
+0,        193,        193,        1,   152064, 0xb0ccb51f
+0,        194,        194,        1,   152064, 0xeaaf59ab
+0,        195,        195,        1,   152064, 0x7e2b4fe6
+0,        196,        196,        1,   152064, 0x72299fea
+0,        197,        197,        1,   152064, 0x769da8b2
+0,        198,        198,        1,   152064, 0xefad7ef8
+0,        199,        199,        1,   152064, 0x24819983
+0,        200,        200,        1,   152064, 0x2aad32ab
+0,        201,        201,        1,   152064, 0xc80cac79
+0,        202,        202,        1,   152064, 0x1659d628
+0,        203,        203,        1,   152064, 0xef941f66
+0,        204,        204,        1,   152064, 0x0d7fcdb5
+0,        205,        205,        1,   152064, 0x7c1853fa
+0,        206,        206,        1,   152064, 0xb94c4d3c
+0,        207,        207,        1,   152064, 0xc47adfc2
+0,        208,        208,        1,   152064, 0x366a6729
+0,        209,        209,        1,   152064, 0x7eb37b70
+0,        210,        210,        1,   152064, 0xafd54c27
+0,        211,        211,        1,   152064, 0x67b18636
+0,        212,        212,        1,   152064, 0x93b22dcf
+0,        213,        213,        1,   152064, 0xa64991f1
+0,        214,        214,        1,   152064, 0xd32a7102
+0,        215,        215,        1,   152064, 0xff665d1c
+0,        216,        216,        1,   152064, 0xf107cc31
+0,        217,        217,        1,   152064, 0xf5b25652
+0,        218,        218,        1,   152064, 0x8caf783d
+0,        219,        219,        1,   152064, 0x72f3eb00
+0,        220,        220,        1,   152064, 0xb5aea5f8
+0,        221,        221,        1,   152064, 0xee70e870
+0,        222,        222,        1,   152064, 0x7c3a0156
+0,        223,        223,        1,   152064, 0x871b6383
+0,        224,        224,        1,   152064, 0x48d831ff
+0,        225,        225,        1,   152064, 0xca233913
+0,        226,        226,        1,   152064, 0xe14bc5eb
+0,        227,        227,        1,   152064, 0x9b1d27e7
+0,        228,        228,        1,   152064, 0xfb9637f7
+0,        229,        229,        1,   152064, 0x0c022157
+0,        230,        230,        1,   152064, 0x16d35fc9
+0,        231,        231,        1,   152064, 0x6d935f71
+0,        232,        232,        1,   152064, 0xae4066fa
+0,        233,        233,        1,   152064, 0xcef94fdc
+0,        234,        234,        1,   152064, 0xc234edb9
+0,        235,        235,        1,   152064, 0x26a4f2e2
+0,        236,        236,        1,   152064, 0xd29ac23e
+0,        237,        237,        1,   152064, 0xb7604395
+0,        238,        238,        1,   152064, 0x408084f6
+0,        239,        239,        1,   152064, 0x0a02026c
+0,        240,        240,        1,   152064, 0x78b33c7c
+0,        241,        241,        1,   152064, 0xcb02b874
+0,        242,        242,        1,   152064, 0xf566513b
+0,        243,        243,        1,   152064, 0xb34e52b1
+0,        244,        244,        1,   152064, 0xf55ff493
+0,        245,        245,        1,   152064, 0xb0e8282a
+0,        246,        246,        1,   152064, 0xe9510bbe
+0,        247,        247,        1,   152064, 0x292e8c5a
+0,        248,        248,        1,   152064, 0x62b9d2b0
+0,        249,        249,        1,   152064, 0x3a8cc827
+0,        250,        250,        1,   152064, 0x25cc465e
+0,        251,        251,        1,   152064, 0xf2bc32e2
+0,        252,        252,        1,   152064, 0x6141f914
+0,        253,        253,        1,   152064, 0x1171256f
+0,        254,        254,        1,   152064, 0x13cb2ded
+0,        255,        255,        1,   152064, 0x3d4ca557
+0,        256,        256,        1,   152064, 0xf2b9e72e
+0,        257,        257,        1,   152064, 0x03f7547a
+0,        258,        258,        1,   152064, 0xc7302955
+0,        259,        259,        1,   152064, 0xe78a46d3
+0,        260,        260,        1,   152064, 0x3726a270
+0,        261,        261,        1,   152064, 0x2f65722a
+0,        262,        262,        1,   152064, 0x55acce40
+0,        263,        263,        1,   152064, 0xf6fa9db2
+0,        264,        264,        1,   152064, 0x70a36937
+0,        265,        265,        1,   152064, 0x9313742d
+0,        266,        266,        1,   152064, 0x2eb14e53
+0,        267,        267,        1,   152064, 0x3d47c9c3
+0,        268,        268,        1,   152064, 0xd0a90348
+0,        269,        269,        1,   152064, 0x6ad48088
+0,        270,        270,        1,   152064, 0x68e64738
+0,        271,        271,        1,   152064, 0x04c3735a
+0,        272,        272,        1,   152064, 0x51d0593f
+0,        273,        273,        1,   152064, 0x42cf2b48
+0,        274,        274,        1,   152064, 0xa5496a0c
+0,        275,        275,        1,   152064, 0x84c25549
+0,        276,        276,        1,   152064, 0x96691600
+0,        277,        277,        1,   152064, 0x423135db
+0,        278,        278,        1,   152064, 0x8d2e08b6
+0,        279,        279,        1,   152064, 0xaeb4c840
+0,        280,        280,        1,   152064, 0xf3e71780
+0,        281,        281,        1,   152064, 0x8858228b
+0,        282,        282,        1,   152064, 0xf28613f8
+0,        283,        283,        1,   152064, 0xb5327882
+0,        284,        284,        1,   152064, 0xbb60bb85
+0,        285,        285,        1,   152064, 0x345ab1c9
+0,        286,        286,        1,   152064, 0x8aac2cba
+0,        287,        287,        1,   152064, 0x7ce15b4c
+0,        288,        288,        1,   152064, 0xc09c55c0
+0,        289,        289,        1,   152064, 0x8482ddd6
+0,        290,        290,        1,   152064, 0xab222a13
+0,        291,        291,        1,   152064, 0xd39b0dea
+0,        292,        292,        1,   152064, 0x6dab6e06
+0,        293,        293,        1,   152064, 0xec0891bd
+0,        294,        294,        1,   152064, 0x88bd9701
+0,        295,        295,        1,   152064, 0xdf13072a
+0,        296,        296,        1,   152064, 0x23b33081
+0,        297,        297,        1,   152064, 0x63943137
+0,        298,        298,        1,   152064, 0xab6a9052
+0,        299,        299,        1,   152064, 0x05485494
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a b/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
index d6c41dd6430..9958f1616f4 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
@@ -3,303 +3,303 @@
 #codec_id 0: rawvideo
 #dimensions 0: 352x288
 #sar 0: 0/1
-0,          1,          1,        1,   152064, 0x3e39c08b
-0,          2,          2,        1,   152064, 0xabc67990
-0,          3,          3,        1,   152064, 0x19614e74
-0,          4,          4,        1,   152064, 0xa3776beb
-0,          5,          5,        1,   152064, 0xcce6ffdf
-0,          6,          6,        1,   152064, 0xb0e94746
-0,          7,          7,        1,   152064, 0xdb1a84ef
-0,          8,          8,        1,   152064, 0xb2624509
-0,          9,          9,        1,   152064, 0x32e2d826
-0,         10,         10,        1,   152064, 0xb3bddf0b
-0,         11,         11,        1,   152064, 0x2e273ce3
-0,         12,         12,        1,   152064, 0x67af7e4d
-0,         13,         13,        1,   152064, 0x505c3261
-0,         14,         14,        1,   152064, 0xa43d015e
-0,         15,         15,        1,   152064, 0xad41c1f6
-0,         16,         16,        1,   152064, 0x633ba55f
-0,         17,         17,        1,   152064, 0xe80634f0
-0,         18,         18,        1,   152064, 0x80a07dc9
-0,         19,         19,        1,   152064, 0x0e7a3bbf
-0,         20,         20,        1,   152064, 0xcb099196
-0,         21,         21,        1,   152064, 0x57c96db5
-0,         22,         22,        1,   152064, 0xccd422fa
-0,         23,         23,        1,   152064, 0x0850b7a7
-0,         24,         24,        1,   152064, 0x30e33156
-0,         25,         25,        1,   152064, 0x34e13f9a
-0,         26,         26,        1,   152064, 0x03d36000
-0,         27,         27,        1,   152064, 0xbf7d49da
-0,         28,         28,        1,   152064, 0x77336d09
-0,         29,         29,        1,   152064, 0xca8be5a9
-0,         30,         30,        1,   152064, 0xe57c0b08
-0,         31,         31,        1,   152064, 0xbe77c093
-0,         32,         32,        1,   152064, 0x6bf1ff05
-0,         33,         33,        1,   152064, 0x9142babf
-0,         34,         34,        1,   152064, 0x08db8e67
-0,         35,         35,        1,   152064, 0x69ac8cb6
-0,         36,         36,        1,   152064, 0xaa3b5c88
-0,         37,         37,        1,   152064, 0x9bd32638
-0,         38,         38,        1,   152064, 0x7972115a
-0,         39,         39,        1,   152064, 0x5c1dd47b
-0,         40,         40,        1,   152064, 0x8a196e02
-0,         41,         41,        1,   152064, 0xa89672bc
-0,         42,         42,        1,   152064, 0x27b220e4
-0,         43,         43,        1,   152064, 0xfa38dc4a
-0,         44,         44,        1,   152064, 0x4784c639
-0,         45,         45,        1,   152064, 0xa5e4229a
-0,         46,         46,        1,   152064, 0xa986bdfc
-0,         47,         47,        1,   152064, 0x2951b47b
-0,         48,         48,        1,   152064, 0x4df404a6
-0,         49,         49,        1,   152064, 0xc75155e8
-0,         50,         50,        1,   152064, 0xfc05248c
-0,         51,         51,        1,   152064, 0x5d53da10
-0,         52,         52,        1,   152064, 0x284376ec
-0,         53,         53,        1,   152064, 0x19fce380
-0,         54,         54,        1,   152064, 0x876be6c9
-0,         55,         55,        1,   152064, 0x39eb8ff9
-0,         56,         56,        1,   152064, 0x289c9543
-0,         57,         57,        1,   152064, 0x24dd2356
-0,         58,         58,        1,   152064, 0x1dc17d3c
-0,         59,         59,        1,   152064, 0xd17c00ac
-0,         60,         60,        1,   152064, 0xc2ad54de
-0,         61,         61,        1,   152064, 0xbe11ee2f
-0,         62,         62,        1,   152064, 0x3db9dc89
-0,         63,         63,        1,   152064, 0xac0d7bc2
-0,         64,         64,        1,   152064, 0x8dab2dde
-0,         65,         65,        1,   152064, 0x566ad225
-0,         66,         66,        1,   152064, 0x587c7853
-0,         67,         67,        1,   152064, 0x601c9c80
-0,         68,         68,        1,   152064, 0x2afaf751
-0,         69,         69,        1,   152064, 0x1c9f7e3a
-0,         70,         70,        1,   152064, 0x899475bf
-0,         71,         71,        1,   152064, 0x0d65c7d9
-0,         72,         72,        1,   152064, 0xafd63d12
-0,         73,         73,        1,   152064, 0x162e62b9
-0,         74,         74,        1,   152064, 0x5c9554be
-0,         75,         75,        1,   152064, 0x35fbdaa2
-0,         76,         76,        1,   152064, 0x6438cbd8
-0,         77,         77,        1,   152064, 0xde0772c9
-0,         78,         78,        1,   152064, 0x79f82854
-0,         79,         79,        1,   152064, 0x86957840
-0,         80,         80,        1,   152064, 0xd9468cbf
-0,         81,         81,        1,   152064, 0x23e74609
-0,         82,         82,        1,   152064, 0x3919a146
-0,         83,         83,        1,   152064, 0xd641078b
-0,         84,         84,        1,   152064, 0x24397220
-0,         85,         85,        1,   152064, 0xe7fc3a7c
-0,         86,         86,        1,   152064, 0x3997154a
-0,         87,         87,        1,   152064, 0x2af3952c
-0,         88,         88,        1,   152064, 0x274ac07a
-0,         89,         89,        1,   152064, 0x288f7b09
-0,         90,         90,        1,   152064, 0xe6f9b022
-0,         91,         91,        1,   152064, 0xf09e2fbb
-0,         92,         92,        1,   152064, 0x7244e477
-0,         93,         93,        1,   152064, 0x0dfc72eb
-0,         94,         94,        1,   152064, 0x0322b21f
-0,         95,         95,        1,   152064, 0x18b08205
-0,         96,         96,        1,   152064, 0x6606153e
-0,         97,         97,        1,   152064, 0x85186272
-0,         98,         98,        1,   152064, 0x3369f064
-0,         99,         99,        1,   152064, 0xbe0d5a44
-0,        100,        100,        1,   152064, 0x320258bb
-0,        101,        101,        1,   152064, 0x4d6fb091
-0,        102,        102,        1,   152064, 0xc9bbf5e7
-0,        103,        103,        1,   152064, 0x0aa1b69b
-0,        104,        104,        1,   152064, 0x85b9ac11
-0,        105,        105,        1,   152064, 0xb25ff818
-0,        106,        106,        1,   152064, 0xa155dc25
-0,        107,        107,        1,   152064, 0xa8e03bfd
-0,        108,        108,        1,   152064, 0x0a862956
-0,        109,        109,        1,   152064, 0x11b49264
-0,        110,        110,        1,   152064, 0xa94e664e
-0,        111,        111,        1,   152064, 0x330e0fa2
-0,        112,        112,        1,   152064, 0xaf3d9518
-0,        113,        113,        1,   152064, 0x0836f2e8
-0,        114,        114,        1,   152064, 0xbf6dc578
-0,        115,        115,        1,   152064, 0x7b524d20
-0,        116,        116,        1,   152064, 0x9ef7677f
-0,        117,        117,        1,   152064, 0xeacf3f34
-0,        118,        118,        1,   152064, 0xfb4e3dbe
-0,        119,        119,        1,   152064, 0xb46e25cb
-0,        120,        120,        1,   152064, 0x363c1603
-0,        121,        121,        1,   152064, 0x263fc542
-0,        122,        122,        1,   152064, 0xf106e548
-0,        123,        123,        1,   152064, 0xde43c56a
-0,        124,        124,        1,   152064, 0xc2c4770a
-0,        125,        125,        1,   152064, 0x122fce19
-0,        126,        126,        1,   152064, 0x3ba01434
-0,        127,        127,        1,   152064, 0x0e8ce5ee
-0,        128,        128,        1,   152064, 0x6ceb82e1
-0,        129,        129,        1,   152064, 0xa23ee21c
-0,        130,        130,        1,   152064, 0xc6d960f9
-0,        131,        131,        1,   152064, 0x0de15258
-0,        132,        132,        1,   152064, 0x187b0333
-0,        133,        133,        1,   152064, 0x92e6582f
-0,        134,        134,        1,   152064, 0xb9586ce0
-0,        135,        135,        1,   152064, 0xefd803b5
-0,        136,        136,        1,   152064, 0x24eafb29
-0,        137,        137,        1,   152064, 0x20c73b14
-0,        138,        138,        1,   152064, 0xbd7ceaaa
-0,        139,        139,        1,   152064, 0x775216c8
-0,        140,        140,        1,   152064, 0xa08971c7
-0,        141,        141,        1,   152064, 0xef0ee865
-0,        142,        142,        1,   152064, 0x9ac61c2f
-0,        143,        143,        1,   152064, 0x52ae8ea9
-0,        144,        144,        1,   152064, 0x06571c14
-0,        145,        145,        1,   152064, 0x6e78ad33
-0,        146,        146,        1,   152064, 0xad01c627
-0,        147,        147,        1,   152064, 0xbfe074d3
-0,        148,        148,        1,   152064, 0x9357a183
-0,        149,        149,        1,   152064, 0x8de7767f
-0,        150,        150,        1,   152064, 0xa5e6e76e
-0,        151,        151,        1,   152064, 0xa6f646fe
-0,        152,        152,        1,   152064, 0x132e99f8
-0,        153,        153,        1,   152064, 0xb79f27de
-0,        154,        154,        1,   152064, 0x36d3cdcf
-0,        155,        155,        1,   152064, 0xdc938336
-0,        156,        156,        1,   152064, 0xacaa3a7f
-0,        157,        157,        1,   152064, 0xc61a37fd
-0,        158,        158,        1,   152064, 0x4fe1ddf0
-0,        159,        159,        1,   152064, 0xc0f7d660
-0,        160,        160,        1,   152064, 0xd72458ea
-0,        161,        161,        1,   152064, 0x6978d123
-0,        162,        162,        1,   152064, 0x64e60ccf
-0,        163,        163,        1,   152064, 0xaa07004c
-0,        164,        164,        1,   152064, 0x07cd1064
-0,        165,        165,        1,   152064, 0xa82320e5
-0,        166,        166,        1,   152064, 0xaedd8d30
-0,        167,        167,        1,   152064, 0x79b082ea
-0,        168,        168,        1,   152064, 0x9ed800ab
-0,        169,        169,        1,   152064, 0xde592bb4
-0,        170,        170,        1,   152064, 0xd966df88
-0,        171,        171,        1,   152064, 0xf921988a
-0,        172,        172,        1,   152064, 0x557ad9ae
-0,        173,        173,        1,   152064, 0xc3f31a9a
-0,        174,        174,        1,   152064, 0x65248561
-0,        175,        175,        1,   152064, 0x63df4aa6
-0,        176,        176,        1,   152064, 0x618da0a9
-0,        177,        177,        1,   152064, 0xe6f1c435
-0,        178,        178,        1,   152064, 0x9f90c38f
-0,        179,        179,        1,   152064, 0xd2853e14
-0,        180,        180,        1,   152064, 0x6e0268a9
-0,        181,        181,        1,   152064, 0x393712d1
-0,        182,        182,        1,   152064, 0x470da25f
-0,        183,        183,        1,   152064, 0xaf55cb3d
-0,        184,        184,        1,   152064, 0x6935b8b9
-0,        185,        185,        1,   152064, 0x5409a15f
-0,        186,        186,        1,   152064, 0x09073fee
-0,        187,        187,        1,   152064, 0xfb274e82
-0,        188,        188,        1,   152064, 0x1a770581
-0,        189,        189,        1,   152064, 0x17277d0d
-0,        190,        190,        1,   152064, 0xd4dcd982
-0,        191,        191,        1,   152064, 0x6b04eaf3
-0,        192,        192,        1,   152064, 0x8a3d822e
-0,        193,        193,        1,   152064, 0x1b971ec9
-0,        194,        194,        1,   152064, 0x14e0c0f6
-0,        195,        195,        1,   152064, 0x00667450
-0,        196,        196,        1,   152064, 0xd2385902
-0,        197,        197,        1,   152064, 0x905da6ab
-0,        198,        198,        1,   152064, 0xa3ffb18b
-0,        199,        199,        1,   152064, 0x10d48b19
-0,        200,        200,        1,   152064, 0xb2c7a3bd
-0,        201,        201,        1,   152064, 0x45593e96
-0,        202,        202,        1,   152064, 0x47a0b60c
-0,        203,        203,        1,   152064, 0x68c6d1b9
-0,        204,        204,        1,   152064, 0xbc881fcc
-0,        205,        205,        1,   152064, 0x422cc6f2
-0,        206,        206,        1,   152064, 0x9b686410
-0,        207,        207,        1,   152064, 0x35dc5e86
-0,        208,        208,        1,   152064, 0x247bedaa
-0,        209,        209,        1,   152064, 0x22b76fd1
-0,        210,        210,        1,   152064, 0x67cc7a75
-0,        211,        211,        1,   152064, 0xa197521e
-0,        212,        212,        1,   152064, 0x428c8662
-0,        213,        213,        1,   152064, 0x33dc2c73
-0,        214,        214,        1,   152064, 0x5b538903
-0,        215,        215,        1,   152064, 0x3c4176b6
-0,        216,        216,        1,   152064, 0x774364ba
-0,        217,        217,        1,   152064, 0xf237d03e
-0,        218,        218,        1,   152064, 0xac8746fb
-0,        219,        219,        1,   152064, 0x6b306a84
-0,        220,        220,        1,   152064, 0xa2ace513
-0,        221,        221,        1,   152064, 0x709c9be7
-0,        222,        222,        1,   152064, 0x2403f373
-0,        223,        223,        1,   152064, 0x147bf717
-0,        224,        224,        1,   152064, 0xe58964c8
-0,        225,        225,        1,   152064, 0xa0da36fc
-0,        226,        226,        1,   152064, 0x1ac1355c
-0,        227,        227,        1,   152064, 0x8a31c9f2
-0,        228,        228,        1,   152064, 0x42ba205c
-0,        229,        229,        1,   152064, 0xa11b3575
-0,        230,        230,        1,   152064, 0xcb35207c
-0,        231,        231,        1,   152064, 0x528f6189
-0,        232,        232,        1,   152064, 0x34f05bd7
-0,        233,        233,        1,   152064, 0x72317356
-0,        234,        234,        1,   152064, 0xaabd5028
-0,        235,        235,        1,   152064, 0x13dbeb7b
-0,        236,        236,        1,   152064, 0x62f1e8a8
-0,        237,        237,        1,   152064, 0x1723bfcd
-0,        238,        238,        1,   152064, 0x5c083c00
-0,        239,        239,        1,   152064, 0x52137894
-0,        240,        240,        1,   152064, 0xef1e082c
-0,        241,        241,        1,   152064, 0x664b3d53
-0,        242,        242,        1,   152064, 0x2eb9b296
-0,        243,        243,        1,   152064, 0xd0ca511e
-0,        244,        244,        1,   152064, 0x012d4724
-0,        245,        245,        1,   152064, 0xa847f5af
-0,        246,        246,        1,   152064, 0x483a2fde
-0,        247,        247,        1,   152064, 0xd1ab0257
-0,        248,        248,        1,   152064, 0x414692c7
-0,        249,        249,        1,   152064, 0x0b79df88
-0,        250,        250,        1,   152064, 0xdaa2c4a3
-0,        251,        251,        1,   152064, 0xd1b44500
-0,        252,        252,        1,   152064, 0xfd3d2cf3
-0,        253,        253,        1,   152064, 0xfdc0f748
-0,        254,        254,        1,   152064, 0xce762a2a
-0,        255,        255,        1,   152064, 0x08b63572
-0,        256,        256,        1,   152064, 0x5a46a38d
-0,        257,        257,        1,   152064, 0x03cee9c0
-0,        258,        258,        1,   152064, 0x9ee45473
-0,        259,        259,        1,   152064, 0x5a432386
-0,        260,        260,        1,   152064, 0x54c83d87
-0,        261,        261,        1,   152064, 0xc9caa1de
-0,        262,        262,        1,   152064, 0xa28367f1
-0,        263,        263,        1,   152064, 0x2607cdf1
-0,        264,        264,        1,   152064, 0x06baa8de
-0,        265,        265,        1,   152064, 0xf5346e32
-0,        266,        266,        1,   152064, 0x6d3e732b
-0,        267,        267,        1,   152064, 0x798c584b
-0,        268,        268,        1,   152064, 0x4076c948
-0,        269,        269,        1,   152064, 0x868cf63a
-0,        270,        270,        1,   152064, 0x23107ac5
-0,        271,        271,        1,   152064, 0x306f3fe2
-0,        272,        272,        1,   152064, 0xbd1d71d6
-0,        273,        273,        1,   152064, 0x1429545f
-0,        274,        274,        1,   152064, 0xaded29aa
-0,        275,        275,        1,   152064, 0x9b455a94
-0,        276,        276,        1,   152064, 0xb3774ce7
-0,        277,        277,        1,   152064, 0x92580986
-0,        278,        278,        1,   152064, 0x0eae2f95
-0,        279,        279,        1,   152064, 0x599208b2
-0,        280,        280,        1,   152064, 0x4804c04c
-0,        281,        281,        1,   152064, 0x5f730e8f
-0,        282,        282,        1,   152064, 0x3e501d1e
-0,        283,        283,        1,   152064, 0x32100740
-0,        284,        284,        1,   152064, 0x62226ff8
-0,        285,        285,        1,   152064, 0x7683b622
-0,        286,        286,        1,   152064, 0xc3e0aec1
-0,        287,        287,        1,   152064, 0xfac12608
-0,        288,        288,        1,   152064, 0xb21a5781
-0,        289,        289,        1,   152064, 0x8f1e4964
-0,        290,        290,        1,   152064, 0x0f62dd6e
-0,        291,        291,        1,   152064, 0xac062ac4
-0,        292,        292,        1,   152064, 0x1b320f7a
-0,        293,        293,        1,   152064, 0x346e7211
-0,        294,        294,        1,   152064, 0xe47592f3
-0,        295,        295,        1,   152064, 0xa3a7919c
-0,        296,        296,        1,   152064, 0xa3580fa6
-0,        297,        297,        1,   152064, 0xc73430c1
-0,        298,        298,        1,   152064, 0x994a2c18
-0,        299,        299,        1,   152064, 0x0b5d8d45
-0,        300,        300,        1,   152064, 0x9eed5109
+0,          0,          0,        1,   152064, 0x3e39c08b
+0,          1,          1,        1,   152064, 0xabc67990
+0,          2,          2,        1,   152064, 0x19614e74
+0,          3,          3,        1,   152064, 0xa3776beb
+0,          4,          4,        1,   152064, 0xcce6ffdf
+0,          5,          5,        1,   152064, 0xb0e94746
+0,          6,          6,        1,   152064, 0xdb1a84ef
+0,          7,          7,        1,   152064, 0xb2624509
+0,          8,          8,        1,   152064, 0x32e2d826
+0,          9,          9,        1,   152064, 0xb3bddf0b
+0,         10,         10,        1,   152064, 0x2e273ce3
+0,         11,         11,        1,   152064, 0x67af7e4d
+0,         12,         12,        1,   152064, 0x505c3261
+0,         13,         13,        1,   152064, 0xa43d015e
+0,         14,         14,        1,   152064, 0xad41c1f6
+0,         15,         15,        1,   152064, 0x633ba55f
+0,         16,         16,        1,   152064, 0xe80634f0
+0,         17,         17,        1,   152064, 0x80a07dc9
+0,         18,         18,        1,   152064, 0x0e7a3bbf
+0,         19,         19,        1,   152064, 0xcb099196
+0,         20,         20,        1,   152064, 0x57c96db5
+0,         21,         21,        1,   152064, 0xccd422fa
+0,         22,         22,        1,   152064, 0x0850b7a7
+0,         23,         23,        1,   152064, 0x30e33156
+0,         24,         24,        1,   152064, 0x34e13f9a
+0,         25,         25,        1,   152064, 0x03d36000
+0,         26,         26,        1,   152064, 0xbf7d49da
+0,         27,         27,        1,   152064, 0x77336d09
+0,         28,         28,        1,   152064, 0xca8be5a9
+0,         29,         29,        1,   152064, 0xe57c0b08
+0,         30,         30,        1,   152064, 0xbe77c093
+0,         31,         31,        1,   152064, 0x6bf1ff05
+0,         32,         32,        1,   152064, 0x9142babf
+0,         33,         33,        1,   152064, 0x08db8e67
+0,         34,         34,        1,   152064, 0x69ac8cb6
+0,         35,         35,        1,   152064, 0xaa3b5c88
+0,         36,         36,        1,   152064, 0x9bd32638
+0,         37,         37,        1,   152064, 0x7972115a
+0,         38,         38,        1,   152064, 0x5c1dd47b
+0,         39,         39,        1,   152064, 0x8a196e02
+0,         40,         40,        1,   152064, 0xa89672bc
+0,         41,         41,        1,   152064, 0x27b220e4
+0,         42,         42,        1,   152064, 0xfa38dc4a
+0,         43,         43,        1,   152064, 0x4784c639
+0,         44,         44,        1,   152064, 0xa5e4229a
+0,         45,         45,        1,   152064, 0xa986bdfc
+0,         46,         46,        1,   152064, 0x2951b47b
+0,         47,         47,        1,   152064, 0x4df404a6
+0,         48,         48,        1,   152064, 0xc75155e8
+0,         49,         49,        1,   152064, 0xfc05248c
+0,         50,         50,        1,   152064, 0x5d53da10
+0,         51,         51,        1,   152064, 0x284376ec
+0,         52,         52,        1,   152064, 0x19fce380
+0,         53,         53,        1,   152064, 0x876be6c9
+0,         54,         54,        1,   152064, 0x39eb8ff9
+0,         55,         55,        1,   152064, 0x289c9543
+0,         56,         56,        1,   152064, 0x24dd2356
+0,         57,         57,        1,   152064, 0x1dc17d3c
+0,         58,         58,        1,   152064, 0xd17c00ac
+0,         59,         59,        1,   152064, 0xc2ad54de
+0,         60,         60,        1,   152064, 0xbe11ee2f
+0,         61,         61,        1,   152064, 0x3db9dc89
+0,         62,         62,        1,   152064, 0xac0d7bc2
+0,         63,         63,        1,   152064, 0x8dab2dde
+0,         64,         64,        1,   152064, 0x566ad225
+0,         65,         65,        1,   152064, 0x587c7853
+0,         66,         66,        1,   152064, 0x601c9c80
+0,         67,         67,        1,   152064, 0x2afaf751
+0,         68,         68,        1,   152064, 0x1c9f7e3a
+0,         69,         69,        1,   152064, 0x899475bf
+0,         70,         70,        1,   152064, 0x0d65c7d9
+0,         71,         71,        1,   152064, 0xafd63d12
+0,         72,         72,        1,   152064, 0x162e62b9
+0,         73,         73,        1,   152064, 0x5c9554be
+0,         74,         74,        1,   152064, 0x35fbdaa2
+0,         75,         75,        1,   152064, 0x6438cbd8
+0,         76,         76,        1,   152064, 0xde0772c9
+0,         77,         77,        1,   152064, 0x79f82854
+0,         78,         78,        1,   152064, 0x86957840
+0,         79,         79,        1,   152064, 0xd9468cbf
+0,         80,         80,        1,   152064, 0x23e74609
+0,         81,         81,        1,   152064, 0x3919a146
+0,         82,         82,        1,   152064, 0xd641078b
+0,         83,         83,        1,   152064, 0x24397220
+0,         84,         84,        1,   152064, 0xe7fc3a7c
+0,         85,         85,        1,   152064, 0x3997154a
+0,         86,         86,        1,   152064, 0x2af3952c
+0,         87,         87,        1,   152064, 0x274ac07a
+0,         88,         88,        1,   152064, 0x288f7b09
+0,         89,         89,        1,   152064, 0xe6f9b022
+0,         90,         90,        1,   152064, 0xf09e2fbb
+0,         91,         91,        1,   152064, 0x7244e477
+0,         92,         92,        1,   152064, 0x0dfc72eb
+0,         93,         93,        1,   152064, 0x0322b21f
+0,         94,         94,        1,   152064, 0x18b08205
+0,         95,         95,        1,   152064, 0x6606153e
+0,         96,         96,        1,   152064, 0x85186272
+0,         97,         97,        1,   152064, 0x3369f064
+0,         98,         98,        1,   152064, 0xbe0d5a44
+0,         99,         99,        1,   152064, 0x320258bb
+0,        100,        100,        1,   152064, 0x4d6fb091
+0,        101,        101,        1,   152064, 0xc9bbf5e7
+0,        102,        102,        1,   152064, 0x0aa1b69b
+0,        103,        103,        1,   152064, 0x85b9ac11
+0,        104,        104,        1,   152064, 0xb25ff818
+0,        105,        105,        1,   152064, 0xa155dc25
+0,        106,        106,        1,   152064, 0xa8e03bfd
+0,        107,        107,        1,   152064, 0x0a862956
+0,        108,        108,        1,   152064, 0x11b49264
+0,        109,        109,        1,   152064, 0xa94e664e
+0,        110,        110,        1,   152064, 0x330e0fa2
+0,        111,        111,        1,   152064, 0xaf3d9518
+0,        112,        112,        1,   152064, 0x0836f2e8
+0,        113,        113,        1,   152064, 0xbf6dc578
+0,        114,        114,        1,   152064, 0x7b524d20
+0,        115,        115,        1,   152064, 0x9ef7677f
+0,        116,        116,        1,   152064, 0xeacf3f34
+0,        117,        117,        1,   152064, 0xfb4e3dbe
+0,        118,        118,        1,   152064, 0xb46e25cb
+0,        119,        119,        1,   152064, 0x363c1603
+0,        120,        120,        1,   152064, 0x263fc542
+0,        121,        121,        1,   152064, 0xf106e548
+0,        122,        122,        1,   152064, 0xde43c56a
+0,        123,        123,        1,   152064, 0xc2c4770a
+0,        124,        124,        1,   152064, 0x122fce19
+0,        125,        125,        1,   152064, 0x3ba01434
+0,        126,        126,        1,   152064, 0x0e8ce5ee
+0,        127,        127,        1,   152064, 0x6ceb82e1
+0,        128,        128,        1,   152064, 0xa23ee21c
+0,        129,        129,        1,   152064, 0xc6d960f9
+0,        130,        130,        1,   152064, 0x0de15258
+0,        131,        131,        1,   152064, 0x187b0333
+0,        132,        132,        1,   152064, 0x92e6582f
+0,        133,        133,        1,   152064, 0xb9586ce0
+0,        134,        134,        1,   152064, 0xefd803b5
+0,        135,        135,        1,   152064, 0x24eafb29
+0,        136,        136,        1,   152064, 0x20c73b14
+0,        137,        137,        1,   152064, 0xbd7ceaaa
+0,        138,        138,        1,   152064, 0x775216c8
+0,        139,        139,        1,   152064, 0xa08971c7
+0,        140,        140,        1,   152064, 0xef0ee865
+0,        141,        141,        1,   152064, 0x9ac61c2f
+0,        142,        142,        1,   152064, 0x52ae8ea9
+0,        143,        143,        1,   152064, 0x06571c14
+0,        144,        144,        1,   152064, 0x6e78ad33
+0,        145,        145,        1,   152064, 0xad01c627
+0,        146,        146,        1,   152064, 0xbfe074d3
+0,        147,        147,        1,   152064, 0x9357a183
+0,        148,        148,        1,   152064, 0x8de7767f
+0,        149,        149,        1,   152064, 0xa5e6e76e
+0,        150,        150,        1,   152064, 0xa6f646fe
+0,        151,        151,        1,   152064, 0x132e99f8
+0,        152,        152,        1,   152064, 0xb79f27de
+0,        153,        153,        1,   152064, 0x36d3cdcf
+0,        154,        154,        1,   152064, 0xdc938336
+0,        155,        155,        1,   152064, 0xacaa3a7f
+0,        156,        156,        1,   152064, 0xc61a37fd
+0,        157,        157,        1,   152064, 0x4fe1ddf0
+0,        158,        158,        1,   152064, 0xc0f7d660
+0,        159,        159,        1,   152064, 0xd72458ea
+0,        160,        160,        1,   152064, 0x6978d123
+0,        161,        161,        1,   152064, 0x64e60ccf
+0,        162,        162,        1,   152064, 0xaa07004c
+0,        163,        163,        1,   152064, 0x07cd1064
+0,        164,        164,        1,   152064, 0xa82320e5
+0,        165,        165,        1,   152064, 0xaedd8d30
+0,        166,        166,        1,   152064, 0x79b082ea
+0,        167,        167,        1,   152064, 0x9ed800ab
+0,        168,        168,        1,   152064, 0xde592bb4
+0,        169,        169,        1,   152064, 0xd966df88
+0,        170,        170,        1,   152064, 0xf921988a
+0,        171,        171,        1,   152064, 0x557ad9ae
+0,        172,        172,        1,   152064, 0xc3f31a9a
+0,        173,        173,        1,   152064, 0x65248561
+0,        174,        174,        1,   152064, 0x63df4aa6
+0,        175,        175,        1,   152064, 0x618da0a9
+0,        176,        176,        1,   152064, 0xe6f1c435
+0,        177,        177,        1,   152064, 0x9f90c38f
+0,        178,        178,        1,   152064, 0xd2853e14
+0,        179,        179,        1,   152064, 0x6e0268a9
+0,        180,        180,        1,   152064, 0x393712d1
+0,        181,        181,        1,   152064, 0x470da25f
+0,        182,        182,        1,   152064, 0xaf55cb3d
+0,        183,        183,        1,   152064, 0x6935b8b9
+0,        184,        184,        1,   152064, 0x5409a15f
+0,        185,        185,        1,   152064, 0x09073fee
+0,        186,        186,        1,   152064, 0xfb274e82
+0,        187,        187,        1,   152064, 0x1a770581
+0,        188,        188,        1,   152064, 0x17277d0d
+0,        189,        189,        1,   152064, 0xd4dcd982
+0,        190,        190,        1,   152064, 0x6b04eaf3
+0,        191,        191,        1,   152064, 0x8a3d822e
+0,        192,        192,        1,   152064, 0x1b971ec9
+0,        193,        193,        1,   152064, 0x14e0c0f6
+0,        194,        194,        1,   152064, 0x00667450
+0,        195,        195,        1,   152064, 0xd2385902
+0,        196,        196,        1,   152064, 0x905da6ab
+0,        197,        197,        1,   152064, 0xa3ffb18b
+0,        198,        198,        1,   152064, 0x10d48b19
+0,        199,        199,        1,   152064, 0xb2c7a3bd
+0,        200,        200,        1,   152064, 0x45593e96
+0,        201,        201,        1,   152064, 0x47a0b60c
+0,        202,        202,        1,   152064, 0x68c6d1b9
+0,        203,        203,        1,   152064, 0xbc881fcc
+0,        204,        204,        1,   152064, 0x422cc6f2
+0,        205,        205,        1,   152064, 0x9b686410
+0,        206,        206,        1,   152064, 0x35dc5e86
+0,        207,        207,        1,   152064, 0x247bedaa
+0,        208,        208,        1,   152064, 0x22b76fd1
+0,        209,        209,        1,   152064, 0x67cc7a75
+0,        210,        210,        1,   152064, 0xa197521e
+0,        211,        211,        1,   152064, 0x428c8662
+0,        212,        212,        1,   152064, 0x33dc2c73
+0,        213,        213,        1,   152064, 0x5b538903
+0,        214,        214,        1,   152064, 0x3c4176b6
+0,        215,        215,        1,   152064, 0x774364ba
+0,        216,        216,        1,   152064, 0xf237d03e
+0,        217,        217,        1,   152064, 0xac8746fb
+0,        218,        218,        1,   152064, 0x6b306a84
+0,        219,        219,        1,   152064, 0xa2ace513
+0,        220,        220,        1,   152064, 0x709c9be7
+0,        221,        221,        1,   152064, 0x2403f373
+0,        222,        222,        1,   152064, 0x147bf717
+0,        223,        223,        1,   152064, 0xe58964c8
+0,        224,        224,        1,   152064, 0xa0da36fc
+0,        225,        225,        1,   152064, 0x1ac1355c
+0,        226,        226,        1,   152064, 0x8a31c9f2
+0,        227,        227,        1,   152064, 0x42ba205c
+0,        228,        228,        1,   152064, 0xa11b3575
+0,        229,        229,        1,   152064, 0xcb35207c
+0,        230,        230,        1,   152064, 0x528f6189
+0,        231,        231,        1,   152064, 0x34f05bd7
+0,        232,        232,        1,   152064, 0x72317356
+0,        233,        233,        1,   152064, 0xaabd5028
+0,        234,        234,        1,   152064, 0x13dbeb7b
+0,        235,        235,        1,   152064, 0x62f1e8a8
+0,        236,        236,        1,   152064, 0x1723bfcd
+0,        237,        237,        1,   152064, 0x5c083c00
+0,        238,        238,        1,   152064, 0x52137894
+0,        239,        239,        1,   152064, 0xef1e082c
+0,        240,        240,        1,   152064, 0x664b3d53
+0,        241,        241,        1,   152064, 0x2eb9b296
+0,        242,        242,        1,   152064, 0xd0ca511e
+0,        243,        243,        1,   152064, 0x012d4724
+0,        244,        244,        1,   152064, 0xa847f5af
+0,        245,        245,        1,   152064, 0x483a2fde
+0,        246,        246,        1,   152064, 0xd1ab0257
+0,        247,        247,        1,   152064, 0x414692c7
+0,        248,        248,        1,   152064, 0x0b79df88
+0,        249,        249,        1,   152064, 0xdaa2c4a3
+0,        250,        250,        1,   152064, 0xd1b44500
+0,        251,        251,        1,   152064, 0xfd3d2cf3
+0,        252,        252,        1,   152064, 0xfdc0f748
+0,        253,        253,        1,   152064, 0xce762a2a
+0,        254,        254,        1,   152064, 0x08b63572
+0,        255,        255,        1,   152064, 0x5a46a38d
+0,        256,        256,        1,   152064, 0x03cee9c0
+0,        257,        257,        1,   152064, 0x9ee45473
+0,        258,        258,        1,   152064, 0x5a432386
+0,        259,        259,        1,   152064, 0x54c83d87
+0,        260,        260,        1,   152064, 0xc9caa1de
+0,        261,        261,        1,   152064, 0xa28367f1
+0,        262,        262,        1,   152064, 0x2607cdf1
+0,        263,        263,        1,   152064, 0x06baa8de
+0,        264,        264,        1,   152064, 0xf5346e32
+0,        265,        265,        1,   152064, 0x6d3e732b
+0,        266,        266,        1,   152064, 0x798c584b
+0,        267,        267,        1,   152064, 0x4076c948
+0,        268,        268,        1,   152064, 0x868cf63a
+0,        269,        269,        1,   152064, 0x23107ac5
+0,        270,        270,        1,   152064, 0x306f3fe2
+0,        271,        271,        1,   152064, 0xbd1d71d6
+0,        272,        272,        1,   152064, 0x1429545f
+0,        273,        273,        1,   152064, 0xaded29aa
+0,        274,        274,        1,   152064, 0x9b455a94
+0,        275,        275,        1,   152064, 0xb3774ce7
+0,        276,        276,        1,   152064, 0x92580986
+0,        277,        277,        1,   152064, 0x0eae2f95
+0,        278,        278,        1,   152064, 0x599208b2
+0,        279,        279,        1,   152064, 0x4804c04c
+0,        280,        280,        1,   152064, 0x5f730e8f
+0,        281,        281,        1,   152064, 0x3e501d1e
+0,        282,        282,        1,   152064, 0x32100740
+0,        283,        283,        1,   152064, 0x62226ff8
+0,        284,        284,        1,   152064, 0x7683b622
+0,        285,        285,        1,   152064, 0xc3e0aec1
+0,        286,        286,        1,   152064, 0xfac12608
+0,        287,        287,        1,   152064, 0xb21a5781
+0,        288,        288,        1,   152064, 0x8f1e4964
+0,        289,        289,        1,   152064, 0x0f62dd6e
+0,        290,        290,        1,   152064, 0xac062ac4
+0,        291,        291,        1,   152064, 0x1b320f7a
+0,        292,        292,        1,   152064, 0x346e7211
+0,        293,        293,        1,   152064, 0xe47592f3
+0,        294,        294,        1,   152064, 0xa3a7919c
+0,        295,        295,        1,   152064, 0xa3580fa6
+0,        296,        296,        1,   152064, 0xc73430c1
+0,        297,        297,        1,   152064, 0x994a2c18
+0,        298,        298,        1,   152064, 0x0b5d8d45
+0,        299,        299,        1,   152064, 0x9eed5109
diff --git a/tests/ref/fate/h264-conformance-mr3_tandberg_b b/tests/ref/fate/h264-conformance-mr3_tandberg_b
index e86d7218360..b0948448cd4 100644
--- a/tests/ref/fate/h264-conformance-mr3_tandberg_b
+++ b/tests/ref/fate/h264-conformance-mr3_tandberg_b
@@ -12,294 +12,294 @@
 0,          6,          6,        1,    38016, 0x7cc17319
 0,          7,          7,        1,    38016, 0x0f7e8cab
 0,          8,          8,        1,    38016, 0x1876abee
-0,         10,         10,        1,    38016, 0xda748c2f
-0,         11,         11,        1,    38016, 0x7b4dbff0
-0,         12,         12,        1,    38016, 0xd4a1b24a
-0,         13,         13,        1,    38016, 0x714cb4cc
-0,         14,         14,        1,    38016, 0x2c6d80f0
-0,         15,         15,        1,    38016, 0x92266151
-0,         16,         16,        1,    38016, 0x6b766a23
-0,         17,         17,        1,    38016, 0xb24f7efe
-0,         18,         18,        1,    38016, 0x8410838e
-0,         19,         19,        1,    38016, 0x67fe872a
-0,         20,         20,        1,    38016, 0x55b49d36
-0,         21,         21,        1,    38016, 0x7a1c9c41
-0,         22,         22,        1,    38016, 0xb4818e0e
-0,         23,         23,        1,    38016, 0x25f6683c
-0,         24,         24,        1,    38016, 0xe4d141a4
-0,         25,         25,        1,    38016, 0x808216ad
-0,         26,         26,        1,    38016, 0x2acf0baf
-0,         27,         27,        1,    38016, 0xf3de13c4
-0,         28,         28,        1,    38016, 0x5f412187
-0,         29,         29,        1,    38016, 0xb31a340a
-0,         30,         30,        1,    38016, 0x019d42d1
-0,         31,         31,        1,    38016, 0xeeb94b9b
-0,         32,         32,        1,    38016, 0xef55472e
-0,         33,         33,        1,    38016, 0xdb5e3697
-0,         34,         34,        1,    38016, 0x8565303e
-0,         35,         35,        1,    38016, 0x5f9c2c1b
-0,         36,         36,        1,    38016, 0xeb3d27f4
-0,         37,         37,        1,    38016, 0x9a43282d
-0,         38,         38,        1,    38016, 0xe04720c6
-0,         39,         39,        1,    38016, 0x19cc0eba
-0,         40,         40,        1,    38016, 0x218efeb6
-0,         41,         41,        1,    38016, 0x7733f491
-0,         42,         42,        1,    38016, 0x7f3bede9
-0,         43,         43,        1,    38016, 0x49c5ec0d
-0,         44,         44,        1,    38016, 0x803cf19e
-0,         45,         45,        1,    38016, 0x31de0d3f
-0,         46,         46,        1,    38016, 0xa7e30426
-0,         47,         47,        1,    38016, 0xba37f068
-0,         48,         48,        1,    38016, 0x2842bdf8
-0,         49,         49,        1,    38016, 0x76df97dc
-0,         50,         50,        1,    38016, 0xf3246d26
-0,         51,         51,        1,    38016, 0x0a384d72
-0,         52,         52,        1,    38016, 0x40964f41
-0,         53,         53,        1,    38016, 0x46364324
-0,         54,         54,        1,    38016, 0x7cbf3db4
-0,         55,         55,        1,    38016, 0x7a223bec
-0,         56,         56,        1,    38016, 0x458651c1
-0,         57,         57,        1,    38016, 0xb82d7e3c
-0,         58,         58,        1,    38016, 0x0f50a55d
-0,         59,         59,        1,    38016, 0xc306cae4
-0,         60,         60,        1,    38016, 0x9d6ddfcb
-0,         61,         61,        1,    38016, 0xb602e8e9
-0,         62,         62,        1,    38016, 0xbf0ae386
-0,         63,         63,        1,    38016, 0x0a8bd46e
-0,         64,         64,        1,    38016, 0xd437c5c1
-0,         65,         65,        1,    38016, 0xd61d9959
-0,         66,         66,        1,    38016, 0x70639b56
-0,         67,         67,        1,    38016, 0x36fd407b
-0,         68,         68,        1,    38016, 0x58ce3ddd
-0,         69,         69,        1,    38016, 0x86cc1d8c
-0,         70,         70,        1,    38016, 0xee422dc2
-0,         71,         71,        1,    38016, 0xab475639
-0,         72,         72,        1,    38016, 0xc1327ad8
-0,         73,         73,        1,    38016, 0x63d196d4
-0,         74,         74,        1,    38016, 0x1aba8ebd
-0,         75,         75,        1,    38016, 0x74a269ac
-0,         76,         76,        1,    38016, 0x267f3563
-0,         77,         77,        1,    38016, 0xa18ff180
-0,         78,         78,        1,    38016, 0x70c9c9fd
-0,         79,         79,        1,    38016, 0xa6c59f9c
-0,         80,         80,        1,    38016, 0xd7cd8927
-0,         81,         81,        1,    38016, 0xd30b7345
-0,         82,         82,        1,    38016, 0x679a4dda
-0,         83,         83,        1,    38016, 0xeb0562de
-0,         84,         84,        1,    38016, 0xdd7d6cdb
-0,         85,         85,        1,    38016, 0xd6e26b73
-0,         86,         86,        1,    38016, 0xa65a860f
-0,         87,         87,        1,    38016, 0xae95c71e
-0,         88,         88,        1,    38016, 0x1a89ca86
-0,         89,         89,        1,    38016, 0xa33ecee6
-0,         90,         90,        1,    38016, 0x821da6cb
-0,         91,         91,        1,    38016, 0xf0e1612f
-0,         92,         92,        1,    38016, 0x67b8516b
-0,         93,         93,        1,    38016, 0x62f965bc
-0,         94,         94,        1,    38016, 0xd1917aa6
-0,         95,         95,        1,    38016, 0xe72db54d
-0,         96,         96,        1,    38016, 0x9b64e721
-0,         97,         97,        1,    38016, 0xa819efda
-0,         98,         98,        1,    38016, 0xeacfdacb
-0,         99,         99,        1,    38016, 0x52f235e1
-0,        100,        100,        1,    38016, 0x2b512cb8
-0,        101,        101,        1,    38016, 0xaac73fb3
-0,        102,        102,        1,    38016, 0x7d2d504f
-0,        103,        103,        1,    38016, 0x396d503a
-0,        104,        104,        1,    38016, 0x97905235
-0,        105,        105,        1,    38016, 0xf0056693
-0,        106,        106,        1,    38016, 0x728a6a9e
-0,        107,        107,        1,    38016, 0x0eed7824
-0,        108,        108,        1,    38016, 0x59506237
-0,        109,        109,        1,    38016, 0xd4304c93
-0,        110,        110,        1,    38016, 0x7e663ee8
-0,        111,        111,        1,    38016, 0x0ebc2d11
-0,        112,        112,        1,    38016, 0x52db2112
-0,        113,        113,        1,    38016, 0x74aa1815
-0,        114,        114,        1,    38016, 0x57a60dc6
-0,        115,        115,        1,    38016, 0x86e9fa32
-0,        116,        116,        1,    38016, 0x67e8ff09
-0,        117,        117,        1,    38016, 0x26e8f7ea
-0,        118,        118,        1,    38016, 0x183dff56
-0,        119,        119,        1,    38016, 0xa470af8d
-0,        120,        120,        1,    38016, 0xe017d594
-0,        121,        121,        1,    38016, 0xb899d48b
-0,        122,        122,        1,    38016, 0x0d3bc5f7
-0,        123,        123,        1,    38016, 0xd68bbb0d
-0,        124,        124,        1,    38016, 0x8bf5b4cb
-0,        125,        125,        1,    38016, 0x6bfcaa47
-0,        126,        126,        1,    38016, 0x29a9b01b
-0,        127,        127,        1,    38016, 0xcdedbdb7
-0,        128,        128,        1,    38016, 0xdb5ad9c3
-0,        129,        129,        1,    38016, 0x468aeef6
-0,        130,        130,        1,    38016, 0xdc2b143e
-0,        131,        131,        1,    38016, 0x6776277c
-0,        132,        132,        1,    38016, 0xb78d5294
-0,        133,        133,        1,    38016, 0x1dfb63ab
-0,        134,        134,        1,    38016, 0xbd1f99bc
-0,        135,        135,        1,    38016, 0xde16b89a
-0,        136,        136,        1,    38016, 0xbf46edca
-0,        137,        137,        1,    38016, 0x6306e8c4
-0,        138,        138,        1,    38016, 0x7b09d224
-0,        139,        139,        1,    38016, 0xfea1aff6
-0,        140,        140,        1,    38016, 0x183686b0
-0,        141,        141,        1,    38016, 0x665a61ff
-0,        142,        142,        1,    38016, 0xc8af42d1
-0,        143,        143,        1,    38016, 0xe2326bc1
-0,        144,        144,        1,    38016, 0x56dbde82
-0,        145,        145,        1,    38016, 0xa0254f97
-0,        146,        146,        1,    38016, 0x3b74a0b4
-0,        147,        147,        1,    38016, 0x9aee9b7f
-0,        148,        148,        1,    38016, 0xd94b6133
-0,        149,        149,        1,    38016, 0x5819f795
-0,        150,        150,        1,    38016, 0xc45a8c02
-0,        151,        151,        1,    38016, 0x2f9204a0
-0,        152,        152,        1,    38016, 0xbe09e051
-0,        153,        153,        1,    38016, 0xb542badd
-0,        154,        154,        1,    38016, 0x23bd9e00
-0,        155,        155,        1,    38016, 0x4f338d3d
-0,        156,        156,        1,    38016, 0x8c91e8f3
-0,        157,        157,        1,    38016, 0xa7347d57
-0,        158,        158,        1,    38016, 0x6d91de4d
-0,        159,        159,        1,    38016, 0x3443d936
-0,        160,        160,        1,    38016, 0x9d25b4e2
-0,        161,        161,        1,    38016, 0xd93cd4b3
-0,        162,        162,        1,    38016, 0xa1c9e9a0
-0,        163,        163,        1,    38016, 0x1482f220
-0,        164,        164,        1,    38016, 0x1295f270
-0,        165,        165,        1,    38016, 0x399ae9da
-0,        166,        166,        1,    38016, 0x85dcdf28
-0,        167,        167,        1,    38016, 0x4207b9e5
-0,        168,        168,        1,    38016, 0xad1c9d75
-0,        169,        169,        1,    38016, 0x4a266c14
-0,        170,        170,        1,    38016, 0x3afc4508
-0,        171,        171,        1,    38016, 0x2b1b2385
-0,        172,        172,        1,    38016, 0x738f005f
-0,        173,        173,        1,    38016, 0xfec3d833
-0,        174,        174,        1,    38016, 0x3f7f6ae9
-0,        175,        175,        1,    38016, 0xd8551823
-0,        176,        176,        1,    38016, 0x6df03570
-0,        177,        177,        1,    38016, 0x767c3054
-0,        178,        178,        1,    38016, 0x89bd342c
-0,        179,        179,        1,    38016, 0x77ba806c
-0,        180,        180,        1,    38016, 0x1c98005c
-0,        181,        181,        1,    38016, 0xa13ce2a3
-0,        182,        182,        1,    38016, 0x1be59915
-0,        183,        183,        1,    38016, 0x279c6027
-0,        184,        184,        1,    38016, 0x96ac11a2
-0,        185,        185,        1,    38016, 0x3ae95131
-0,        186,        186,        1,    38016, 0xae19f7fe
-0,        187,        187,        1,    38016, 0xcde4efe6
-0,        188,        188,        1,    38016, 0x5ecc3f7a
-0,        189,        189,        1,    38016, 0x79645152
-0,        190,        190,        1,    38016, 0x1ee2e89f
-0,        191,        191,        1,    38016, 0x91d34bb4
-0,        192,        192,        1,    38016, 0xf019d464
-0,        193,        193,        1,    38016, 0x8eb07205
-0,        194,        194,        1,    38016, 0x5399bb5b
-0,        195,        195,        1,    38016, 0x61f0c77a
-0,        196,        196,        1,    38016, 0xb2bd8726
-0,        197,        197,        1,    38016, 0x47b89243
-0,        198,        198,        1,    38016, 0xebfe4d76
-0,        199,        199,        1,    38016, 0xe8f87d91
-0,        200,        200,        1,    38016, 0x5e9fb239
-0,        201,        201,        1,    38016, 0x357ca1f8
-0,        202,        202,        1,    38016, 0x757d2e02
-0,        203,        203,        1,    38016, 0x40672e7c
-0,        204,        204,        1,    38016, 0xd966abca
-0,        205,        205,        1,    38016, 0xe98d0d47
-0,        206,        206,        1,    38016, 0x341babf5
-0,        207,        207,        1,    38016, 0xd12d5a0c
-0,        208,        208,        1,    38016, 0xea2f99ab
-0,        209,        209,        1,    38016, 0x14bce88e
-0,        210,        210,        1,    38016, 0xe4bda9e8
-0,        211,        211,        1,    38016, 0x2c57ec89
-0,        212,        212,        1,    38016, 0x28bbb83e
-0,        213,        213,        1,    38016, 0xf8444b54
-0,        214,        214,        1,    38016, 0x3aba03cd
-0,        215,        215,        1,    38016, 0x373daa20
-0,        216,        216,        1,    38016, 0x69586597
-0,        217,        217,        1,    38016, 0xc0c70d53
-0,        218,        218,        1,    38016, 0x76a5df5a
-0,        219,        219,        1,    38016, 0x1afde8f0
-0,        220,        220,        1,    38016, 0x9638285a
-0,        221,        221,        1,    38016, 0x9f0686c0
-0,        222,        222,        1,    38016, 0xc65b2238
-0,        223,        223,        1,    38016, 0x0d61b610
-0,        224,        224,        1,    38016, 0x78e14e1f
-0,        225,        225,        1,    38016, 0xcf80ac4a
-0,        226,        226,        1,    38016, 0xe094083d
-0,        227,        227,        1,    38016, 0xee5e612e
-0,        228,        228,        1,    38016, 0x51cdad9d
-0,        229,        229,        1,    38016, 0xae41100e
-0,        230,        230,        1,    38016, 0x77558f58
-0,        231,        231,        1,    38016, 0xb9503b95
-0,        232,        232,        1,    38016, 0xb71dffeb
-0,        233,        233,        1,    38016, 0x1872e3e6
-0,        234,        234,        1,    38016, 0x29c3d252
-0,        235,        235,        1,    38016, 0x1c77c6ec
-0,        236,        236,        1,    38016, 0x26feb194
-0,        237,        237,        1,    38016, 0x3307c3c4
-0,        238,        238,        1,    38016, 0x8e5a8080
-0,        239,        239,        1,    38016, 0x933472f7
-0,        240,        240,        1,    38016, 0xd4768d84
-0,        241,        241,        1,    38016, 0x3324485f
-0,        242,        242,        1,    38016, 0xd50af078
-0,        243,        243,        1,    38016, 0x53820752
-0,        244,        244,        1,    38016, 0xbe7f1c47
-0,        245,        245,        1,    38016, 0xe43d3a34
-0,        246,        246,        1,    38016, 0x57194b82
-0,        247,        247,        1,    38016, 0x68a052ed
-0,        248,        248,        1,    38016, 0x5c898052
-0,        249,        249,        1,    38016, 0x7104a6ad
-0,        250,        250,        1,    38016, 0x1676b5e8
-0,        251,        251,        1,    38016, 0xe1cfd375
-0,        252,        252,        1,    38016, 0x16fede04
-0,        253,        253,        1,    38016, 0xca49dd4a
-0,        254,        254,        1,    38016, 0x7b98d9d1
-0,        255,        255,        1,    38016, 0x4020d210
-0,        256,        256,        1,    38016, 0x62c5d1e4
-0,        257,        257,        1,    38016, 0x756abdb4
-0,        258,        258,        1,    38016, 0x558fb00f
-0,        259,        259,        1,    38016, 0x4ab0b1f1
-0,        260,        260,        1,    38016, 0x7c9fb0c2
-0,        261,        261,        1,    38016, 0xcecfbdd0
-0,        262,        262,        1,    38016, 0x70e6d174
-0,        263,        263,        1,    38016, 0x83d7ddde
-0,        264,        264,        1,    38016, 0xbbcde2d9
-0,        265,        265,        1,    38016, 0xc89eeaef
-0,        266,        266,        1,    38016, 0x8565e15c
-0,        267,        267,        1,    38016, 0x28e0db24
-0,        268,        268,        1,    38016, 0x1d9dd334
-0,        269,        269,        1,    38016, 0xce02c452
-0,        270,        270,        1,    38016, 0xe29dbd0c
-0,        271,        271,        1,    38016, 0x4aa3b638
-0,        272,        272,        1,    38016, 0x5533c135
-0,        273,        273,        1,    38016, 0x6c57b65f
-0,        274,        274,        1,    38016, 0x23d3b851
-0,        275,        275,        1,    38016, 0xd8cbb960
-0,        276,        276,        1,    38016, 0x02edb916
-0,        277,        277,        1,    38016, 0xa622bd42
-0,        278,        278,        1,    38016, 0x4ba5be1c
-0,        279,        279,        1,    38016, 0xe69bb625
-0,        280,        280,        1,    38016, 0xbca5b292
-0,        281,        281,        1,    38016, 0xde38b1c8
-0,        282,        282,        1,    38016, 0xe9e3b617
-0,        283,        283,        1,    38016, 0x216cc574
-0,        284,        284,        1,    38016, 0x3780c5ad
-0,        285,        285,        1,    38016, 0x5531e3f9
-0,        286,        286,        1,    38016, 0xe2c5f5d4
-0,        287,        287,        1,    38016, 0x24cefc6e
-0,        288,        288,        1,    38016, 0xa3ce003d
-0,        289,        289,        1,    38016, 0x42d01c9e
-0,        290,        290,        1,    38016, 0xbfc13689
-0,        291,        291,        1,    38016, 0x122647a9
-0,        292,        292,        1,    38016, 0xe45254da
-0,        293,        293,        1,    38016, 0xad955b0c
-0,        294,        294,        1,    38016, 0x4b086abb
-0,        295,        295,        1,    38016, 0xd4857b8c
-0,        296,        296,        1,    38016, 0xa71594ce
-0,        297,        297,        1,    38016, 0x04e4a73d
-0,        298,        298,        1,    38016, 0x295abf63
-0,        299,        299,        1,    38016, 0xbe4ed5dd
-0,        300,        300,        1,    38016, 0x087bcf64
+0,          9,          9,        1,    38016, 0xda748c2f
+0,         10,         10,        1,    38016, 0x7b4dbff0
+0,         11,         11,        1,    38016, 0xd4a1b24a
+0,         12,         12,        1,    38016, 0x714cb4cc
+0,         13,         13,        1,    38016, 0x2c6d80f0
+0,         14,         14,        1,    38016, 0x92266151
+0,         15,         15,        1,    38016, 0x6b766a23
+0,         16,         16,        1,    38016, 0xb24f7efe
+0,         17,         17,        1,    38016, 0x8410838e
+0,         18,         18,        1,    38016, 0x67fe872a
+0,         19,         19,        1,    38016, 0x55b49d36
+0,         20,         20,        1,    38016, 0x7a1c9c41
+0,         21,         21,        1,    38016, 0xb4818e0e
+0,         22,         22,        1,    38016, 0x25f6683c
+0,         23,         23,        1,    38016, 0xe4d141a4
+0,         24,         24,        1,    38016, 0x808216ad
+0,         25,         25,        1,    38016, 0x2acf0baf
+0,         26,         26,        1,    38016, 0xf3de13c4
+0,         27,         27,        1,    38016, 0x5f412187
+0,         28,         28,        1,    38016, 0xb31a340a
+0,         29,         29,        1,    38016, 0x019d42d1
+0,         30,         30,        1,    38016, 0xeeb94b9b
+0,         31,         31,        1,    38016, 0xef55472e
+0,         32,         32,        1,    38016, 0xdb5e3697
+0,         33,         33,        1,    38016, 0x8565303e
+0,         34,         34,        1,    38016, 0x5f9c2c1b
+0,         35,         35,        1,    38016, 0xeb3d27f4
+0,         36,         36,        1,    38016, 0x9a43282d
+0,         37,         37,        1,    38016, 0xe04720c6
+0,         38,         38,        1,    38016, 0x19cc0eba
+0,         39,         39,        1,    38016, 0x218efeb6
+0,         40,         40,        1,    38016, 0x7733f491
+0,         41,         41,        1,    38016, 0x7f3bede9
+0,         42,         42,        1,    38016, 0x49c5ec0d
+0,         43,         43,        1,    38016, 0x803cf19e
+0,         44,         44,        1,    38016, 0x31de0d3f
+0,         45,         45,        1,    38016, 0xa7e30426
+0,         46,         46,        1,    38016, 0xba37f068
+0,         47,         47,        1,    38016, 0x2842bdf8
+0,         48,         48,        1,    38016, 0x76df97dc
+0,         49,         49,        1,    38016, 0xf3246d26
+0,         50,         50,        1,    38016, 0x0a384d72
+0,         51,         51,        1,    38016, 0x40964f41
+0,         52,         52,        1,    38016, 0x46364324
+0,         53,         53,        1,    38016, 0x7cbf3db4
+0,         54,         54,        1,    38016, 0x7a223bec
+0,         55,         55,        1,    38016, 0x458651c1
+0,         56,         56,        1,    38016, 0xb82d7e3c
+0,         57,         57,        1,    38016, 0x0f50a55d
+0,         58,         58,        1,    38016, 0xc306cae4
+0,         59,         59,        1,    38016, 0x9d6ddfcb
+0,         60,         60,        1,    38016, 0xb602e8e9
+0,         61,         61,        1,    38016, 0xbf0ae386
+0,         62,         62,        1,    38016, 0x0a8bd46e
+0,         63,         63,        1,    38016, 0xd437c5c1
+0,         64,         64,        1,    38016, 0xd61d9959
+0,         65,         65,        1,    38016, 0x70639b56
+0,         66,         66,        1,    38016, 0x36fd407b
+0,         67,         67,        1,    38016, 0x58ce3ddd
+0,         68,         68,        1,    38016, 0x86cc1d8c
+0,         69,         69,        1,    38016, 0xee422dc2
+0,         70,         70,        1,    38016, 0xab475639
+0,         71,         71,        1,    38016, 0xc1327ad8
+0,         72,         72,        1,    38016, 0x63d196d4
+0,         73,         73,        1,    38016, 0x1aba8ebd
+0,         74,         74,        1,    38016, 0x74a269ac
+0,         75,         75,        1,    38016, 0x267f3563
+0,         76,         76,        1,    38016, 0xa18ff180
+0,         77,         77,        1,    38016, 0x70c9c9fd
+0,         78,         78,        1,    38016, 0xa6c59f9c
+0,         79,         79,        1,    38016, 0xd7cd8927
+0,         80,         80,        1,    38016, 0xd30b7345
+0,         81,         81,        1,    38016, 0x679a4dda
+0,         82,         82,        1,    38016, 0xeb0562de
+0,         83,         83,        1,    38016, 0xdd7d6cdb
+0,         84,         84,        1,    38016, 0xd6e26b73
+0,         85,         85,        1,    38016, 0xa65a860f
+0,         86,         86,        1,    38016, 0xae95c71e
+0,         87,         87,        1,    38016, 0x1a89ca86
+0,         88,         88,        1,    38016, 0xa33ecee6
+0,         89,         89,        1,    38016, 0x821da6cb
+0,         90,         90,        1,    38016, 0xf0e1612f
+0,         91,         91,        1,    38016, 0x67b8516b
+0,         92,         92,        1,    38016, 0x62f965bc
+0,         93,         93,        1,    38016, 0xd1917aa6
+0,         94,         94,        1,    38016, 0xe72db54d
+0,         95,         95,        1,    38016, 0x9b64e721
+0,         96,         96,        1,    38016, 0xa819efda
+0,         97,         97,        1,    38016, 0xeacfdacb
+0,         98,         98,        1,    38016, 0x52f235e1
+0,         99,         99,        1,    38016, 0x2b512cb8
+0,        100,        100,        1,    38016, 0xaac73fb3
+0,        101,        101,        1,    38016, 0x7d2d504f
+0,        102,        102,        1,    38016, 0x396d503a
+0,        103,        103,        1,    38016, 0x97905235
+0,        104,        104,        1,    38016, 0xf0056693
+0,        105,        105,        1,    38016, 0x728a6a9e
+0,        106,        106,        1,    38016, 0x0eed7824
+0,        107,        107,        1,    38016, 0x59506237
+0,        108,        108,        1,    38016, 0xd4304c93
+0,        109,        109,        1,    38016, 0x7e663ee8
+0,        110,        110,        1,    38016, 0x0ebc2d11
+0,        111,        111,        1,    38016, 0x52db2112
+0,        112,        112,        1,    38016, 0x74aa1815
+0,        113,        113,        1,    38016, 0x57a60dc6
+0,        114,        114,        1,    38016, 0x86e9fa32
+0,        115,        115,        1,    38016, 0x67e8ff09
+0,        116,        116,        1,    38016, 0x26e8f7ea
+0,        117,        117,        1,    38016, 0x183dff56
+0,        118,        118,        1,    38016, 0xa470af8d
+0,        119,        119,        1,    38016, 0xe017d594
+0,        120,        120,        1,    38016, 0xb899d48b
+0,        121,        121,        1,    38016, 0x0d3bc5f7
+0,        122,        122,        1,    38016, 0xd68bbb0d
+0,        123,        123,        1,    38016, 0x8bf5b4cb
+0,        124,        124,        1,    38016, 0x6bfcaa47
+0,        125,        125,        1,    38016, 0x29a9b01b
+0,        126,        126,        1,    38016, 0xcdedbdb7
+0,        127,        127,        1,    38016, 0xdb5ad9c3
+0,        128,        128,        1,    38016, 0x468aeef6
+0,        129,        129,        1,    38016, 0xdc2b143e
+0,        130,        130,        1,    38016, 0x6776277c
+0,        131,        131,        1,    38016, 0xb78d5294
+0,        132,        132,        1,    38016, 0x1dfb63ab
+0,        133,        133,        1,    38016, 0xbd1f99bc
+0,        134,        134,        1,    38016, 0xde16b89a
+0,        135,        135,        1,    38016, 0xbf46edca
+0,        136,        136,        1,    38016, 0x6306e8c4
+0,        137,        137,        1,    38016, 0x7b09d224
+0,        138,        138,        1,    38016, 0xfea1aff6
+0,        139,        139,        1,    38016, 0x183686b0
+0,        140,        140,        1,    38016, 0x665a61ff
+0,        141,        141,        1,    38016, 0xc8af42d1
+0,        142,        142,        1,    38016, 0xe2326bc1
+0,        143,        143,        1,    38016, 0x56dbde82
+0,        144,        144,        1,    38016, 0xa0254f97
+0,        145,        145,        1,    38016, 0x3b74a0b4
+0,        146,        146,        1,    38016, 0x9aee9b7f
+0,        147,        147,        1,    38016, 0xd94b6133
+0,        148,        148,        1,    38016, 0x5819f795
+0,        149,        149,        1,    38016, 0xc45a8c02
+0,        150,        150,        1,    38016, 0x2f9204a0
+0,        151,        151,        1,    38016, 0xbe09e051
+0,        152,        152,        1,    38016, 0xb542badd
+0,        153,        153,        1,    38016, 0x23bd9e00
+0,        154,        154,        1,    38016, 0x4f338d3d
+0,        155,        155,        1,    38016, 0x8c91e8f3
+0,        156,        156,        1,    38016, 0xa7347d57
+0,        157,        157,        1,    38016, 0x6d91de4d
+0,        158,        158,        1,    38016, 0x3443d936
+0,        159,        159,        1,    38016, 0x9d25b4e2
+0,        160,        160,        1,    38016, 0xd93cd4b3
+0,        161,        161,        1,    38016, 0xa1c9e9a0
+0,        162,        162,        1,    38016, 0x1482f220
+0,        163,        163,        1,    38016, 0x1295f270
+0,        164,        164,        1,    38016, 0x399ae9da
+0,        165,        165,        1,    38016, 0x85dcdf28
+0,        166,        166,        1,    38016, 0x4207b9e5
+0,        167,        167,        1,    38016, 0xad1c9d75
+0,        168,        168,        1,    38016, 0x4a266c14
+0,        169,        169,        1,    38016, 0x3afc4508
+0,        170,        170,        1,    38016, 0x2b1b2385
+0,        171,        171,        1,    38016, 0x738f005f
+0,        172,        172,        1,    38016, 0xfec3d833
+0,        173,        173,        1,    38016, 0x3f7f6ae9
+0,        174,        174,        1,    38016, 0xd8551823
+0,        175,        175,        1,    38016, 0x6df03570
+0,        176,        176,        1,    38016, 0x767c3054
+0,        177,        177,        1,    38016, 0x89bd342c
+0,        178,        178,        1,    38016, 0x77ba806c
+0,        179,        179,        1,    38016, 0x1c98005c
+0,        180,        180,        1,    38016, 0xa13ce2a3
+0,        181,        181,        1,    38016, 0x1be59915
+0,        182,        182,        1,    38016, 0x279c6027
+0,        183,        183,        1,    38016, 0x96ac11a2
+0,        184,        184,        1,    38016, 0x3ae95131
+0,        185,        185,        1,    38016, 0xae19f7fe
+0,        186,        186,        1,    38016, 0xcde4efe6
+0,        187,        187,        1,    38016, 0x5ecc3f7a
+0,        188,        188,        1,    38016, 0x79645152
+0,        189,        189,        1,    38016, 0x1ee2e89f
+0,        190,        190,        1,    38016, 0x91d34bb4
+0,        191,        191,        1,    38016, 0xf019d464
+0,        192,        192,        1,    38016, 0x8eb07205
+0,        193,        193,        1,    38016, 0x5399bb5b
+0,        194,        194,        1,    38016, 0x61f0c77a
+0,        195,        195,        1,    38016, 0xb2bd8726
+0,        196,        196,        1,    38016, 0x47b89243
+0,        197,        197,        1,    38016, 0xebfe4d76
+0,        198,        198,        1,    38016, 0xe8f87d91
+0,        199,        199,        1,    38016, 0x5e9fb239
+0,        200,        200,        1,    38016, 0x357ca1f8
+0,        201,        201,        1,    38016, 0x757d2e02
+0,        202,        202,        1,    38016, 0x40672e7c
+0,        203,        203,        1,    38016, 0xd966abca
+0,        204,        204,        1,    38016, 0xe98d0d47
+0,        205,        205,        1,    38016, 0x341babf5
+0,        206,        206,        1,    38016, 0xd12d5a0c
+0,        207,        207,        1,    38016, 0xea2f99ab
+0,        208,        208,        1,    38016, 0x14bce88e
+0,        209,        209,        1,    38016, 0xe4bda9e8
+0,        210,        210,        1,    38016, 0x2c57ec89
+0,        211,        211,        1,    38016, 0x28bbb83e
+0,        212,        212,        1,    38016, 0xf8444b54
+0,        213,        213,        1,    38016, 0x3aba03cd
+0,        214,        214,        1,    38016, 0x373daa20
+0,        215,        215,        1,    38016, 0x69586597
+0,        216,        216,        1,    38016, 0xc0c70d53
+0,        217,        217,        1,    38016, 0x76a5df5a
+0,        218,        218,        1,    38016, 0x1afde8f0
+0,        219,        219,        1,    38016, 0x9638285a
+0,        220,        220,        1,    38016, 0x9f0686c0
+0,        221,        221,        1,    38016, 0xc65b2238
+0,        222,        222,        1,    38016, 0x0d61b610
+0,        223,        223,        1,    38016, 0x78e14e1f
+0,        224,        224,        1,    38016, 0xcf80ac4a
+0,        225,        225,        1,    38016, 0xe094083d
+0,        226,        226,        1,    38016, 0xee5e612e
+0,        227,        227,        1,    38016, 0x51cdad9d
+0,        228,        228,        1,    38016, 0xae41100e
+0,        229,        229,        1,    38016, 0x77558f58
+0,        230,        230,        1,    38016, 0xb9503b95
+0,        231,        231,        1,    38016, 0xb71dffeb
+0,        232,        232,        1,    38016, 0x1872e3e6
+0,        233,        233,        1,    38016, 0x29c3d252
+0,        234,        234,        1,    38016, 0x1c77c6ec
+0,        235,        235,        1,    38016, 0x26feb194
+0,        236,        236,        1,    38016, 0x3307c3c4
+0,        237,        237,        1,    38016, 0x8e5a8080
+0,        238,        238,        1,    38016, 0x933472f7
+0,        239,        239,        1,    38016, 0xd4768d84
+0,        240,        240,        1,    38016, 0x3324485f
+0,        241,        241,        1,    38016, 0xd50af078
+0,        242,        242,        1,    38016, 0x53820752
+0,        243,        243,        1,    38016, 0xbe7f1c47
+0,        244,        244,        1,    38016, 0xe43d3a34
+0,        245,        245,        1,    38016, 0x57194b82
+0,        246,        246,        1,    38016, 0x68a052ed
+0,        247,        247,        1,    38016, 0x5c898052
+0,        248,        248,        1,    38016, 0x7104a6ad
+0,        249,        249,        1,    38016, 0x1676b5e8
+0,        250,        250,        1,    38016, 0xe1cfd375
+0,        251,        251,        1,    38016, 0x16fede04
+0,        252,        252,        1,    38016, 0xca49dd4a
+0,        253,        253,        1,    38016, 0x7b98d9d1
+0,        254,        254,        1,    38016, 0x4020d210
+0,        255,        255,        1,    38016, 0x62c5d1e4
+0,        256,        256,        1,    38016, 0x756abdb4
+0,        257,        257,        1,    38016, 0x558fb00f
+0,        258,        258,        1,    38016, 0x4ab0b1f1
+0,        259,        259,        1,    38016, 0x7c9fb0c2
+0,        260,        260,        1,    38016, 0xcecfbdd0
+0,        261,        261,        1,    38016, 0x70e6d174
+0,        262,        262,        1,    38016, 0x83d7ddde
+0,        263,        263,        1,    38016, 0xbbcde2d9
+0,        264,        264,        1,    38016, 0xc89eeaef
+0,        265,        265,        1,    38016, 0x8565e15c
+0,        266,        266,        1,    38016, 0x28e0db24
+0,        267,        267,        1,    38016, 0x1d9dd334
+0,        268,        268,        1,    38016, 0xce02c452
+0,        269,        269,        1,    38016, 0xe29dbd0c
+0,        270,        270,        1,    38016, 0x4aa3b638
+0,        271,        271,        1,    38016, 0x5533c135
+0,        272,        272,        1,    38016, 0x6c57b65f
+0,        273,        273,        1,    38016, 0x23d3b851
+0,        274,        274,        1,    38016, 0xd8cbb960
+0,        275,        275,        1,    38016, 0x02edb916
+0,        276,        276,        1,    38016, 0xa622bd42
+0,        277,        277,        1,    38016, 0x4ba5be1c
+0,        278,        278,        1,    38016, 0xe69bb625
+0,        279,        279,        1,    38016, 0xbca5b292
+0,        280,        280,        1,    38016, 0xde38b1c8
+0,        281,        281,        1,    38016, 0xe9e3b617
+0,        282,        282,        1,    38016, 0x216cc574
+0,        283,        283,        1,    38016, 0x3780c5ad
+0,        284,        284,        1,    38016, 0x5531e3f9
+0,        285,        285,        1,    38016, 0xe2c5f5d4
+0,        286,        286,        1,    38016, 0x24cefc6e
+0,        287,        287,        1,    38016, 0xa3ce003d
+0,        288,        288,        1,    38016, 0x42d01c9e
+0,        289,        289,        1,    38016, 0xbfc13689
+0,        290,        290,        1,    38016, 0x122647a9
+0,        291,        291,        1,    38016, 0xe45254da
+0,        292,        292,        1,    38016, 0xad955b0c
+0,        293,        293,        1,    38016, 0x4b086abb
+0,        294,        294,        1,    38016, 0xd4857b8c
+0,        295,        295,        1,    38016, 0xa71594ce
+0,        296,        296,        1,    38016, 0x04e4a73d
+0,        297,        297,        1,    38016, 0x295abf63
+0,        298,        298,        1,    38016, 0xbe4ed5dd
+0,        299,        299,        1,    38016, 0x087bcf64
diff --git a/tests/ref/fate/h264-conformance-mr6_bt_b b/tests/ref/fate/h264-conformance-mr6_bt_b
index ddfc3d98ee7..34aa8bfd463 100644
--- a/tests/ref/fate/h264-conformance-mr6_bt_b
+++ b/tests/ref/fate/h264-conformance-mr6_bt_b
@@ -3,63 +3,63 @@
 #codec_id 0: rawvideo
 #dimensions 0: 192x128
 #sar 0: 0/1
-0,          1,          1,        1,    36864, 0x954464be
-0,          2,          2,        1,    36864, 0xace1d90b
-0,          3,          3,        1,    36864, 0x8f149f03
-0,          4,          4,        1,    36864, 0xea9b21eb
-0,          5,          5,        1,    36864, 0xb51d9fe3
-0,          6,          6,        1,    36864, 0x61bd11d7
-0,          7,          7,        1,    36864, 0x9d36980f
-0,          8,          8,        1,    36864, 0xa4192c5e
-0,          9,          9,        1,    36864, 0x11006433
-0,         10,         10,        1,    36864, 0x4a243e46
-0,         11,         11,        1,    36864, 0x1807b5e8
-0,         12,         12,        1,    36864, 0xbe37743c
-0,         13,         13,        1,    36864, 0x82491319
-0,         14,         14,        1,    36864, 0x006e9914
-0,         15,         15,        1,    36864, 0xa5261884
-0,         16,         16,        1,    36864, 0x2030c9d6
-0,         17,         17,        1,    36864, 0xc80eb1ce
-0,         18,         18,        1,    36864, 0x4d559791
-0,         19,         19,        1,    36864, 0xf5f900ee
-0,         20,         20,        1,    36864, 0x2cc9c0d7
-0,         21,         21,        1,    36864, 0x5ba14186
-0,         22,         22,        1,    36864, 0x47a46865
-0,         23,         23,        1,    36864, 0x5ba180b7
-0,         24,         24,        1,    36864, 0xc67c4876
-0,         25,         25,        1,    36864, 0x4311d75d
-0,         26,         26,        1,    36864, 0x56edb851
-0,         27,         27,        1,    36864, 0x7e5aa3e0
-0,         28,         28,        1,    36864, 0x8df8283a
-0,         29,         29,        1,    36864, 0xb8583ddf
-0,         30,         30,        1,    36864, 0xf33fb779
-0,         31,         31,        1,    36864, 0xe9942ddc
-0,         32,         32,        1,    36864, 0x2bc5f7fa
-0,         33,         33,        1,    36864, 0xc7b66c65
-0,         34,         34,        1,    36864, 0x1a524319
-0,         35,         35,        1,    36864, 0xf60c6141
-0,         36,         36,        1,    36864, 0x113f41f2
-0,         37,         37,        1,    36864, 0xad191a31
-0,         38,         38,        1,    36864, 0x3898264a
-0,         39,         39,        1,    36864, 0x3c2f34a4
-0,         40,         40,        1,    36864, 0xd0fc76aa
-0,         41,         41,        1,    36864, 0x2870b546
-0,         42,         42,        1,    36864, 0x7d326fb4
-0,         43,         43,        1,    36864, 0xd7ed14e1
-0,         44,         44,        1,    36864, 0x205174aa
-0,         45,         45,        1,    36864, 0xa3a88be9
-0,         46,         46,        1,    36864, 0xd6f01751
-0,         47,         47,        1,    36864, 0x5420bb80
-0,         48,         48,        1,    36864, 0xe14518f9
-0,         49,         49,        1,    36864, 0x931db61e
-0,         50,         50,        1,    36864, 0x052ecfae
-0,         51,         51,        1,    36864, 0x29b1b0f5
-0,         52,         52,        1,    36864, 0xa3057117
-0,         53,         53,        1,    36864, 0x954464be
-0,         54,         54,        1,    36864, 0xace1d90b
-0,         55,         55,        1,    36864, 0x8f149f03
-0,         56,         56,        1,    36864, 0x485722c5
-0,         57,         57,        1,    36864, 0x534b18f9
-0,         58,         58,        1,    36864, 0xc893a0a6
-0,         59,         59,        1,    36864, 0x8b04e1dd
-0,         60,         60,        1,    36864, 0xaf536964
+0,          0,          0,        1,    36864, 0x954464be
+0,          1,          1,        1,    36864, 0xace1d90b
+0,          2,          2,        1,    36864, 0x8f149f03
+0,          3,          3,        1,    36864, 0xea9b21eb
+0,          4,          4,        1,    36864, 0xb51d9fe3
+0,          5,          5,        1,    36864, 0x61bd11d7
+0,          6,          6,        1,    36864, 0x9d36980f
+0,          7,          7,        1,    36864, 0xa4192c5e
+0,          8,          8,        1,    36864, 0x11006433
+0,          9,          9,        1,    36864, 0x4a243e46
+0,         10,         10,        1,    36864, 0x1807b5e8
+0,         11,         11,        1,    36864, 0xbe37743c
+0,         12,         12,        1,    36864, 0x82491319
+0,         13,         13,        1,    36864, 0x006e9914
+0,         14,         14,        1,    36864, 0xa5261884
+0,         15,         15,        1,    36864, 0x2030c9d6
+0,         16,         16,        1,    36864, 0xc80eb1ce
+0,         17,         17,        1,    36864, 0x4d559791
+0,         18,         18,        1,    36864, 0xf5f900ee
+0,         19,         19,        1,    36864, 0x2cc9c0d7
+0,         20,         20,        1,    36864, 0x5ba14186
+0,         21,         21,        1,    36864, 0x47a46865
+0,         22,         22,        1,    36864, 0x5ba180b7
+0,         23,         23,        1,    36864, 0xc67c4876
+0,         24,         24,        1,    36864, 0x4311d75d
+0,         25,         25,        1,    36864, 0x56edb851
+0,         26,         26,        1,    36864, 0x7e5aa3e0
+0,         27,         27,        1,    36864, 0x8df8283a
+0,         28,         28,        1,    36864, 0xb8583ddf
+0,         29,         29,        1,    36864, 0xf33fb779
+0,         30,         30,        1,    36864, 0xe9942ddc
+0,         31,         31,        1,    36864, 0x2bc5f7fa
+0,         32,         32,        1,    36864, 0xc7b66c65
+0,         33,         33,        1,    36864, 0x1a524319
+0,         34,         34,        1,    36864, 0xf60c6141
+0,         35,         35,        1,    36864, 0x113f41f2
+0,         36,         36,        1,    36864, 0xad191a31
+0,         37,         37,        1,    36864, 0x3898264a
+0,         38,         38,        1,    36864, 0x3c2f34a4
+0,         39,         39,        1,    36864, 0xd0fc76aa
+0,         40,         40,        1,    36864, 0x2870b546
+0,         41,         41,        1,    36864, 0x7d326fb4
+0,         42,         42,        1,    36864, 0xd7ed14e1
+0,         43,         43,        1,    36864, 0x205174aa
+0,         44,         44,        1,    36864, 0xa3a88be9
+0,         45,         45,        1,    36864, 0xd6f01751
+0,         46,         46,        1,    36864, 0x5420bb80
+0,         47,         47,        1,    36864, 0xe14518f9
+0,         48,         48,        1,    36864, 0x931db61e
+0,         49,         49,        1,    36864, 0x052ecfae
+0,         50,         50,        1,    36864, 0x29b1b0f5
+0,         51,         51,        1,    36864, 0xa3057117
+0,         52,         52,        1,    36864, 0x954464be
+0,         53,         53,        1,    36864, 0xace1d90b
+0,         54,         54,        1,    36864, 0x8f149f03
+0,         55,         55,        1,    36864, 0x485722c5
+0,         56,         56,        1,    36864, 0x534b18f9
+0,         57,         57,        1,    36864, 0xc893a0a6
+0,         58,         58,        1,    36864, 0x8b04e1dd
+0,         59,         59,        1,    36864, 0xaf536964
diff --git a/tests/ref/fate/h264-conformance-mr7_bt_b b/tests/ref/fate/h264-conformance-mr7_bt_b
index becd797c8fe..551767ce1da 100644
--- a/tests/ref/fate/h264-conformance-mr7_bt_b
+++ b/tests/ref/fate/h264-conformance-mr7_bt_b
@@ -13,53 +13,53 @@
 0,          7,          7,        1,    36864, 0xf2f324dd
 0,          8,          8,        1,    36864, 0x592b5a01
 0,          9,          9,        1,    36864, 0x4c2f2d91
-0,         11,         11,        1,    36864, 0x8baeb610
-0,         12,         12,        1,    36864, 0x86d47617
-0,         13,         13,        1,    36864, 0xf11011cc
-0,         14,         14,        1,    36864, 0xe56a9daa
-0,         15,         15,        1,    36864, 0xd57119d6
-0,         16,         16,        1,    36864, 0xe28fcde7
-0,         17,         17,        1,    36864, 0x9aeeba86
-0,         18,         18,        1,    36864, 0xa518a7c5
-0,         19,         19,        1,    36864, 0x9af410be
-0,         20,         20,        1,    36864, 0x1fedd12f
-0,         21,         21,        1,    36864, 0xa8032e03
-0,         22,         22,        1,    36864, 0x579e6274
-0,         23,         23,        1,    36864, 0x99846ef6
-0,         24,         24,        1,    36864, 0xb5ad3ca7
-0,         25,         25,        1,    36864, 0x7845cb90
-0,         26,         26,        1,    36864, 0x569fae24
-0,         27,         27,        1,    36864, 0x8a3c9f98
-0,         28,         28,        1,    36864, 0x0b7722af
-0,         29,         29,        1,    36864, 0x699c2dd8
-0,         30,         30,        1,    36864, 0xd477af13
-0,         31,         31,        1,    36864, 0x17b62d7c
-0,         32,         32,        1,    36864, 0xb1ecf6a7
-0,         33,         33,        1,    36864, 0xf9c17e4c
-0,         34,         34,        1,    36864, 0xe7c44618
-0,         35,         35,        1,    36864, 0x7e23654e
-0,         36,         36,        1,    36864, 0xd8a0457c
-0,         37,         37,        1,    36864, 0x57e11df1
-0,         38,         38,        1,    36864, 0xd54d2a43
-0,         39,         39,        1,    36864, 0xc6f03950
-0,         40,         40,        1,    36864, 0x687e750e
-0,         41,         41,        1,    36864, 0x2870b546
-0,         42,         42,        1,    36864, 0xda0370d0
-0,         43,         43,        1,    36864, 0x5a2e0bff
-0,         44,         44,        1,    36864, 0xe1f07533
-0,         45,         45,        1,    36864, 0x3de892b9
-0,         46,         46,        1,    36864, 0xe5c31505
-0,         47,         47,        1,    36864, 0x96b8c082
-0,         48,         48,        1,    36864, 0x55391423
-0,         49,         49,        1,    36864, 0xc285bd71
-0,         50,         50,        1,    36864, 0xf702d9f3
-0,         51,         51,        1,    36864, 0x7afbadf8
-0,         52,         52,        1,    36864, 0xd9b568f7
-0,         53,         53,        1,    36864, 0x579e6274
-0,         54,         54,        1,    36864, 0x8650c61c
-0,         55,         55,        1,    36864, 0xbc359647
-0,         56,         56,        1,    36864, 0x5522328c
-0,         57,         57,        1,    36864, 0x02821fd6
-0,         58,         58,        1,    36864, 0xb4ee9562
-0,         59,         59,        1,    36864, 0xcefedb68
-0,         60,         60,        1,    36864, 0xd959782e
+0,         10,         10,        1,    36864, 0x8baeb610
+0,         11,         11,        1,    36864, 0x86d47617
+0,         12,         12,        1,    36864, 0xf11011cc
+0,         13,         13,        1,    36864, 0xe56a9daa
+0,         14,         14,        1,    36864, 0xd57119d6
+0,         15,         15,        1,    36864, 0xe28fcde7
+0,         16,         16,        1,    36864, 0x9aeeba86
+0,         17,         17,        1,    36864, 0xa518a7c5
+0,         18,         18,        1,    36864, 0x9af410be
+0,         19,         19,        1,    36864, 0x1fedd12f
+0,         20,         20,        1,    36864, 0xa8032e03
+0,         21,         21,        1,    36864, 0x579e6274
+0,         22,         22,        1,    36864, 0x99846ef6
+0,         23,         23,        1,    36864, 0xb5ad3ca7
+0,         24,         24,        1,    36864, 0x7845cb90
+0,         25,         25,        1,    36864, 0x569fae24
+0,         26,         26,        1,    36864, 0x8a3c9f98
+0,         27,         27,        1,    36864, 0x0b7722af
+0,         28,         28,        1,    36864, 0x699c2dd8
+0,         29,         29,        1,    36864, 0xd477af13
+0,         30,         30,        1,    36864, 0x17b62d7c
+0,         31,         31,        1,    36864, 0xb1ecf6a7
+0,         32,         32,        1,    36864, 0xf9c17e4c
+0,         33,         33,        1,    36864, 0xe7c44618
+0,         34,         34,        1,    36864, 0x7e23654e
+0,         35,         35,        1,    36864, 0xd8a0457c
+0,         36,         36,        1,    36864, 0x57e11df1
+0,         37,         37,        1,    36864, 0xd54d2a43
+0,         38,         38,        1,    36864, 0xc6f03950
+0,         39,         39,        1,    36864, 0x687e750e
+0,         40,         40,        1,    36864, 0x2870b546
+0,         41,         41,        1,    36864, 0xda0370d0
+0,         42,         42,        1,    36864, 0x5a2e0bff
+0,         43,         43,        1,    36864, 0xe1f07533
+0,         44,         44,        1,    36864, 0x3de892b9
+0,         45,         45,        1,    36864, 0xe5c31505
+0,         46,         46,        1,    36864, 0x96b8c082
+0,         47,         47,        1,    36864, 0x55391423
+0,         48,         48,        1,    36864, 0xc285bd71
+0,         49,         49,        1,    36864, 0xf702d9f3
+0,         50,         50,        1,    36864, 0x7afbadf8
+0,         51,         51,        1,    36864, 0xd9b568f7
+0,         52,         52,        1,    36864, 0x579e6274
+0,         53,         53,        1,    36864, 0x8650c61c
+0,         54,         54,        1,    36864, 0xbc359647
+0,         55,         55,        1,    36864, 0x5522328c
+0,         56,         56,        1,    36864, 0x02821fd6
+0,         57,         57,        1,    36864, 0xb4ee9562
+0,         58,         58,        1,    36864, 0xcefedb68
+0,         59,         59,        1,    36864, 0xd959782e
diff --git a/tests/ref/fate/h264-conformance-mr8_bt_b b/tests/ref/fate/h264-conformance-mr8_bt_b
index 40373e6985b..7981c422459 100644
--- a/tests/ref/fate/h264-conformance-mr8_bt_b
+++ b/tests/ref/fate/h264-conformance-mr8_bt_b
@@ -3,61 +3,61 @@
 #codec_id 0: rawvideo
 #dimensions 0: 192x128
 #sar 0: 0/1
-0,          1,          1,        1,    36864, 0x36df68f4
-0,          2,          2,        1,    36864, 0x52d4c6d9
-0,          3,          3,        1,    36864, 0xad16b0be
-0,          4,          4,        1,    36864, 0xf8c72556
-0,          5,          5,        1,    36864, 0x70aaad30
-0,          6,          6,        1,    36864, 0x53cffd5e
-0,          7,          7,        1,    36864, 0xb3fa8abc
-0,          8,          8,        1,    36864, 0x9c894009
-0,          9,          9,        1,    36864, 0xfbc08050
-0,         10,         10,        1,    36864, 0x9d5b2d65
-0,         11,         11,        1,    36864, 0x3bd8bb5d
-0,         12,         12,        1,    36864, 0x8d976ecf
-0,         13,         13,        1,    36864, 0x25010368
-0,         14,         14,        1,    36864, 0xb6e6a11c
-0,         15,         15,        1,    36864, 0x595a3967
-0,         16,         16,        1,    36864, 0x4fbcb9a8
-0,         17,         17,        1,    36864, 0xc7c5c16b
-0,         18,         18,        1,    36864, 0x661ae1eb
-0,         19,         19,        1,    36864, 0x169f04a7
-0,         20,         20,        1,    36864, 0xd124c93a
-0,         21,         21,        1,    36864, 0x3f642dba
-0,         22,         22,        1,    36864, 0xe7ad6956
-0,         23,         23,        1,    36864, 0x47dc76d3
-0,         24,         24,        1,    36864, 0x496a3917
-0,         25,         25,        1,    36864, 0xa976d5f3
-0,         26,         26,        1,    36864, 0x507bb685
-0,         27,         27,        1,    36864, 0x2f61ac12
-0,         28,         28,        1,    36864, 0x527818d8
-0,         29,         29,        1,    36864, 0xa4983396
-0,         30,         30,        1,    36864, 0x3ec9b07b
-0,         31,         31,        1,    36864, 0x7db52d99
-0,         32,         32,        1,    36864, 0xe974fd00
-0,         33,         33,        1,    36864, 0x9c677a4f
-0,         34,         34,        1,    36864, 0x108f3a05
-0,         35,         35,        1,    36864, 0x23a56ba2
-0,         36,         36,        1,    36864, 0x4c8d47e8
-0,         37,         37,        1,    36864, 0x9e0b0f09
-0,         38,         38,        1,    36864, 0x4d262b16
-0,         39,         39,        1,    36864, 0x6122402e
-0,         40,         40,        1,    36864, 0xed037036
-0,         41,         41,        1,    36864, 0x62b3ba08
-0,         42,         42,        1,    36864, 0x7f876930
-0,         43,         43,        1,    36864, 0x4a6c0983
-0,         44,         44,        1,    36864, 0xf9787086
-0,         45,         45,        1,    36864, 0x01d1b1b5
-0,         46,         46,        1,    36864, 0xc1622655
-0,         47,         47,        1,    36864, 0x27e8e0f7
-0,         48,         48,        1,    36864, 0xc1622655
-0,         49,         49,        1,    36864, 0x12c2b7e9
-0,         50,         50,        1,    36864, 0xd752d2ef
-0,         51,         51,        1,    36864, 0xcbb1c3a7
-0,         52,         52,        1,    36864, 0x18c56fba
-0,         53,         53,        1,    36864, 0xb1b3771c
-0,         54,         54,        1,    36864, 0x284ef3c4
-0,         55,         55,        1,    36864, 0xda6eb5a0
-0,         56,         56,        1,    36864, 0x17ad337c
-0,         57,         57,        1,    36864, 0xe2801e4f
-0,         58,         58,        1,    36864, 0x6c33bd17
+0,          0,          0,        1,    36864, 0x36df68f4
+0,          1,          1,        1,    36864, 0x52d4c6d9
+0,          2,          2,        1,    36864, 0xad16b0be
+0,          3,          3,        1,    36864, 0xf8c72556
+0,          4,          4,        1,    36864, 0x70aaad30
+0,          5,          5,        1,    36864, 0x53cffd5e
+0,          6,          6,        1,    36864, 0xb3fa8abc
+0,          7,          7,        1,    36864, 0x9c894009
+0,          8,          8,        1,    36864, 0xfbc08050
+0,          9,          9,        1,    36864, 0x9d5b2d65
+0,         10,         10,        1,    36864, 0x3bd8bb5d
+0,         11,         11,        1,    36864, 0x8d976ecf
+0,         12,         12,        1,    36864, 0x25010368
+0,         13,         13,        1,    36864, 0xb6e6a11c
+0,         14,         14,        1,    36864, 0x595a3967
+0,         15,         15,        1,    36864, 0x4fbcb9a8
+0,         16,         16,        1,    36864, 0xc7c5c16b
+0,         17,         17,        1,    36864, 0x661ae1eb
+0,         18,         18,        1,    36864, 0x169f04a7
+0,         19,         19,        1,    36864, 0xd124c93a
+0,         20,         20,        1,    36864, 0x3f642dba
+0,         21,         21,        1,    36864, 0xe7ad6956
+0,         22,         22,        1,    36864, 0x47dc76d3
+0,         23,         23,        1,    36864, 0x496a3917
+0,         24,         24,        1,    36864, 0xa976d5f3
+0,         25,         25,        1,    36864, 0x507bb685
+0,         26,         26,        1,    36864, 0x2f61ac12
+0,         27,         27,        1,    36864, 0x527818d8
+0,         28,         28,        1,    36864, 0xa4983396
+0,         29,         29,        1,    36864, 0x3ec9b07b
+0,         30,         30,        1,    36864, 0x7db52d99
+0,         31,         31,        1,    36864, 0xe974fd00
+0,         32,         32,        1,    36864, 0x9c677a4f
+0,         33,         33,        1,    36864, 0x108f3a05
+0,         34,         34,        1,    36864, 0x23a56ba2
+0,         35,         35,        1,    36864, 0x4c8d47e8
+0,         36,         36,        1,    36864, 0x9e0b0f09
+0,         37,         37,        1,    36864, 0x4d262b16
+0,         38,         38,        1,    36864, 0x6122402e
+0,         39,         39,        1,    36864, 0xed037036
+0,         40,         40,        1,    36864, 0x62b3ba08
+0,         41,         41,        1,    36864, 0x7f876930
+0,         42,         42,        1,    36864, 0x4a6c0983
+0,         43,         43,        1,    36864, 0xf9787086
+0,         44,         44,        1,    36864, 0x01d1b1b5
+0,         45,         45,        1,    36864, 0xc1622655
+0,         46,         46,        1,    36864, 0x27e8e0f7
+0,         47,         47,        1,    36864, 0xc1622655
+0,         48,         48,        1,    36864, 0x12c2b7e9
+0,         49,         49,        1,    36864, 0xd752d2ef
+0,         50,         50,        1,    36864, 0xcbb1c3a7
+0,         51,         51,        1,    36864, 0x18c56fba
+0,         52,         52,        1,    36864, 0xb1b3771c
+0,         53,         53,        1,    36864, 0x284ef3c4
+0,         54,         54,        1,    36864, 0xda6eb5a0
+0,         55,         55,        1,    36864, 0x17ad337c
+0,         56,         56,        1,    36864, 0xe2801e4f
+0,         57,         57,        1,    36864, 0x6c33bd17
diff --git a/tests/ref/fate/h264-conformance-mr9_bt_b b/tests/ref/fate/h264-conformance-mr9_bt_b
index 99dd0dc3228..bbd90e67f94 100644
--- a/tests/ref/fate/h264-conformance-mr9_bt_b
+++ b/tests/ref/fate/h264-conformance-mr9_bt_b
@@ -13,51 +13,51 @@
 0,          7,          7,        1,    36864, 0x75122807
 0,          8,          8,        1,    36864, 0x27036a2b
 0,          9,          9,        1,    36864, 0x00072654
-0,         11,         11,        1,    36864, 0x49fab4fd
-0,         12,         12,        1,    36864, 0x975a7545
-0,         13,         13,        1,    36864, 0x9b080a2f
-0,         14,         14,        1,    36864, 0x78db960e
-0,         15,         15,        1,    36864, 0xd7a928d4
-0,         16,         16,        1,    36864, 0x0a83ba1b
-0,         17,         17,        1,    36864, 0xad6bb30c
-0,         18,         18,        1,    36864, 0xf6addb0d
-0,         19,         19,        1,    36864, 0x00540a0a
-0,         20,         20,        1,    36864, 0x049cc748
-0,         21,         21,        1,    36864, 0x5b1e2291
-0,         22,         22,        1,    36864, 0x2367706e
-0,         23,         23,        1,    36864, 0x88ef6b11
-0,         24,         24,        1,    36864, 0x85b73230
-0,         25,         25,        1,    36864, 0xe46cd522
-0,         26,         26,        1,    36864, 0x98489c05
-0,         27,         27,        1,    36864, 0x7e439564
-0,         28,         28,        1,    36864, 0x71330799
-0,         29,         29,        1,    36864, 0x81a6239e
-0,         30,         30,        1,    36864, 0x8005a302
-0,         31,         31,        1,    36864, 0xdf132e3f
-0,         32,         32,        1,    36864, 0x2a1d00de
-0,         33,         33,        1,    36864, 0x7bb57e14
-0,         34,         34,        1,    36864, 0xf2a637cf
-0,         35,         35,        1,    36864, 0xae6f6916
-0,         36,         36,        1,    36864, 0x2f1d4763
-0,         37,         37,        1,    36864, 0xa4e1145e
-0,         38,         38,        1,    36864, 0xc1644392
-0,         39,         39,        1,    36864, 0x21853537
-0,         40,         40,        1,    36864, 0x0bc45bac
-0,         41,         41,        1,    36864, 0x84ccb8ee
-0,         42,         42,        1,    36864, 0x65de651c
-0,         43,         43,        1,    36864, 0x33ff027e
-0,         44,         44,        1,    36864, 0xefe47056
-0,         45,         45,        1,    36864, 0x8952b47c
-0,         46,         46,        1,    36864, 0x78730fcf
-0,         47,         47,        1,    36864, 0x14bae79f
-0,         48,         48,        1,    36864, 0x53230fbe
-0,         49,         49,        1,    36864, 0x15b0b245
-0,         50,         50,        1,    36864, 0x45fbd155
-0,         51,         51,        1,    36864, 0x41cfbac4
-0,         52,         52,        1,    36864, 0x0d635d61
-0,         53,         53,        1,    36864, 0x55aa8d3c
-0,         54,         54,        1,    36864, 0x8f02fbaf
-0,         55,         55,        1,    36864, 0xb17fac3f
-0,         56,         56,        1,    36864, 0xc12627f9
-0,         57,         57,        1,    36864, 0xa5971e4a
-0,         58,         58,        1,    36864, 0x3677abfe
+0,         10,         10,        1,    36864, 0x49fab4fd
+0,         11,         11,        1,    36864, 0x975a7545
+0,         12,         12,        1,    36864, 0x9b080a2f
+0,         13,         13,        1,    36864, 0x78db960e
+0,         14,         14,        1,    36864, 0xd7a928d4
+0,         15,         15,        1,    36864, 0x0a83ba1b
+0,         16,         16,        1,    36864, 0xad6bb30c
+0,         17,         17,        1,    36864, 0xf6addb0d
+0,         18,         18,        1,    36864, 0x00540a0a
+0,         19,         19,        1,    36864, 0x049cc748
+0,         20,         20,        1,    36864, 0x5b1e2291
+0,         21,         21,        1,    36864, 0x2367706e
+0,         22,         22,        1,    36864, 0x88ef6b11
+0,         23,         23,        1,    36864, 0x85b73230
+0,         24,         24,        1,    36864, 0xe46cd522
+0,         25,         25,        1,    36864, 0x98489c05
+0,         26,         26,        1,    36864, 0x7e439564
+0,         27,         27,        1,    36864, 0x71330799
+0,         28,         28,        1,    36864, 0x81a6239e
+0,         29,         29,        1,    36864, 0x8005a302
+0,         30,         30,        1,    36864, 0xdf132e3f
+0,         31,         31,        1,    36864, 0x2a1d00de
+0,         32,         32,        1,    36864, 0x7bb57e14
+0,         33,         33,        1,    36864, 0xf2a637cf
+0,         34,         34,        1,    36864, 0xae6f6916
+0,         35,         35,        1,    36864, 0x2f1d4763
+0,         36,         36,        1,    36864, 0xa4e1145e
+0,         37,         37,        1,    36864, 0xc1644392
+0,         38,         38,        1,    36864, 0x21853537
+0,         39,         39,        1,    36864, 0x0bc45bac
+0,         40,         40,        1,    36864, 0x84ccb8ee
+0,         41,         41,        1,    36864, 0x65de651c
+0,         42,         42,        1,    36864, 0x33ff027e
+0,         43,         43,        1,    36864, 0xefe47056
+0,         44,         44,        1,    36864, 0x8952b47c
+0,         45,         45,        1,    36864, 0x78730fcf
+0,         46,         46,        1,    36864, 0x14bae79f
+0,         47,         47,        1,    36864, 0x53230fbe
+0,         48,         48,        1,    36864, 0x15b0b245
+0,         49,         49,        1,    36864, 0x45fbd155
+0,         50,         50,        1,    36864, 0x41cfbac4
+0,         51,         51,        1,    36864, 0x0d635d61
+0,         52,         52,        1,    36864, 0x55aa8d3c
+0,         53,         53,        1,    36864, 0x8f02fbaf
+0,         54,         54,        1,    36864, 0xb17fac3f
+0,         55,         55,        1,    36864, 0xc12627f9
+0,         56,         56,        1,    36864, 0xa5971e4a
+0,         57,         57,        1,    36864, 0x3677abfe
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_1_b b/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
index 688cd2a391b..cdabcceca6d 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
@@ -3,18 +3,18 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xc93c7c47
-0,          2,          2,        1,   518400, 0xa3f2e502
-0,          3,          3,        1,   518400, 0xb98920a4
-0,          4,          4,        1,   518400, 0xad098ec1
-0,          5,          5,        1,   518400, 0x3009b7aa
-0,          6,          6,        1,   518400, 0xcf514018
-0,          7,          7,        1,   518400, 0xd869038d
-0,          8,          8,        1,   518400, 0x3ce5e188
-0,          9,          9,        1,   518400, 0x029b4c14
-0,         10,         10,        1,   518400, 0xd2224afc
-0,         11,         11,        1,   518400, 0xbbca027c
-0,         12,         12,        1,   518400, 0x1f3fa0ac
-0,         13,         13,        1,   518400, 0x823b0125
-0,         14,         14,        1,   518400, 0xaaa27cfb
-0,         15,         15,        1,   518400, 0x5e926a4a
+0,          0,          0,        1,   518400, 0xc93c7c47
+0,          1,          1,        1,   518400, 0xa3f2e502
+0,          2,          2,        1,   518400, 0xb98920a4
+0,          3,          3,        1,   518400, 0xad098ec1
+0,          4,          4,        1,   518400, 0x3009b7aa
+0,          5,          5,        1,   518400, 0xcf514018
+0,          6,          6,        1,   518400, 0xd869038d
+0,          7,          7,        1,   518400, 0x3ce5e188
+0,          8,          8,        1,   518400, 0x029b4c14
+0,          9,          9,        1,   518400, 0xd2224afc
+0,         10,         10,        1,   518400, 0xbbca027c
+0,         11,         11,        1,   518400, 0x1f3fa0ac
+0,         12,         12,        1,   518400, 0x823b0125
+0,         13,         13,        1,   518400, 0xaaa27cfb
+0,         14,         14,        1,   518400, 0x5e926a4a
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_2_b b/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
index aa21e014653..0574f8ff87b 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
@@ -3,18 +3,18 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xc93c7c47
-0,          2,          2,        1,   518400, 0xf0c4b44a
-0,          3,          3,        1,   518400, 0x3f5dc91c
-0,          4,          4,        1,   518400, 0x03dc8453
-0,          5,          5,        1,   518400, 0x5e5227af
-0,          6,          6,        1,   518400, 0x9e7136af
-0,          7,          7,        1,   518400, 0x963a2e3a
-0,          8,          8,        1,   518400, 0xa544be6c
-0,          9,          9,        1,   518400, 0xefa1f63a
-0,         10,         10,        1,   518400, 0x62155ff1
-0,         11,         11,        1,   518400, 0x253eb857
-0,         12,         12,        1,   518400, 0x73530327
-0,         13,         13,        1,   518400, 0x8920c9a3
-0,         14,         14,        1,   518400, 0x4bdd038c
-0,         15,         15,        1,   518400, 0xea6016dd
+0,          0,          0,        1,   518400, 0xc93c7c47
+0,          1,          1,        1,   518400, 0xf0c4b44a
+0,          2,          2,        1,   518400, 0x3f5dc91c
+0,          3,          3,        1,   518400, 0x03dc8453
+0,          4,          4,        1,   518400, 0x5e5227af
+0,          5,          5,        1,   518400, 0x9e7136af
+0,          6,          6,        1,   518400, 0x963a2e3a
+0,          7,          7,        1,   518400, 0xa544be6c
+0,          8,          8,        1,   518400, 0xefa1f63a
+0,          9,          9,        1,   518400, 0x62155ff1
+0,         10,         10,        1,   518400, 0x253eb857
+0,         11,         11,        1,   518400, 0x73530327
+0,         12,         12,        1,   518400, 0x8920c9a3
+0,         13,         13,        1,   518400, 0x4bdd038c
+0,         14,         14,        1,   518400, 0xea6016dd
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_3_b b/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
index 45792a1b213..6a92245f2f1 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
@@ -3,18 +3,18 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x480
 #sar 0: 0/1
-0,          1,          1,        1,   518400, 0xc93c7c47
-0,          2,          2,        1,   518400, 0x7112ac25
-0,          3,          3,        1,   518400, 0x28bc28d2
-0,          4,          4,        1,   518400, 0x6fc36875
-0,          5,          5,        1,   518400, 0x3de99be0
-0,          6,          6,        1,   518400, 0x97125499
-0,          7,          7,        1,   518400, 0xb96fca3a
-0,          8,          8,        1,   518400, 0x1ec56c0f
-0,          9,          9,        1,   518400, 0xc65901d0
-0,         10,         10,        1,   518400, 0x2baa1bfa
-0,         11,         11,        1,   518400, 0x244fc6b7
-0,         12,         12,        1,   518400, 0xc3536383
-0,         13,         13,        1,   518400, 0xbcf40d5a
-0,         14,         14,        1,   518400, 0x955f4734
-0,         15,         15,        1,   518400, 0xe1b0275e
+0,          0,          0,        1,   518400, 0xc93c7c47
+0,          1,          1,        1,   518400, 0x7112ac25
+0,          2,          2,        1,   518400, 0x28bc28d2
+0,          3,          3,        1,   518400, 0x6fc36875
+0,          4,          4,        1,   518400, 0x3de99be0
+0,          5,          5,        1,   518400, 0x97125499
+0,          6,          6,        1,   518400, 0xb96fca3a
+0,          7,          7,        1,   518400, 0x1ec56c0f
+0,          8,          8,        1,   518400, 0xc65901d0
+0,          9,          9,        1,   518400, 0x2baa1bfa
+0,         10,         10,        1,   518400, 0x244fc6b7
+0,         11,         11,        1,   518400, 0xc3536383
+0,         12,         12,        1,   518400, 0xbcf40d5a
+0,         13,         13,        1,   518400, 0x955f4734
+0,         14,         14,        1,   518400, 0xe1b0275e
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 b/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
index 35168666ccf..8a7aa249f62 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
+++ b/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
@@ -5,16 +5,16 @@
 #sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xfb452a9c
-0,          3,          3,        1,   518400, 0x2f7a35bd
-0,          4,          4,        1,   518400, 0xe63e30b9
-0,          5,          5,        1,   518400, 0x39628205
-0,          6,          6,        1,   518400, 0x17fa1ea4
-0,          7,          7,        1,   518400, 0xd5ee83e2
-0,          8,          8,        1,   518400, 0x611ee98d
-0,          9,          9,        1,   518400, 0x07c1eeb8
-0,         10,         10,        1,   518400, 0x9dff3418
-0,         11,         11,        1,   518400, 0x87cd2f56
-0,         12,         12,        1,   518400, 0x88675628
-0,         13,         13,        1,   518400, 0x9bb8c9a0
-0,         14,         14,        1,   518400, 0xe6c1df00
-0,         15,         15,        1,   518400, 0xfcaab7a7
+0,          2,          2,        1,   518400, 0x2f7a35bd
+0,          3,          3,        1,   518400, 0xe63e30b9
+0,          4,          4,        1,   518400, 0x39628205
+0,          5,          5,        1,   518400, 0x17fa1ea4
+0,          6,          6,        1,   518400, 0xd5ee83e2
+0,          7,          7,        1,   518400, 0x611ee98d
+0,          8,          8,        1,   518400, 0x07c1eeb8
+0,          9,          9,        1,   518400, 0x9dff3418
+0,         10,         10,        1,   518400, 0x87cd2f56
+0,         11,         11,        1,   518400, 0x88675628
+0,         12,         12,        1,   518400, 0x9bb8c9a0
+0,         13,         13,        1,   518400, 0xe6c1df00
+0,         14,         14,        1,   518400, 0xfcaab7a7
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_2r b/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
index 9fb88701f54..ded91a9bede 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
+++ b/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
@@ -5,16 +5,16 @@
 #sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xfb452a9c
-0,          3,          3,        1,   518400, 0x2f7a35bd
-0,          4,          4,        1,   518400, 0xe63e30b9
-0,          5,          5,        1,   518400, 0x39628205
-0,          6,          6,        1,   518400, 0x17fa1ea4
-0,          7,          7,        1,   518400, 0xd5ee83e2
-0,          8,          8,        1,   518400, 0x4fd6d5c9
-0,          9,          9,        1,   518400, 0x8703c999
-0,         10,         10,        1,   518400, 0x1a87e2d3
-0,         11,         11,        1,   518400, 0xa27fc4d0
-0,         12,         12,        1,   518400, 0x6effab5d
-0,         13,         13,        1,   518400, 0x51ea02c9
-0,         14,         14,        1,   518400, 0xbcf84c88
-0,         15,         15,        1,   518400, 0x1d41076b
+0,          2,          2,        1,   518400, 0x2f7a35bd
+0,          3,          3,        1,   518400, 0xe63e30b9
+0,          4,          4,        1,   518400, 0x39628205
+0,          5,          5,        1,   518400, 0x17fa1ea4
+0,          6,          6,        1,   518400, 0xd5ee83e2
+0,          7,          7,        1,   518400, 0x4fd6d5c9
+0,          8,          8,        1,   518400, 0x8703c999
+0,          9,          9,        1,   518400, 0x1a87e2d3
+0,         10,         10,        1,   518400, 0xa27fc4d0
+0,         11,         11,        1,   518400, 0x6effab5d
+0,         12,         12,        1,   518400, 0x51ea02c9
+0,         13,         13,        1,   518400, 0xbcf84c88
+0,         14,         14,        1,   518400, 0x1d41076b
diff --git a/tests/ref/fate/h264-intra-refresh-recovery b/tests/ref/fate/h264-intra-refresh-recovery
index e85fe7bae86..a0a030fa100 100644
--- a/tests/ref/fate/h264-intra-refresh-recovery
+++ b/tests/ref/fate/h264-intra-refresh-recovery
@@ -3,13 +3,13 @@
 #codec_id 0: rawvideo
 #dimensions 0: 320x240
 #sar 0: 0/1
-0,         57,         57,        1,   115200, 0x4a17d50b
-0,         58,         58,        1,   115200, 0x1283d05b
-0,         59,         59,        1,   115200, 0x2747c650
-0,         60,         60,        1,   115200, 0xba23c933
-0,         61,         61,        1,   115200, 0x8a96c54b
-0,         62,         62,        1,   115200, 0x748ac6d3
-0,         63,         63,        1,   115200, 0x719ca491
-0,         64,         64,        1,   115200, 0x3d259d4d
-0,         65,         65,        1,   115200, 0xe3599aa8
-0,         66,         66,        1,   115200, 0x6fd4affe
+0,          0,          0,        1,   115200, 0x4a17d50b
+0,          1,          1,        1,   115200, 0x1283d05b
+0,          2,          2,        1,   115200, 0x2747c650
+0,          3,          3,        1,   115200, 0xba23c933
+0,          4,          4,        1,   115200, 0x8a96c54b
+0,          5,          5,        1,   115200, 0x748ac6d3
+0,          6,          6,        1,   115200, 0x719ca491
+0,          7,          7,        1,   115200, 0x3d259d4d
+0,          8,          8,        1,   115200, 0xe3599aa8
+0,          9,          9,        1,   115200, 0x6fd4affe
diff --git a/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1 b/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
index 046b1846f8d..fe890040e6f 100644
--- a/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
+++ b/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
@@ -7,48 +7,48 @@
 0,          1,          1,        1,   149760, 0x73610669
 0,          2,          2,        1,   149760, 0xc01620f4
 0,          3,          3,        1,   149760, 0x847a4297
-0,          8,          8,        1,   149760, 0x8b2db700
-0,          9,          9,        1,   149760, 0x17b1d77c
-0,         10,         10,        1,   149760, 0xc31ee8a5
-0,         11,         11,        1,   149760, 0x19541295
-0,         12,         12,        1,   149760, 0xd050be45
-0,         13,         13,        1,   149760, 0x45cf8e84
-0,         14,         14,        1,   149760, 0x0dd3e4d4
-0,         16,         16,        1,   149760, 0xc8347a7c
-0,         17,         17,        1,   149760, 0x24089674
-0,         18,         18,        1,   149760, 0xdf2c44e4
-0,         19,         19,        1,   149760, 0x83f5100b
-0,         20,         20,        1,   149760, 0x9a060faf
-0,         24,         24,        1,   149760, 0x4cdc6101
-0,         25,         25,        1,   149760, 0xe492ad68
-0,         26,         26,        1,   149760, 0x35b73887
-0,         27,         27,        1,   149760, 0x259f898a
-0,         28,         28,        1,   149760, 0x21df021b
-0,         29,         29,        1,   149760, 0xdddc1cfe
-0,         32,         32,        1,   149760, 0x53841bf5
-0,         33,         33,        1,   149760, 0x16745d74
-0,         34,         34,        1,   149760, 0x66e79e6a
-0,         35,         35,        1,   149760, 0x35f04b5a
-0,         40,         40,        1,   149760, 0x1472eee7
-0,         41,         41,        1,   149760, 0x42d0147c
-0,         42,         42,        1,   149760, 0x57c9bdc2
-0,         43,         43,        1,   149760, 0x20ad4cc7
-0,         44,         44,        1,   149760, 0x1617ef6c
-0,         45,         45,        1,   149760, 0xccdf4da2
-0,         46,         46,        1,   149760, 0xc173b762
-0,         47,         47,        1,   149760, 0xe7390c69
-0,         48,         48,        1,   149760, 0xfd0c97d3
-0,         49,         49,        1,   149760, 0xaeb2d61f
-0,         50,         50,        1,   149760, 0xe7b114d2
-0,         51,         51,        1,   149760, 0x1b771de4
-0,         52,         52,        1,   149760, 0xd3e03840
-0,         53,         53,        1,   149760, 0x702ef44b
-0,         57,         57,        1,   149760, 0xe96f848b
-0,         58,         58,        1,   149760, 0xa0ae24d9
-0,         59,         59,        1,   149760, 0x1b9efdfb
-0,         60,         60,        1,   149760, 0xceac9bc7
-0,         61,         61,        1,   149760, 0x73078700
-0,         62,         62,        1,   149760, 0xa736637e
-0,         63,         63,        1,   149760, 0xbd353c9d
-0,         64,         64,        1,   149760, 0x750a23ba
-0,         65,         65,        1,   149760, 0x4144c56e
+0,          4,          4,        1,   149760, 0x8b2db700
+0,          5,          5,        1,   149760, 0x17b1d77c
+0,          6,          6,        1,   149760, 0xc31ee8a5
+0,          7,          7,        1,   149760, 0x19541295
+0,          8,          8,        1,   149760, 0xd050be45
+0,          9,          9,        1,   149760, 0x45cf8e84
+0,         10,         10,        1,   149760, 0x0dd3e4d4
+0,         11,         11,        1,   149760, 0xc8347a7c
+0,         12,         12,        1,   149760, 0x24089674
+0,         13,         13,        1,   149760, 0xdf2c44e4
+0,         14,         14,        1,   149760, 0x83f5100b
+0,         15,         15,        1,   149760, 0x9a060faf
+0,         16,         16,        1,   149760, 0x4cdc6101
+0,         17,         17,        1,   149760, 0xe492ad68
+0,         18,         18,        1,   149760, 0x35b73887
+0,         19,         19,        1,   149760, 0x259f898a
+0,         20,         20,        1,   149760, 0x21df021b
+0,         21,         21,        1,   149760, 0xdddc1cfe
+0,         22,         22,        1,   149760, 0x53841bf5
+0,         23,         23,        1,   149760, 0x16745d74
+0,         24,         24,        1,   149760, 0x66e79e6a
+0,         25,         25,        1,   149760, 0x35f04b5a
+0,         26,         26,        1,   149760, 0x1472eee7
+0,         27,         27,        1,   149760, 0x42d0147c
+0,         28,         28,        1,   149760, 0x57c9bdc2
+0,         29,         29,        1,   149760, 0x20ad4cc7
+0,         30,         30,        1,   149760, 0x1617ef6c
+0,         31,         31,        1,   149760, 0xccdf4da2
+0,         32,         32,        1,   149760, 0xc173b762
+0,         33,         33,        1,   149760, 0xe7390c69
+0,         34,         34,        1,   149760, 0xfd0c97d3
+0,         35,         35,        1,   149760, 0xaeb2d61f
+0,         36,         36,        1,   149760, 0xe7b114d2
+0,         37,         37,        1,   149760, 0x1b771de4
+0,         38,         38,        1,   149760, 0xd3e03840
+0,         39,         39,        1,   149760, 0x702ef44b
+0,         40,         40,        1,   149760, 0xe96f848b
+0,         41,         41,        1,   149760, 0xa0ae24d9
+0,         42,         42,        1,   149760, 0x1b9efdfb
+0,         43,         43,        1,   149760, 0xceac9bc7
+0,         44,         44,        1,   149760, 0x73078700
+0,         45,         45,        1,   149760, 0xa736637e
+0,         46,         46,        1,   149760, 0xbd353c9d
+0,         47,         47,        1,   149760, 0x750a23ba
+0,         48,         48,        1,   149760, 0x4144c56e
diff --git a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
index a375c4806e3..7ac223ef7bf 100644
--- a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
+++ b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
@@ -25,15 +25,15 @@
 0,         19,         19,        1,   149760, 0x0580f2be
 0,         20,         20,        1,   149760, 0x8e4cea96
 0,         21,         21,        1,   149760, 0x6c98d019
-0,         24,         24,        1,   149760, 0x842803c8
-0,         25,         25,        1,   149760, 0xddc196ee
-0,         26,         26,        1,   149760, 0x89e45523
-0,         27,         27,        1,   149760, 0x2a36b008
-0,         28,         28,        1,   149760, 0x14a319f7
-0,         29,         29,        1,   149760, 0x7394854c
-0,         30,         30,        1,   149760, 0x26dcf933
-0,         31,         31,        1,   149760, 0x5b000b7e
-0,         32,         32,        1,   149760, 0x6e76bded
-0,         33,         33,        1,   149760, 0x0284d92d
-0,         34,         34,        1,   149760, 0xf14a25e0
-0,         35,         35,        1,   149760, 0x10c03d98
+0,         22,         22,        1,   149760, 0x842803c8
+0,         23,         23,        1,   149760, 0xddc196ee
+0,         24,         24,        1,   149760, 0x89e45523
+0,         25,         25,        1,   149760, 0x2a36b008
+0,         26,         26,        1,   149760, 0x14a319f7
+0,         27,         27,        1,   149760, 0x7394854c
+0,         28,         28,        1,   149760, 0x26dcf933
+0,         29,         29,        1,   149760, 0x5b000b7e
+0,         30,         30,        1,   149760, 0x6e76bded
+0,         31,         31,        1,   149760, 0x0284d92d
+0,         32,         32,        1,   149760, 0xf14a25e0
+0,         33,         33,        1,   149760, 0x10c03d98
diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
index 0c930f6556c..5de9da9a397 100644
--- a/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
+++ b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
@@ -25,21 +25,21 @@
 0,         19,         19,        1,   599040, 0x4227009b
 0,         20,         20,        1,   599040, 0x1bda8be4
 0,         21,         21,        1,   599040, 0xd1d5dcb4
-0,         32,         32,        1,   599040, 0x00a0249f
-0,         33,         33,        1,   599040, 0x7263f7cf
-0,         34,         34,        1,   599040, 0x47054be4
-0,         35,         35,        1,   599040, 0xda083f52
-0,         36,         36,        1,   599040, 0xf2906ab1
-0,         37,         37,        1,   599040, 0x20936797
-0,         38,         38,        1,   599040, 0x644d7c3e
-0,         39,         39,        1,   599040, 0x7c00e8bf
-0,         40,         40,        1,   599040, 0x041f8a48
-0,         41,         41,        1,   599040, 0xcef6e936
-0,         42,         42,        1,   599040, 0x361461e9
-0,         43,         43,        1,   599040, 0xf663ba0a
-0,         44,         44,        1,   599040, 0x4d3371d3
-0,         45,         45,        1,   599040, 0xed6b5c92
-0,         46,         46,        1,   599040, 0xdec67f6e
-0,         47,         47,        1,   599040, 0xbafa50c0
-0,         48,         48,        1,   599040, 0xc9181637
-0,         49,         49,        1,   599040, 0x95834e17
+0,         22,         22,        1,   599040, 0x00a0249f
+0,         23,         23,        1,   599040, 0x7263f7cf
+0,         24,         24,        1,   599040, 0x47054be4
+0,         25,         25,        1,   599040, 0xda083f52
+0,         26,         26,        1,   599040, 0xf2906ab1
+0,         27,         27,        1,   599040, 0x20936797
+0,         28,         28,        1,   599040, 0x644d7c3e
+0,         29,         29,        1,   599040, 0x7c00e8bf
+0,         30,         30,        1,   599040, 0x041f8a48
+0,         31,         31,        1,   599040, 0xcef6e936
+0,         32,         32,        1,   599040, 0x361461e9
+0,         33,         33,        1,   599040, 0xf663ba0a
+0,         34,         34,        1,   599040, 0x4d3371d3
+0,         35,         35,        1,   599040, 0xed6b5c92
+0,         36,         36,        1,   599040, 0xdec67f6e
+0,         37,         37,        1,   599040, 0xbafa50c0
+0,         38,         38,        1,   599040, 0xc9181637
+0,         39,         39,        1,   599040, 0x95834e17
diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
index 83fd3bc313f..f107e937d7f 100644
--- a/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
+++ b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
@@ -25,28 +25,28 @@
 0,         19,         19,        1,   599040, 0x4227009b
 0,         20,         20,        1,   599040, 0x1bda8be4
 0,         21,         21,        1,   599040, 0xd1d5dcb4
-0,         25,         25,        1,   599040, 0x00d87745
-0,         26,         26,        1,   599040, 0x9b689b16
-0,         27,         27,        1,   599040, 0x40ae530a
-0,         28,         28,        1,   599040, 0x8284f649
-0,         29,         29,        1,   599040, 0x37423ae4
-0,         30,         30,        1,   599040, 0xb3f72b02
-0,         31,         31,        1,   599040, 0xc0cc5860
-0,         32,         32,        1,   599040, 0x00a0249f
-0,         33,         33,        1,   599040, 0x7263f7cf
-0,         34,         34,        1,   599040, 0x47054be4
-0,         35,         35,        1,   599040, 0xda083f52
-0,         36,         36,        1,   599040, 0xf2906ab1
-0,         37,         37,        1,   599040, 0x20936797
-0,         38,         38,        1,   599040, 0x644d7c3e
-0,         39,         39,        1,   599040, 0x7c00e8bf
-0,         40,         40,        1,   599040, 0x041f8a48
-0,         41,         41,        1,   599040, 0xcef6e936
-0,         42,         42,        1,   599040, 0x361461e9
-0,         43,         43,        1,   599040, 0xf663ba0a
-0,         44,         44,        1,   599040, 0x4d3371d3
-0,         45,         45,        1,   599040, 0xed6b5c92
-0,         46,         46,        1,   599040, 0xdec67f6e
-0,         47,         47,        1,   599040, 0xbafa50c0
-0,         48,         48,        1,   599040, 0xc9181637
-0,         49,         49,        1,   599040, 0x95834e17
+0,         22,         22,        1,   599040, 0x00d87745
+0,         23,         23,        1,   599040, 0x9b689b16
+0,         24,         24,        1,   599040, 0x40ae530a
+0,         25,         25,        1,   599040, 0x8284f649
+0,         26,         26,        1,   599040, 0x37423ae4
+0,         27,         27,        1,   599040, 0xb3f72b02
+0,         28,         28,        1,   599040, 0xc0cc5860
+0,         29,         29,        1,   599040, 0x00a0249f
+0,         30,         30,        1,   599040, 0x7263f7cf
+0,         31,         31,        1,   599040, 0x47054be4
+0,         32,         32,        1,   599040, 0xda083f52
+0,         33,         33,        1,   599040, 0xf2906ab1
+0,         34,         34,        1,   599040, 0x20936797
+0,         35,         35,        1,   599040, 0x644d7c3e
+0,         36,         36,        1,   599040, 0x7c00e8bf
+0,         37,         37,        1,   599040, 0x041f8a48
+0,         38,         38,        1,   599040, 0xcef6e936
+0,         39,         39,        1,   599040, 0x361461e9
+0,         40,         40,        1,   599040, 0xf663ba0a
+0,         41,         41,        1,   599040, 0x4d3371d3
+0,         42,         42,        1,   599040, 0xed6b5c92
+0,         43,         43,        1,   599040, 0xdec67f6e
+0,         44,         44,        1,   599040, 0xbafa50c0
+0,         45,         45,        1,   599040, 0xc9181637
+0,         46,         46,        1,   599040, 0x95834e17
diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
index e71e3131a05..cc4a22f92e4 100644
--- a/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
+++ b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
@@ -42,62 +42,62 @@
 0,         36,         36,        1,   599040, 0xd2152e6b
 0,         37,         37,        1,   599040, 0xe4c37cc7
 0,         38,         38,        1,   599040, 0xec3393c3
-0,         40,         40,        1,   599040, 0x1fe16574
-0,         41,         41,        1,   599040, 0xa3a8c14d
-0,         42,         42,        1,   599040, 0x32eb90aa
-0,         43,         43,        1,   599040, 0xebca8310
-0,         44,         44,        1,   599040, 0x7888627f
-0,         45,         45,        1,   599040, 0xe048335c
-0,         46,         46,        1,   599040, 0xe2262b9c
-0,         47,         47,        1,   599040, 0xb8c2b115
-0,         48,         48,        1,   599040, 0x2ff4194b
-0,         49,         49,        1,   599040, 0x3a9b5520
-0,         50,         50,        1,   599040, 0xbd8c0486
-0,         51,         51,        1,   599040, 0xc8b8f29e
-0,         52,         52,        1,   599040, 0xbc12f62c
-0,         53,         53,        1,   599040, 0x04bb6438
-0,         54,         54,        1,   599040, 0x07971646
-0,         55,         55,        1,   599040, 0x0193dabe
-0,         56,         56,        1,   599040, 0x20f41d9e
-0,         57,         57,        1,   599040, 0x04b40718
-0,         58,         58,        1,   599040, 0x75d2c51c
-0,         59,         59,        1,   599040, 0x9b8c2c50
-0,         60,         60,        1,   599040, 0x970e39ea
-0,         61,         61,        1,   599040, 0x7c4264aa
-0,         62,         62,        1,   599040, 0xe939a6fd
-0,         63,         63,        1,   599040, 0xc8b95f8d
-0,         64,         64,        1,   599040, 0x9e2f384a
-0,         65,         65,        1,   599040, 0x7dc74724
-0,         66,         66,        1,   599040, 0x7e93bc5f
-0,         67,         67,        1,   599040, 0x99b2c09d
-0,         68,         68,        1,   599040, 0x284e436f
-0,         69,         69,        1,   599040, 0xaa303eee
-0,         70,         70,        1,   599040, 0x65e54342
-0,         71,         71,        1,   599040, 0x2fe183cd
-0,         72,         72,        1,   599040, 0x5953c191
-0,         74,         74,        1,   599040, 0x0fc9a701
-0,         75,         75,        1,   599040, 0x0eea5327
-0,         76,         76,        1,   599040, 0x118752f1
-0,         77,         77,        1,   599040, 0x778c7711
-0,         78,         78,        1,   599040, 0x6f3ad6a5
-0,         79,         79,        1,   599040, 0xf70fcd3d
-0,         80,         80,        1,   599040, 0x85a366cb
-0,         81,         81,        1,   599040, 0xdda47432
-0,         82,         82,        1,   599040, 0x86379004
-0,         83,         83,        1,   599040, 0xfc539512
-0,         84,         84,        1,   599040, 0x04e70786
-0,         85,         85,        1,   599040, 0x7dddc8f7
-0,         86,         86,        1,   599040, 0xa76a3b6e
-0,         87,         87,        1,   599040, 0x44183060
-0,         88,         88,        1,   599040, 0x6f691c5a
-0,         89,         89,        1,   599040, 0x39d25e12
-0,         90,         90,        1,   599040, 0xfe3aad0d
-0,         91,         91,        1,   599040, 0x57f76928
-0,         92,         92,        1,   599040, 0x4e68eed5
-0,         93,         93,        1,   599040, 0x3a589d50
-0,         94,         94,        1,   599040, 0x92ec69b8
-0,         95,         95,        1,   599040, 0x9f78926e
-0,         96,         96,        1,   599040, 0xa1ca1b1d
-0,         97,         97,        1,   599040, 0x140240eb
-0,         98,         98,        1,   599040, 0x61fa01af
-0,         99,         99,        1,   599040, 0x79f9e3ae
+0,         39,         39,        1,   599040, 0x1fe16574
+0,         40,         40,        1,   599040, 0xa3a8c14d
+0,         41,         41,        1,   599040, 0x32eb90aa
+0,         42,         42,        1,   599040, 0xebca8310
+0,         43,         43,        1,   599040, 0x7888627f
+0,         44,         44,        1,   599040, 0xe048335c
+0,         45,         45,        1,   599040, 0xe2262b9c
+0,         46,         46,        1,   599040, 0xb8c2b115
+0,         47,         47,        1,   599040, 0x2ff4194b
+0,         48,         48,        1,   599040, 0x3a9b5520
+0,         49,         49,        1,   599040, 0xbd8c0486
+0,         50,         50,        1,   599040, 0xc8b8f29e
+0,         51,         51,        1,   599040, 0xbc12f62c
+0,         52,         52,        1,   599040, 0x04bb6438
+0,         53,         53,        1,   599040, 0x07971646
+0,         54,         54,        1,   599040, 0x0193dabe
+0,         55,         55,        1,   599040, 0x20f41d9e
+0,         56,         56,        1,   599040, 0x04b40718
+0,         57,         57,        1,   599040, 0x75d2c51c
+0,         58,         58,        1,   599040, 0x9b8c2c50
+0,         59,         59,        1,   599040, 0x970e39ea
+0,         60,         60,        1,   599040, 0x7c4264aa
+0,         61,         61,        1,   599040, 0xe939a6fd
+0,         62,         62,        1,   599040, 0xc8b95f8d
+0,         63,         63,        1,   599040, 0x9e2f384a
+0,         64,         64,        1,   599040, 0x7dc74724
+0,         65,         65,        1,   599040, 0x7e93bc5f
+0,         66,         66,        1,   599040, 0x99b2c09d
+0,         67,         67,        1,   599040, 0x284e436f
+0,         68,         68,        1,   599040, 0xaa303eee
+0,         69,         69,        1,   599040, 0x65e54342
+0,         70,         70,        1,   599040, 0x2fe183cd
+0,         71,         71,        1,   599040, 0x5953c191
+0,         72,         72,        1,   599040, 0x0fc9a701
+0,         73,         73,        1,   599040, 0x0eea5327
+0,         74,         74,        1,   599040, 0x118752f1
+0,         75,         75,        1,   599040, 0x778c7711
+0,         76,         76,        1,   599040, 0x6f3ad6a5
+0,         77,         77,        1,   599040, 0xf70fcd3d
+0,         78,         78,        1,   599040, 0x85a366cb
+0,         79,         79,        1,   599040, 0xdda47432
+0,         80,         80,        1,   599040, 0x86379004
+0,         81,         81,        1,   599040, 0xfc539512
+0,         82,         82,        1,   599040, 0x04e70786
+0,         83,         83,        1,   599040, 0x7dddc8f7
+0,         84,         84,        1,   599040, 0xa76a3b6e
+0,         85,         85,        1,   599040, 0x44183060
+0,         86,         86,        1,   599040, 0x6f691c5a
+0,         87,         87,        1,   599040, 0x39d25e12
+0,         88,         88,        1,   599040, 0xfe3aad0d
+0,         89,         89,        1,   599040, 0x57f76928
+0,         90,         90,        1,   599040, 0x4e68eed5
+0,         91,         91,        1,   599040, 0x3a589d50
+0,         92,         92,        1,   599040, 0x92ec69b8
+0,         93,         93,        1,   599040, 0x9f78926e
+0,         94,         94,        1,   599040, 0xa1ca1b1d
+0,         95,         95,        1,   599040, 0x140240eb
+0,         96,         96,        1,   599040, 0x61fa01af
+0,         97,         97,        1,   599040, 0x79f9e3ae
diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
index ffc4f517737..233b0426719 100644
--- a/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
+++ b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
@@ -18,84 +18,84 @@
 0,         12,         12,        1,   599040, 0x1991f1f9
 0,         13,         13,        1,   599040, 0x36e54ba2
 0,         14,         14,        1,   599040, 0x698ce0c6
-0,         16,         16,        1,   599040, 0xc6dd131e
-0,         17,         17,        1,   599040, 0x0a22f4c5
-0,         18,         18,        1,   599040, 0xd6a0c196
-0,         19,         19,        1,   599040, 0x699a3e69
-0,         20,         20,        1,   599040, 0x4227009b
-0,         21,         21,        1,   599040, 0xd1d5dcb4
-0,         22,         22,        1,   599040, 0x58b2edb3
-0,         23,         23,        1,   599040, 0xd1f795d8
-0,         24,         24,        1,   599040, 0x3331d5e6
-0,         25,         25,        1,   599040, 0x5e5ec2c9
-0,         26,         26,        1,   599040, 0x3b907bf5
-0,         27,         27,        1,   599040, 0xefcbf471
-0,         28,         28,        1,   599040, 0x2769a578
-0,         30,         30,        1,   599040, 0x812ce986
-0,         31,         31,        1,   599040, 0xf07c212c
-0,         32,         32,        1,   599040, 0x00a0249f
-0,         33,         33,        1,   599040, 0x7263f7cf
-0,         34,         34,        1,   599040, 0x47054be4
-0,         35,         35,        1,   599040, 0xda083f52
-0,         36,         36,        1,   599040, 0xf2906ab1
-0,         37,         37,        1,   599040, 0x20936797
-0,         38,         38,        1,   599040, 0x644d7c3e
-0,         39,         39,        1,   599040, 0x7c00e8bf
-0,         40,         40,        1,   599040, 0x041f8a48
-0,         41,         41,        1,   599040, 0xcef6e936
-0,         42,         42,        1,   599040, 0x361461e9
-0,         43,         43,        1,   599040, 0xf663ba0a
-0,         44,         44,        1,   599040, 0x4d3371d3
-0,         45,         45,        1,   599040, 0xed6b5c92
-0,         47,         47,        1,   599040, 0xdec67f6e
-0,         48,         48,        1,   599040, 0xbafa50c0
-0,         49,         49,        1,   599040, 0xc9181637
-0,         50,         50,        1,   599040, 0x29eadcac
-0,         51,         51,        1,   599040, 0xb258430f
-0,         52,         52,        1,   599040, 0x49dc8716
-0,         53,         53,        1,   599040, 0x80b0a3b3
-0,         54,         54,        1,   599040, 0x5d8275a7
-0,         55,         55,        1,   599040, 0xe236242d
-0,         56,         56,        1,   599040, 0x3e14bb43
-0,         57,         57,        1,   599040, 0x20e6e2d7
-0,         58,         58,        1,   599040, 0x19cad4ee
-0,         59,         59,        1,   599040, 0x13fd16f1
-0,         60,         60,        1,   599040, 0x98e56b95
-0,         61,         61,        1,   599040, 0x028e4c6a
-0,         63,         63,        1,   599040, 0x5bd1131d
-0,         64,         64,        1,   599040, 0x0afe3873
-0,         65,         65,        1,   599040, 0xea93e425
-0,         66,         66,        1,   599040, 0xeb301be1
-0,         67,         67,        1,   599040, 0x443ca0a3
-0,         68,         68,        1,   599040, 0xb68b40a1
-0,         69,         69,        1,   599040, 0xf58f75b9
-0,         70,         70,        1,   599040, 0xefa27c52
-0,         71,         71,        1,   599040, 0xac676fa5
-0,         72,         72,        1,   599040, 0x688d1582
-0,         73,         73,        1,   599040, 0x9067a4ef
-0,         74,         74,        1,   599040, 0xdc753d6c
-0,         75,         75,        1,   599040, 0x6f6da304
-0,         76,         76,        1,   599040, 0xa7606f97
-0,         77,         77,        1,   599040, 0xb53c8c18
-0,         78,         78,        1,   599040, 0x3572d550
-0,         79,         79,        1,   599040, 0x123d5423
-0,         80,         80,        1,   599040, 0x89f11e50
-0,         81,         81,        1,   599040, 0x702649cc
-0,         82,         82,        1,   599040, 0x2b4767c4
-0,         83,         83,        1,   599040, 0xf18b9628
-0,         84,         84,        1,   599040, 0x1ef72a6b
-0,         85,         85,        1,   599040, 0x0a8c9641
-0,         86,         86,        1,   599040, 0xf2fa0233
-0,         87,         87,        1,   599040, 0x99385e51
-0,         88,         88,        1,   599040, 0x77b413cf
-0,         89,         89,        1,   599040, 0x6360c9e3
-0,         90,         90,        1,   599040, 0xe216b383
-0,         91,         91,        1,   599040, 0x54df8826
-0,         92,         92,        1,   599040, 0x6691e1ee
-0,         93,         93,        1,   599040, 0x37bebd20
-0,         94,         94,        1,   599040, 0xf05184e4
-0,         95,         95,        1,   599040, 0xbd7fab4f
-0,         96,         96,        1,   599040, 0x70211cdc
-0,         97,         97,        1,   599040, 0x4f4c375b
-0,         98,         98,        1,   599040, 0x2d645b5a
-0,         99,         99,        1,   599040, 0x475d263f
+0,         15,         15,        1,   599040, 0xc6dd131e
+0,         16,         16,        1,   599040, 0x0a22f4c5
+0,         17,         17,        1,   599040, 0xd6a0c196
+0,         18,         18,        1,   599040, 0x699a3e69
+0,         19,         19,        1,   599040, 0x4227009b
+0,         20,         20,        1,   599040, 0xd1d5dcb4
+0,         21,         21,        1,   599040, 0x58b2edb3
+0,         22,         22,        1,   599040, 0xd1f795d8
+0,         23,         23,        1,   599040, 0x3331d5e6
+0,         24,         24,        1,   599040, 0x5e5ec2c9
+0,         25,         25,        1,   599040, 0x3b907bf5
+0,         26,         26,        1,   599040, 0xefcbf471
+0,         27,         27,        1,   599040, 0x2769a578
+0,         28,         28,        1,   599040, 0x812ce986
+0,         29,         29,        1,   599040, 0xf07c212c
+0,         30,         30,        1,   599040, 0x00a0249f
+0,         31,         31,        1,   599040, 0x7263f7cf
+0,         32,         32,        1,   599040, 0x47054be4
+0,         33,         33,        1,   599040, 0xda083f52
+0,         34,         34,        1,   599040, 0xf2906ab1
+0,         35,         35,        1,   599040, 0x20936797
+0,         36,         36,        1,   599040, 0x644d7c3e
+0,         37,         37,        1,   599040, 0x7c00e8bf
+0,         38,         38,        1,   599040, 0x041f8a48
+0,         39,         39,        1,   599040, 0xcef6e936
+0,         40,         40,        1,   599040, 0x361461e9
+0,         41,         41,        1,   599040, 0xf663ba0a
+0,         42,         42,        1,   599040, 0x4d3371d3
+0,         43,         43,        1,   599040, 0xed6b5c92
+0,         44,         44,        1,   599040, 0xdec67f6e
+0,         45,         45,        1,   599040, 0xbafa50c0
+0,         46,         46,        1,   599040, 0xc9181637
+0,         47,         47,        1,   599040, 0x29eadcac
+0,         48,         48,        1,   599040, 0xb258430f
+0,         49,         49,        1,   599040, 0x49dc8716
+0,         50,         50,        1,   599040, 0x80b0a3b3
+0,         51,         51,        1,   599040, 0x5d8275a7
+0,         52,         52,        1,   599040, 0xe236242d
+0,         53,         53,        1,   599040, 0x3e14bb43
+0,         54,         54,        1,   599040, 0x20e6e2d7
+0,         55,         55,        1,   599040, 0x19cad4ee
+0,         56,         56,        1,   599040, 0x13fd16f1
+0,         57,         57,        1,   599040, 0x98e56b95
+0,         58,         58,        1,   599040, 0x028e4c6a
+0,         59,         59,        1,   599040, 0x5bd1131d
+0,         60,         60,        1,   599040, 0x0afe3873
+0,         61,         61,        1,   599040, 0xea93e425
+0,         62,         62,        1,   599040, 0xeb301be1
+0,         63,         63,        1,   599040, 0x443ca0a3
+0,         64,         64,        1,   599040, 0xb68b40a1
+0,         65,         65,        1,   599040, 0xf58f75b9
+0,         66,         66,        1,   599040, 0xefa27c52
+0,         67,         67,        1,   599040, 0xac676fa5
+0,         68,         68,        1,   599040, 0x688d1582
+0,         69,         69,        1,   599040, 0x9067a4ef
+0,         70,         70,        1,   599040, 0xdc753d6c
+0,         71,         71,        1,   599040, 0x6f6da304
+0,         72,         72,        1,   599040, 0xa7606f97
+0,         73,         73,        1,   599040, 0xb53c8c18
+0,         74,         74,        1,   599040, 0x3572d550
+0,         75,         75,        1,   599040, 0x123d5423
+0,         76,         76,        1,   599040, 0x89f11e50
+0,         77,         77,        1,   599040, 0x702649cc
+0,         78,         78,        1,   599040, 0x2b4767c4
+0,         79,         79,        1,   599040, 0xf18b9628
+0,         80,         80,        1,   599040, 0x1ef72a6b
+0,         81,         81,        1,   599040, 0x0a8c9641
+0,         82,         82,        1,   599040, 0xf2fa0233
+0,         83,         83,        1,   599040, 0x99385e51
+0,         84,         84,        1,   599040, 0x77b413cf
+0,         85,         85,        1,   599040, 0x6360c9e3
+0,         86,         86,        1,   599040, 0xe216b383
+0,         87,         87,        1,   599040, 0x54df8826
+0,         88,         88,        1,   599040, 0x6691e1ee
+0,         89,         89,        1,   599040, 0x37bebd20
+0,         90,         90,        1,   599040, 0xf05184e4
+0,         91,         91,        1,   599040, 0xbd7fab4f
+0,         92,         92,        1,   599040, 0x70211cdc
+0,         93,         93,        1,   599040, 0x4f4c375b
+0,         94,         94,        1,   599040, 0x2d645b5a
+0,         95,         95,        1,   599040, 0x475d263f
diff --git a/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 b/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
index fbbedb236c4..51ea08b5845 100644
--- a/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
+++ b/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
@@ -3,89 +3,89 @@
 #codec_id 0: rawvideo
 #dimensions 0: 416x240
 #sar 0: 0/1
-0,          7,          7,        1,   149760, 0x1ae5f13d
-0,          8,          8,        1,   149760, 0x0a6ad0e3
-0,          9,          9,        1,   149760, 0x2415af05
-0,         10,         10,        1,   149760, 0xf50f6eef
-0,         11,         11,        1,   149760, 0xef65835c
-0,         12,         12,        1,   149760, 0x4929b5cb
-0,         13,         13,        1,   149760, 0x165c6f55
-0,         14,         14,        1,   149760, 0x9caaa249
-0,         15,         15,        1,   149760, 0x6c25c4cf
-0,         16,         16,        1,   149760, 0x4678cef0
-0,         17,         17,        1,   149760, 0x72e04433
-0,         18,         18,        1,   149760, 0x36f8aa9d
-0,         19,         19,        1,   149760, 0x255189ad
-0,         20,         20,        1,   149760, 0x712d7f7f
-0,         21,         21,        1,   149760, 0x4d088988
-0,         22,         22,        1,   149760, 0xc0da3925
-0,         23,         23,        1,   149760, 0x9990db7c
-0,         24,         24,        1,   149760, 0xb02cc0e8
-0,         25,         25,        1,   149760, 0x3e859d8f
-0,         26,         26,        1,   149760, 0xce786bc1
-0,         27,         27,        1,   149760, 0x87555e5f
-0,         28,         28,        1,   149760, 0x3c95fb7e
-0,         29,         29,        1,   149760, 0xf092b65e
-0,         30,         30,        1,   149760, 0x7db2c04c
-0,         31,         31,        1,   149760, 0x7d39eb21
-0,         32,         32,        1,   149760, 0x2cfd7d57
-0,         33,         33,        1,   149760, 0xb1902c06
-0,         34,         34,        1,   149760, 0xe0eae1d7
-0,         35,         35,        1,   149760, 0xf8212977
-0,         36,         36,        1,   149760, 0x6cb31328
-0,         37,         37,        1,   149760, 0x862ab736
-0,         38,         38,        1,   149760, 0xc7a87f44
-0,         39,         39,        1,   149760, 0x8ff7a1a1
-0,         40,         40,        1,   149760, 0xd7bee49b
-0,         41,         41,        1,   149760, 0x1925db84
-0,         42,         42,        1,   149760, 0xf32a7dc6
-0,         43,         43,        1,   149760, 0x02a1e3b6
-0,         44,         44,        1,   149760, 0xb6398aad
-0,         45,         45,        1,   149760, 0xa3756e2d
-0,         46,         46,        1,   149760, 0xf90f3732
-0,         47,         47,        1,   149760, 0x3b05115a
-0,         48,         48,        1,   149760, 0x81ca9bdb
-0,         49,         49,        1,   149760, 0xa75ee938
-0,         50,         50,        1,   149760, 0x9e5c232f
-0,         51,         51,        1,   149760, 0x64cb04e9
-0,         52,         52,        1,   149760, 0x4064df52
-0,         53,         53,        1,   149760, 0x47fa0afc
-0,         54,         54,        1,   149760, 0xd209252e
-0,         55,         55,        1,   149760, 0x2f811f02
-0,         56,         56,        1,   149760, 0x733b6721
-0,         57,         57,        1,   149760, 0x30b12427
-0,         58,         58,        1,   149760, 0xdf58d3e2
-0,         59,         59,        1,   149760, 0xc144d7be
-0,         60,         60,        1,   149760, 0x48f0ac79
-0,         61,         61,        1,   149760, 0xb8d8a2c6
-0,         62,         62,        1,   149760, 0x2a7d916d
-0,         63,         63,        1,   149760, 0xd9d38cd5
-0,         64,         64,        1,   149760, 0xd7c7f9a6
-0,         65,         65,        1,   149760, 0x64d0df7a
-0,         66,         66,        1,   149760, 0x4e365cff
-0,         67,         67,        1,   149760, 0x74bc2a8b
-0,         68,         68,        1,   149760, 0x70a7cd2b
-0,         69,         69,        1,   149760, 0x0836b51e
-0,         70,         70,        1,   149760, 0xbc37b5d7
-0,         71,         71,        1,   149760, 0xb6d651e5
-0,         72,         72,        1,   149760, 0x7aa0e35f
-0,         73,         73,        1,   149760, 0x0fbc89a3
-0,         74,         74,        1,   149760, 0x2ca2f2a6
-0,         75,         75,        1,   149760, 0xf742c5c5
-0,         76,         76,        1,   149760, 0x4117208f
-0,         77,         77,        1,   149760, 0xec392efb
-0,         78,         78,        1,   149760, 0xbfba5063
-0,         79,         79,        1,   149760, 0xb2499f48
-0,         80,         80,        1,   149760, 0xf1183244
-0,         81,         81,        1,   149760, 0x364a6400
-0,         82,         82,        1,   149760, 0xfcfddf36
-0,         83,         83,        1,   149760, 0xbcc1b37e
-0,         84,         84,        1,   149760, 0xab364748
-0,         85,         85,        1,   149760, 0xebb27fcd
-0,         86,         86,        1,   149760, 0xe2e7a723
-0,         87,         87,        1,   149760, 0xf671b5e0
-0,         88,         88,        1,   149760, 0xbf0cc349
-0,         89,         89,        1,   149760, 0xf195d868
-0,         90,         90,        1,   149760, 0xe0097460
-0,         91,         91,        1,   149760, 0x3d4c1812
-0,         92,         92,        1,   149760, 0x133cd867
+0,          0,          0,        1,   149760, 0x1ae5f13d
+0,          1,          1,        1,   149760, 0x0a6ad0e3
+0,          2,          2,        1,   149760, 0x2415af05
+0,          3,          3,        1,   149760, 0xf50f6eef
+0,          4,          4,        1,   149760, 0xef65835c
+0,          5,          5,        1,   149760, 0x4929b5cb
+0,          6,          6,        1,   149760, 0x165c6f55
+0,          7,          7,        1,   149760, 0x9caaa249
+0,          8,          8,        1,   149760, 0x6c25c4cf
+0,          9,          9,        1,   149760, 0x4678cef0
+0,         10,         10,        1,   149760, 0x72e04433
+0,         11,         11,        1,   149760, 0x36f8aa9d
+0,         12,         12,        1,   149760, 0x255189ad
+0,         13,         13,        1,   149760, 0x712d7f7f
+0,         14,         14,        1,   149760, 0x4d088988
+0,         15,         15,        1,   149760, 0xc0da3925
+0,         16,         16,        1,   149760, 0x9990db7c
+0,         17,         17,        1,   149760, 0xb02cc0e8
+0,         18,         18,        1,   149760, 0x3e859d8f
+0,         19,         19,        1,   149760, 0xce786bc1
+0,         20,         20,        1,   149760, 0x87555e5f
+0,         21,         21,        1,   149760, 0x3c95fb7e
+0,         22,         22,        1,   149760, 0xf092b65e
+0,         23,         23,        1,   149760, 0x7db2c04c
+0,         24,         24,        1,   149760, 0x7d39eb21
+0,         25,         25,        1,   149760, 0x2cfd7d57
+0,         26,         26,        1,   149760, 0xb1902c06
+0,         27,         27,        1,   149760, 0xe0eae1d7
+0,         28,         28,        1,   149760, 0xf8212977
+0,         29,         29,        1,   149760, 0x6cb31328
+0,         30,         30,        1,   149760, 0x862ab736
+0,         31,         31,        1,   149760, 0xc7a87f44
+0,         32,         32,        1,   149760, 0x8ff7a1a1
+0,         33,         33,        1,   149760, 0xd7bee49b
+0,         34,         34,        1,   149760, 0x1925db84
+0,         35,         35,        1,   149760, 0xf32a7dc6
+0,         36,         36,        1,   149760, 0x02a1e3b6
+0,         37,         37,        1,   149760, 0xb6398aad
+0,         38,         38,        1,   149760, 0xa3756e2d
+0,         39,         39,        1,   149760, 0xf90f3732
+0,         40,         40,        1,   149760, 0x3b05115a
+0,         41,         41,        1,   149760, 0x81ca9bdb
+0,         42,         42,        1,   149760, 0xa75ee938
+0,         43,         43,        1,   149760, 0x9e5c232f
+0,         44,         44,        1,   149760, 0x64cb04e9
+0,         45,         45,        1,   149760, 0x4064df52
+0,         46,         46,        1,   149760, 0x47fa0afc
+0,         47,         47,        1,   149760, 0xd209252e
+0,         48,         48,        1,   149760, 0x2f811f02
+0,         49,         49,        1,   149760, 0x733b6721
+0,         50,         50,        1,   149760, 0x30b12427
+0,         51,         51,        1,   149760, 0xdf58d3e2
+0,         52,         52,        1,   149760, 0xc144d7be
+0,         53,         53,        1,   149760, 0x48f0ac79
+0,         54,         54,        1,   149760, 0xb8d8a2c6
+0,         55,         55,        1,   149760, 0x2a7d916d
+0,         56,         56,        1,   149760, 0xd9d38cd5
+0,         57,         57,        1,   149760, 0xd7c7f9a6
+0,         58,         58,        1,   149760, 0x64d0df7a
+0,         59,         59,        1,   149760, 0x4e365cff
+0,         60,         60,        1,   149760, 0x74bc2a8b
+0,         61,         61,        1,   149760, 0x70a7cd2b
+0,         62,         62,        1,   149760, 0x0836b51e
+0,         63,         63,        1,   149760, 0xbc37b5d7
+0,         64,         64,        1,   149760, 0xb6d651e5
+0,         65,         65,        1,   149760, 0x7aa0e35f
+0,         66,         66,        1,   149760, 0x0fbc89a3
+0,         67,         67,        1,   149760, 0x2ca2f2a6
+0,         68,         68,        1,   149760, 0xf742c5c5
+0,         69,         69,        1,   149760, 0x4117208f
+0,         70,         70,        1,   149760, 0xec392efb
+0,         71,         71,        1,   149760, 0xbfba5063
+0,         72,         72,        1,   149760, 0xb2499f48
+0,         73,         73,        1,   149760, 0xf1183244
+0,         74,         74,        1,   149760, 0x364a6400
+0,         75,         75,        1,   149760, 0xfcfddf36
+0,         76,         76,        1,   149760, 0xbcc1b37e
+0,         77,         77,        1,   149760, 0xab364748
+0,         78,         78,        1,   149760, 0xebb27fcd
+0,         79,         79,        1,   149760, 0xe2e7a723
+0,         80,         80,        1,   149760, 0xf671b5e0
+0,         81,         81,        1,   149760, 0xbf0cc349
+0,         82,         82,        1,   149760, 0xf195d868
+0,         83,         83,        1,   149760, 0xe0097460
+0,         84,         84,        1,   149760, 0x3d4c1812
+0,         85,         85,        1,   149760, 0x133cd867
diff --git a/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 b/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
index e661ff245eb..53e733bd755 100644
--- a/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
@@ -70,16 +70,16 @@
 0,         64,         64,        1,   149760, 0x3362678b
 0,         65,         65,        1,   149760, 0x6e7fc851
 0,         66,         66,        1,   149760, 0x33f96449
-0,         77,         77,        1,   149760, 0xb3ba8cfb
-0,         78,         78,        1,   149760, 0x64787995
-0,         79,         79,        1,   149760, 0xc10de4c4
-0,         80,         80,        1,   149760, 0x18dd343f
-0,         81,         81,        1,   149760, 0xa1c51358
-0,         82,         82,        1,   149760, 0x91fe6361
-0,         83,         83,        1,   149760, 0xeec85f94
-0,         84,         84,        1,   149760, 0x00a57402
-0,         85,         85,        1,   149760, 0x4e88cc16
-0,         86,         86,        1,   149760, 0xdbd51976
-0,         87,         87,        1,   149760, 0xfebf6b1a
-0,         88,         88,        1,   149760, 0x052546d2
-0,         89,         89,        1,   149760, 0x046cd73b
+0,         67,         67,        1,   149760, 0xb3ba8cfb
+0,         68,         68,        1,   149760, 0x64787995
+0,         69,         69,        1,   149760, 0xc10de4c4
+0,         70,         70,        1,   149760, 0x18dd343f
+0,         71,         71,        1,   149760, 0xa1c51358
+0,         72,         72,        1,   149760, 0x91fe6361
+0,         73,         73,        1,   149760, 0xeec85f94
+0,         74,         74,        1,   149760, 0x00a57402
+0,         75,         75,        1,   149760, 0x4e88cc16
+0,         76,         76,        1,   149760, 0xdbd51976
+0,         77,         77,        1,   149760, 0xfebf6b1a
+0,         78,         78,        1,   149760, 0x052546d2
+0,         79,         79,        1,   149760, 0x046cd73b
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".