From patchwork Tue Dec 1 20:19:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24223 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F1F1B44BA85 for ; Tue, 1 Dec 2020 22:31:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA01F689B33; Tue, 1 Dec 2020 22:31:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36D8B6899E0 for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 97C20296B5F for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id tiWJseNJz1GW for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 27DB1296B5E for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 25DE53A02B2; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:41 +0100 Message-Id: <20201201201949.18834-1-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] img2dec: export avg_frame_rate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/img2dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index a08d4f7977..ccb933ae33 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -220,8 +220,10 @@ int ff_img_read_header(AVFormatContext *s1) avpriv_set_pts_info(st, 64, 1, 1000000000); } else if (s->ts_from_file) avpriv_set_pts_info(st, 64, 1, 1); - else + else { avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); + st->avg_frame_rate = s->framerate; + } if (s->width && s->height) { st->codecpar->width = s->width; From patchwork Tue Dec 1 20:19:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24220 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A27EC44BA85 for ; Tue, 1 Dec 2020 22:31:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E1A3689A63; Tue, 1 Dec 2020 22:31:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DA00688150 for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 1BC23296B60 for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id kJ3Emkj1W7EU for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 2230B296B23 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 281C63A016D; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:42 +0100 Message-Id: <20201201201949.18834-2-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] lavd/caca: do not access deprecated codec context X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use the stream timebase instead. --- libavdevice/caca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/caca.c b/libavdevice/caca.c index be3ff79736..726cfda95f 100644 --- a/libavdevice/caca.c +++ b/libavdevice/caca.c @@ -180,7 +180,7 @@ static int caca_write_header(AVFormatContext *s) if (!c->window_title) c->window_title = av_strdup(s->url); caca_set_display_title(c->display, c->window_title); - caca_set_display_time(c->display, av_rescale_q(1, st->codec->time_base, AV_TIME_BASE_Q)); + caca_set_display_time(c->display, av_rescale_q(1, st->time_base, AV_TIME_BASE_Q)); return 0; From patchwork Tue Dec 1 20:19:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24225 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3E09244BA85 for ; Tue, 1 Dec 2020 22:31:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 178F5689AE3; Tue, 1 Dec 2020 22:31:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D314689A8B for ; Tue, 1 Dec 2020 22:31:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 43C24296B5E for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Ni9vSq0E3jt4 for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 26C17296B5D for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 2CDA83A02BB; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:43 +0100 Message-Id: <20201201201949.18834-3-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9] tests: drop api-codec-param test X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It fundamentally depends on deprecated lavf internals. --- tests/api/Makefile | 1 - tests/api/api-codec-param-test.c | 256 ------------------------------- tests/fate/api.mak | 8 - 3 files changed, 265 deletions(-) delete mode 100644 tests/api/api-codec-param-test.c diff --git a/tests/api/Makefile b/tests/api/Makefile index b5c4ccae23..c96e636756 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -2,7 +2,6 @@ APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264 APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264-slice APITESTPROGS-yes += api-seek -APITESTPROGS-yes += api-codec-param APITESTPROGS-$(call DEMDEC, H263, H263) += api-band APITESTPROGS-$(HAVE_THREADS) += api-threadmessage APITESTPROGS += $(APITESTPROGS-yes) diff --git a/tests/api/api-codec-param-test.c b/tests/api/api-codec-param-test.c deleted file mode 100644 index 0868322cb4..0000000000 --- a/tests/api/api-codec-param-test.c +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (c) 2015 Matthieu Bouron - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include -#include "libavformat/avformat.h" -#include "libavutil/pixdesc.h" -#include "libavcodec/internal.h" -#include "libavutil/avassert.h" -#include "libavutil/opt.h" - -static int try_decode_video_frame(AVCodecContext *codec_ctx, AVPacket *pkt, int decode) -{ - int ret = 0; - int got_frame = 0; - AVFrame *frame = NULL; - int skip_frame = codec_ctx->skip_frame; - - if (!avcodec_is_open(codec_ctx)) { - const AVCodec *codec = avcodec_find_decoder(codec_ctx->codec_id); - - ret = avcodec_open2(codec_ctx, codec, NULL); - if (ret < 0) { - av_log(codec_ctx, AV_LOG_ERROR, "Failed to open codec\n"); - goto end; - } - } - - frame = av_frame_alloc(); - if (!frame) { - av_log(NULL, AV_LOG_ERROR, "Failed to allocate frame\n"); - goto end; - } - - if (!decode && avpriv_codec_get_cap_skip_frame_fill_param(codec_ctx->codec)) { - codec_ctx->skip_frame = AVDISCARD_ALL; - } - - do { - ret = avcodec_decode_video2(codec_ctx, frame, &got_frame, pkt); - av_assert0(decode || (!decode && !got_frame)); - if (ret < 0) - break; - pkt->data += ret; - pkt->size -= ret; - - if (got_frame) { - break; - } - } while (pkt->size > 0); - -end: - codec_ctx->skip_frame = skip_frame; - - av_frame_free(&frame); - return ret; -} - -static int find_video_stream_info(AVFormatContext *fmt_ctx, int decode) -{ - int ret = 0; - int i, done = 0; - AVPacket pkt; - - av_init_packet(&pkt); - - while (!done) { - AVCodecContext *codec_ctx = NULL; - AVStream *st; - - if ((ret = av_read_frame(fmt_ctx, &pkt)) < 0) { - av_log(fmt_ctx, AV_LOG_ERROR, "Failed to read frame\n"); - goto end; - } - - st = fmt_ctx->streams[pkt.stream_index]; - codec_ctx = st->codec; - - /* Writing to AVStream.codec_info_nb_frames must not be done by - * user applications. It is done here for testing purposing as - * find_video_stream_info tries to mimic avformat_find_stream_info - * which writes to this field. - * */ - if (codec_ctx->codec_type != AVMEDIA_TYPE_VIDEO || - st->codec_info_nb_frames++ > 0) { - av_packet_unref(&pkt); - continue; - } - - ret = try_decode_video_frame(codec_ctx, &pkt, decode); - if (ret < 0) { - av_log(fmt_ctx, AV_LOG_ERROR, "Failed to decode video frame\n"); - goto end; - } - - av_packet_unref(&pkt); - - /* check if all video streams have demuxed a packet */ - done = 1; - for (i = 0; i < fmt_ctx->nb_streams; i++) { - st = fmt_ctx->streams[i]; - codec_ctx = st->codec; - - if (codec_ctx->codec_type != AVMEDIA_TYPE_VIDEO) - continue; - - done &= st->codec_info_nb_frames > 0; - } - } - -end: - av_packet_unref(&pkt); - - /* close all codecs opened in try_decode_video_frame */ - for (i = 0; i < fmt_ctx->nb_streams; i++) { - AVStream *st = fmt_ctx->streams[i]; - avcodec_close(st->codec); - } - - return ret < 0; -} - -static void dump_video_streams(const AVFormatContext *fmt_ctx, int decode) -{ - int i; - - for (i = 0; i < fmt_ctx->nb_streams; i++) { - const AVOption *opt = NULL; - const AVStream *st = fmt_ctx->streams[i]; - AVCodecContext *codec_ctx = st->codec; - - printf("stream=%d, decode=%d\n", i, decode); - while (opt = av_opt_next(codec_ctx, opt)) { - uint8_t *str; - - if (opt->type == AV_OPT_TYPE_CONST) - continue; - - if (!strcmp(opt->name, "frame_number")) - continue; - - if (av_opt_get(codec_ctx, opt->name, 0, &str) >= 0) { - printf(" %s=%s\n", opt->name, str); - av_free(str); - } - } - } -} - -static int open_and_probe_video_streams(AVFormatContext **fmt_ctx, const char *filename, int decode) -{ - int ret = 0; - - ret = avformat_open_input(fmt_ctx, filename, NULL, NULL); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to open input '%s'", filename); - goto end; - } - - ret = find_video_stream_info(*fmt_ctx, decode); - if (ret < 0) { - goto end; - } - - dump_video_streams(*fmt_ctx, decode); - -end: - return ret; -} - -static int check_video_streams(const AVFormatContext *fmt_ctx1, const AVFormatContext *fmt_ctx2) -{ - int i; - int ret = 0; - - av_assert0(fmt_ctx1->nb_streams == fmt_ctx2->nb_streams); - for (i = 0; i < fmt_ctx1->nb_streams; i++) { - const AVOption *opt = NULL; - const AVStream *st1 = fmt_ctx1->streams[i]; - const AVStream *st2 = fmt_ctx2->streams[i]; - AVCodecContext *codec_ctx1 = st1->codec; - AVCodecContext *codec_ctx2 = st2->codec; - - if (codec_ctx1->codec_type != AVMEDIA_TYPE_VIDEO) - continue; - - while (opt = av_opt_next(codec_ctx1, opt)) { - uint8_t *str1 = NULL, *str2 = NULL; - - if (opt->type == AV_OPT_TYPE_CONST) - continue; - - if (!strcmp(opt->name, "frame_number")) - continue; - - av_assert0(av_opt_get(codec_ctx1, opt->name, 0, &str1) >= 0); - av_assert0(av_opt_get(codec_ctx2, opt->name, 0, &str2) >= 0); - if (strcmp(str1, str2)) { - av_log(NULL, AV_LOG_ERROR, "Field %s differs: %s %s", opt->name, str1, str2); - ret = AVERROR(EINVAL); - } - av_free(str1); - av_free(str2); - } - } - - return ret; -} - -int main(int argc, char* argv[]) -{ - int ret = 0; - AVFormatContext *fmt_ctx = NULL; - AVFormatContext *fmt_ctx_no_decode = NULL; - - if (argc < 2) { - av_log(NULL, AV_LOG_ERROR, "Usage: %s \n", argv[0]); - return -1; - } - - if ((ret = open_and_probe_video_streams(&fmt_ctx_no_decode, argv[1], 0)) < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to probe '%s' without frame decoding\n", argv[1]); - goto end; - } - - if ((ret = open_and_probe_video_streams(&fmt_ctx, argv[1], 1)) < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to probe '%s' with frame decoding\n", argv[1]); - goto end; - } - - ret = check_video_streams(fmt_ctx, fmt_ctx_no_decode); - -end: - avformat_close_input(&fmt_ctx); - avformat_close_input(&fmt_ctx_no_decode); - - return ret; -} diff --git a/tests/fate/api.mak b/tests/fate/api.mak index 3e1cc992e0..10288f5aba 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -21,14 +21,6 @@ fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test$(EXESUF) $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720 fate-api-seek: CMP = null -FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, PNG) += fate-api-png-codec-param -fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF) -fate-api-png-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test$(EXESUF) $(TARGET_SAMPLES)/png1/lena-rgba.png - -FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, MJPEG) += fate-api-mjpeg-codec-param -fate-api-mjpeg-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF) -fate-api-mjpeg-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test$(EXESUF) $(TARGET_SAMPLES)/exif/image_small.jpg - FATE_API-$(HAVE_THREADS) += fate-api-threadmessage fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF) fate-api-threadmessage: CMD = run $(APITESTSDIR)/api-threadmessage-test$(EXESUF) 3 10 30 50 2 20 40 From patchwork Tue Dec 1 20:19:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24221 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9CEE744BA85 for ; Tue, 1 Dec 2020 22:31:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F47C689ADA; Tue, 1 Dec 2020 22:31:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 059196880DD for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 1D540296B65 for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id RInMbJrZekaq for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 28E4B296B5F for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 324463A02CB; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:44 +0100 Message-Id: <20201201201949.18834-4-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] lavf/mux: rewrite guessing the packet duration X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Factor out the code into a separate muxing-specific function. Stop accessing the deprecated AVStream-embedded codec context, use the average framerate (if specified) instead. --- libavformat/mux.c | 49 ++-- tests/ref/fate/asf-repldata | 28 +-- tests/ref/fate/ffmpeg-attached_pics | 2 +- tests/ref/fate/ffmpeg-streamloop | 2 +- tests/ref/fate/g2m2 | 320 +++++++++++++-------------- tests/ref/fate/iff-byterun1 | 2 +- tests/ref/fate/iff-ilbm | 2 +- tests/ref/fate/iv8-demux | 50 ++--- tests/ref/fate/mimic | 152 ++++++------- tests/ref/fate/mss2-pal | 4 +- tests/ref/fate/mss2-pals | 4 +- tests/ref/fate/mss2-rgb555 | 4 +- tests/ref/fate/mss2-rgb555s | 4 +- tests/ref/fate/nuv-rtjpeg | 16 +- tests/ref/fate/segment-mp4-to-ts | 58 ++--- tests/ref/fate/smjpeg-demux | 82 +++---- tests/ref/fate/vp9-tiling-pedestrian | 4 +- tests/ref/lavf-fate/vp8.ogg | 4 +- 18 files changed, 403 insertions(+), 384 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index d2a56d216b..84c56ac6ba 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -546,7 +546,7 @@ FF_DISABLE_DEPRECATION_WARNINGS static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) { int delay = FFMAX(st->codecpar->video_delay, st->internal->avctx->max_b_frames > 0); - int num, den, i; + int i; int frame_size; if (!s->internal->missing_ts_warning && @@ -564,20 +564,6 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_log(s, AV_LOG_DEBUG, "compute_muxer_pkt_fields: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); - if (pkt->duration < 0 && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { - av_log(s, AV_LOG_WARNING, "Packet with invalid duration %"PRId64" in stream %d\n", - pkt->duration, pkt->stream_index); - pkt->duration = 0; - } - - /* duration field */ - if (pkt->duration == 0) { - ff_compute_frame_duration(s, &num, &den, st, NULL, pkt); - if (den && num) { - pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den * st->codec->ticks_per_frame, den * (int64_t)st->time_base.num); - } - } - if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay == 0) pkt->pts = pkt->dts; @@ -652,6 +638,37 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * FF_ENABLE_DEPRECATION_WARNINGS #endif +static void guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + if (pkt->duration < 0 && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { + av_log(s, AV_LOG_WARNING, "Packet with invalid duration %"PRId64" in stream %d\n", + pkt->duration, pkt->stream_index); + pkt->duration = 0; + } + + if (pkt->duration) + return; + + switch (st->codecpar->codec_type) { + case AVMEDIA_TYPE_VIDEO: + if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { + pkt->duration = av_rescale_q(1, av_inv_q(st->avg_frame_rate), + st->time_base); + } else if (st->time_base.num * 1000LL > st->time_base.den) + pkt->duration = 1; + break; + case AVMEDIA_TYPE_AUDIO: { + int frame_size = av_get_audio_frame_duration2(st->codecpar, pkt->size); + if (frame_size && st->codecpar->sample_rate) { + pkt->duration = av_rescale_q(frame_size, + (AVRational){1, st->codecpar->sample_rate}, + st->time_base); + } + break; + } + } +} + /** * Shift timestamps and call muxer; the original pts/dts are not kept. * @@ -1118,6 +1135,8 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __FUNCTION__, pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); + guess_pkt_duration(s, st, pkt); + #if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret; diff --git a/tests/ref/fate/asf-repldata b/tests/ref/fate/asf-repldata index 94744569f2..59eaf0c2a8 100644 --- a/tests/ref/fate/asf-repldata +++ b/tests/ref/fate/asf-repldata @@ -3,17 +3,17 @@ #codec_id 0: msmpeg4v3 #dimensions 0: 640x480 #sar 0: 0/1 -0, 0, 0, 0, 23374, 0x8725b3b8 -0, 122, 122, 0, 13732, 0x3ac8531a, F=0x0 -0, 245, 245, 0, 615, 0xd31641b4, F=0x0 -0, 367, 367, 0, 6361, 0xf263af54, F=0x0 -0, 490, 490, 0, 320, 0xd6f2d6b8, F=0x0 -0, 612, 612, 0, 3750, 0xfcf1d501, F=0x0 -0, 735, 735, 0, 2541, 0xd9fc04f9, F=0x0 -0, 857, 857, 0, 205, 0x4d38a947, F=0x0 -0, 980, 980, 0, 2166, 0x2f1e7d74, F=0x0 -0, 1102, 1102, 0, 1667, 0x0cd84b61, F=0x0 -0, 1224, 1224, 0, 13645, 0x543bd032, F=0x0 -0, 1347, 1347, 0, 5953, 0xc3037c73, F=0x0 -0, 1469, 1469, 0, 36169, 0xca9f716d -0, 1592, 1592, 0, 3030, 0x9aba5683, F=0x0 +0, 0, 0, 122, 23374, 0x8725b3b8 +0, 122, 122, 122, 13732, 0x3ac8531a, F=0x0 +0, 245, 245, 122, 615, 0xd31641b4, F=0x0 +0, 367, 367, 122, 6361, 0xf263af54, F=0x0 +0, 490, 490, 122, 320, 0xd6f2d6b8, F=0x0 +0, 612, 612, 122, 3750, 0xfcf1d501, F=0x0 +0, 735, 735, 122, 2541, 0xd9fc04f9, F=0x0 +0, 857, 857, 122, 205, 0x4d38a947, F=0x0 +0, 980, 980, 122, 2166, 0x2f1e7d74, F=0x0 +0, 1102, 1102, 122, 1667, 0x0cd84b61, F=0x0 +0, 1224, 1224, 122, 13645, 0x543bd032, F=0x0 +0, 1347, 1347, 122, 5953, 0xc3037c73, F=0x0 +0, 1469, 1469, 122, 36169, 0xca9f716d +0, 1592, 1592, 122, 3030, 0x9aba5683, F=0x0 diff --git a/tests/ref/fate/ffmpeg-attached_pics b/tests/ref/fate/ffmpeg-attached_pics index ee2f20638e..48c7ced363 100644 --- a/tests/ref/fate/ffmpeg-attached_pics +++ b/tests/ref/fate/ffmpeg-attached_pics @@ -9,7 +9,7 @@ #sample_rate 1: 44100 #channel_layout 1: 3 #channel_layout_name 1: stereo -0, 0, 0, 0, 120000, 0x748cc771 +0, 0, 0, 1, 120000, 0x748cc771 1, 0, 0, 4096, 16384, 0x00000000 1, 4096, 4096, 4096, 16384, 0x29cd639d 1, 8192, 8192, 4096, 16384, 0xd52066e5 diff --git a/tests/ref/fate/ffmpeg-streamloop b/tests/ref/fate/ffmpeg-streamloop index d22199d583..705c4646c6 100644 --- a/tests/ref/fate/ffmpeg-streamloop +++ b/tests/ref/fate/ffmpeg-streamloop @@ -8,7 +8,7 @@ #dimensions 0: 320x240 #sar 0: 1/1 #stream#, dts, pts, duration, size, hash -0, -80, 0, 0, 5131, fb6a475e53addc2ffa79e1b75de81050 +0, -80, 0, 40, 5131, fb6a475e53addc2ffa79e1b75de81050 0, -40, 160, 40, 2479, fc64a1f7054d22741fffc68891ff4887 0, 0, 80, 40, 1354, 344ee1f5e8f0fe2785639dd530cf85ca 0, 40, 40, 40, 965, cbea2691414063d4e1199b781586cac4 diff --git a/tests/ref/fate/g2m2 b/tests/ref/fate/g2m2 index 42b7b6f2e1..d939b167e8 100644 --- a/tests/ref/fate/g2m2 +++ b/tests/ref/fate/g2m2 @@ -3,163 +3,163 @@ #codec_id 0: rawvideo #dimensions 0: 1024x768 #sar 0: 0/1 -0, 47, 47, 0, 2359296, 0xb4434e4f -0, 62, 62, 0, 2359296, 0x59cb5027 -0, 78, 78, 0, 2359296, 0xe9bc578d -0, 109, 109, 0, 2359296, 0x5d17554f -0, 125, 125, 0, 2359296, 0x6d685457 -0, 437, 437, 0, 2359296, 0x13205420 -0, 438, 438, 0, 2359296, 0xb8e15116 -0, 453, 453, 0, 2359296, 0x2ca55195 -0, 469, 469, 0, 2359296, 0x767d1c45 -0, 484, 484, 0, 2359296, 0x0af42016 -0, 500, 500, 0, 2359296, 0xa2083e69 -0, 516, 516, 0, 2359296, 0xb68a1308 -0, 531, 531, 0, 2359296, 0x4f334c0e -0, 547, 547, 0, 2359296, 0x98b74e4f -0, 562, 562, 0, 2359296, 0xd9de4e4f -0, 578, 578, 0, 2359296, 0xa17c4e4f -0, 594, 594, 0, 2359296, 0xa49a665d -0, 609, 609, 0, 2359296, 0xf5f87360 -0, 781, 781, 0, 2359296, 0x75747360 -0, 797, 797, 0, 2359296, 0x745d7360 -0, 812, 812, 0, 2359296, 0x33047360 -0, 828, 828, 0, 2359296, 0xf19c7360 -0, 844, 844, 0, 2359296, 0xb0437360 -0, 859, 859, 0, 2359296, 0xaf2c7360 -0, 875, 875, 0, 2359296, 0x2ea87360 -0, 891, 891, 0, 2359296, 0xee577360 -0, 953, 953, 0, 2359296, 0x6dd37360 -0, 1078, 1078, 0, 2359296, 0xab327965 -0, 1094, 1094, 0, 2359296, 0x5f8677d0 -0, 1109, 1109, 0, 2359296, 0x02135eb4 -0, 1125, 1125, 0, 2359296, 0x09784e4f -0, 1141, 1141, 0, 2359296, 0xa140a62d -0, 1156, 1156, 0, 2359296, 0xa140a62d -0, 1484, 1484, 0, 2359296, 0xa140a62d -0, 1516, 1516, 0, 2359296, 0xa140a62d -0, 1547, 1547, 0, 2359296, 0xa140a62d -0, 1641, 1641, 0, 2359296, 0xa140a62d -0, 1642, 1642, 0, 2359296, 0xa140a62d -0, 1656, 1656, 0, 2359296, 0xa140a62d -0, 1657, 1657, 0, 2359296, 0xa140a62d -0, 1672, 1672, 0, 2359296, 0xa140a62d -0, 1673, 1673, 0, 2359296, 0x92024e4f -0, 1687, 1687, 0, 2359296, 0xb1754dbe -0, 1688, 1688, 0, 2359296, 0x15ee5eb4 -0, 1703, 1703, 0, 2359296, 0xb1d9746e -0, 1719, 1719, 0, 2359296, 0xabe77360 -0, 1734, 1734, 0, 2359296, 0xaad07360 -0, 1750, 1750, 0, 2359296, 0x2a4c7360 -0, 1766, 1766, 0, 2359296, 0x69777360 -0, 1781, 1781, 0, 2359296, 0xe8e47360 -0, 2328, 2328, 0, 2359296, 0x29357360 -0, 3031, 3031, 0, 2359296, 0x69777360 -0, 3078, 3078, 0, 2359296, 0xa9b97360 -0, 3109, 3109, 0, 2359296, 0xd2697707 -0, 3141, 3141, 0, 2359296, 0x22a07965 -0, 3156, 3156, 0, 2359296, 0xf9327aa7 -0, 3172, 3172, 0, 2359296, 0xa5d277d0 -0, 3203, 3203, 0, 2359296, 0x97b6746e -0, 3328, 3328, 0, 2359296, 0x80bb746e -0, 4562, 4562, 0, 2359296, 0x530b719a -0, 4672, 4672, 0, 2359296, 0x4827665d -0, 4703, 4703, 0, 2359296, 0xc48c5eb4 -0, 5391, 5391, 0, 2359296, 0xe6465eb4 -0, 5578, 5578, 0, 2359296, 0xece455ec -0, 5594, 5594, 0, 2359296, 0xb5344dbe -0, 5609, 5609, 0, 2359296, 0xa140a62d -0, 5625, 5625, 0, 2359296, 0xa140a62d -0, 5641, 5641, 0, 2359296, 0xa140a62d -0, 5642, 5642, 0, 2359296, 0xa140a62d -0, 5656, 5656, 0, 2359296, 0xa140a62d -0, 5672, 5672, 0, 2359296, 0xa140a62d -0, 5703, 5703, 0, 2359296, 0xa140a62d -0, 5750, 5750, 0, 2359296, 0xa140a62d -0, 5766, 5766, 0, 2359296, 0xa140a62d -0, 5781, 5781, 0, 2359296, 0xa140a62d -0, 5797, 5797, 0, 2359296, 0xa140a62d -0, 5812, 5812, 0, 2359296, 0xa140a62d -0, 5875, 5875, 0, 2359296, 0xa140a62d -0, 5922, 5922, 0, 2359296, 0xa140a62d -0, 5984, 5984, 0, 2359296, 0xa140a62d -0, 6031, 6031, 0, 2359296, 0xa140a62d -0, 6047, 6047, 0, 2359296, 0xa140a62d -0, 6062, 6062, 0, 2359296, 0xa140a62d -0, 6406, 6406, 0, 2359296, 0xa140a62d -0, 6453, 6453, 0, 2359296, 0xa140a62d -0, 6469, 6469, 0, 2359296, 0xa140a62d -0, 6484, 6484, 0, 2359296, 0xa140a62d -0, 6500, 6500, 0, 2359296, 0xa140a62d -0, 6516, 6516, 0, 2359296, 0xa140a62d -0, 6531, 6531, 0, 2359296, 0xa140a62d -0, 6547, 6547, 0, 2359296, 0xa140a62d -0, 6562, 6562, 0, 2359296, 0x5c2a4cd9 -0, 6578, 6578, 0, 2359296, 0x28f94e4f -0, 6594, 6594, 0, 2359296, 0x9acb4820 -0, 6609, 6609, 0, 2359296, 0x9ec716e1 -0, 6625, 6625, 0, 2359296, 0xaf5f3fa4 -0, 6641, 6641, 0, 2359296, 0x7d633218 -0, 6642, 6642, 0, 2359296, 0x34fb2016 -0, 6656, 6656, 0, 2359296, 0x61351665 -0, 6812, 6812, 0, 2359296, 0xb23c1039 -0, 6828, 6828, 0, 2359296, 0x59290d69 -0, 6844, 6844, 0, 2359296, 0x639c132d -0, 6859, 6859, 0, 2359296, 0x0b252237 -0, 6875, 6875, 0, 2359296, 0xe66f2fc5 -0, 6891, 6891, 0, 2359296, 0xa8b33761 -0, 6906, 6906, 0, 2359296, 0x81a63f8b -0, 6969, 6969, 0, 2359296, 0x18074843 -0, 6984, 6984, 0, 2359296, 0x434a5195 -0, 7000, 7000, 0, 2359296, 0x6da15116 -0, 7001, 7001, 0, 2359296, 0xca755420 -0, 7016, 7016, 0, 2359296, 0xe6fc5457 -0, 7017, 7017, 0, 2359296, 0x271d53fd -0, 7031, 7031, 0, 2359296, 0xa15b554f -0, 7281, 7281, 0, 2359296, 0x49f6578d -0, 7282, 7282, 0, 2359296, 0x2c0c4e4f -0, 7297, 7297, 0, 2359296, 0x7e924e4f -0, 7298, 7298, 0, 2359296, 0x32ff4e4f -0, 7312, 7312, 0, 2359296, 0x23ad4e4f -0, 7313, 7313, 0, 2359296, 0x7ddc4e4f -0, 7328, 7328, 0, 2359296, 0xd0624e4f -0, 7329, 7329, 0, 2359296, 0x22f74e4f -0, 7781, 7781, 0, 2359296, 0x49fa4e4f -0, 7797, 7797, 0, 2359296, 0x6a5a5027 -0, 7812, 7812, 0, 2359296, 0x9f935027 -0, 7828, 7828, 0, 2359296, 0xc5e55027 -0, 7844, 7844, 0, 2359296, 0xd4cc5027 -0, 8250, 8250, 0, 2359296, 0xd2ab5027 -0, 8266, 8266, 0, 2359296, 0x68f04e4f -0, 8281, 8281, 0, 2359296, 0xd0b44e4f -0, 8297, 8297, 0, 2359296, 0xfced4e4f -0, 8298, 8298, 0, 2359296, 0x8b0d4e4f -0, 8312, 8312, 0, 2359296, 0x09db4e4f -0, 8328, 8328, 0, 2359296, 0x4d0f4e4f -0, 8329, 8329, 0, 2359296, 0xad824dbe -0, 8344, 8344, 0, 2359296, 0x9aca4dbe -0, 8345, 8345, 0, 2359296, 0x755a4dbe -0, 8359, 8359, 0, 2359296, 0xc6824d2d -0, 8360, 8360, 0, 2359296, 0x7c344c0e -0, 8375, 8375, 0, 2359296, 0x50f04c0e -0, 8391, 8391, 0, 2359296, 0xfa594c0e -0, 8406, 8406, 0, 2359296, 0x4d494c0e -0, 8422, 8422, 0, 2359296, 0xf6b24c0e -0, 8437, 8437, 0, 2359296, 0xcb6e4c0e -0, 8453, 8453, 0, 2359296, 0xbd024c0e -0, 8516, 8516, 0, 2359296, 0x245b4dbe -0, 8531, 8531, 0, 2359296, 0x47874e4f -0, 8547, 8547, 0, 2359296, 0xdead4e4f -0, 8562, 8562, 0, 2359296, 0x847e4e4f -0, 9344, 9344, 0, 2359296, 0x1a13e47c -0, 9345, 9345, 0, 2359296, 0x46b3e321 -0, 9876, 9876, 0, 2359296, 0x76c0e35d -0, 9922, 9922, 0, 2359296, 0xf6d9e519 -0, 9938, 9938, 0, 2359296, 0xac0fe4b3 -0, 9954, 9954, 0, 2359296, 0x3a3fe424 -0, 9955, 9955, 0, 2359296, 0xa97ce1a8 -0, 9969, 9969, 0, 2359296, 0x12fae01d -0, 9970, 9970, 0, 2359296, 0x65b4df14 -0, 9985, 9985, 0, 2359296, 0x82d0e032 -0, 9986, 9986, 0, 2359296, 0xa452e0cf -0, 10001, 10001, 0, 2359296, 0x22d6df37 +0, 47, 47, 1, 2359296, 0xb4434e4f +0, 62, 62, 1, 2359296, 0x59cb5027 +0, 78, 78, 1, 2359296, 0xe9bc578d +0, 109, 109, 1, 2359296, 0x5d17554f +0, 125, 125, 1, 2359296, 0x6d685457 +0, 437, 437, 1, 2359296, 0x13205420 +0, 438, 438, 1, 2359296, 0xb8e15116 +0, 453, 453, 1, 2359296, 0x2ca55195 +0, 469, 469, 1, 2359296, 0x767d1c45 +0, 484, 484, 1, 2359296, 0x0af42016 +0, 500, 500, 1, 2359296, 0xa2083e69 +0, 516, 516, 1, 2359296, 0xb68a1308 +0, 531, 531, 1, 2359296, 0x4f334c0e +0, 547, 547, 1, 2359296, 0x98b74e4f +0, 562, 562, 1, 2359296, 0xd9de4e4f +0, 578, 578, 1, 2359296, 0xa17c4e4f +0, 594, 594, 1, 2359296, 0xa49a665d +0, 609, 609, 1, 2359296, 0xf5f87360 +0, 781, 781, 1, 2359296, 0x75747360 +0, 797, 797, 1, 2359296, 0x745d7360 +0, 812, 812, 1, 2359296, 0x33047360 +0, 828, 828, 1, 2359296, 0xf19c7360 +0, 844, 844, 1, 2359296, 0xb0437360 +0, 859, 859, 1, 2359296, 0xaf2c7360 +0, 875, 875, 1, 2359296, 0x2ea87360 +0, 891, 891, 1, 2359296, 0xee577360 +0, 953, 953, 1, 2359296, 0x6dd37360 +0, 1078, 1078, 1, 2359296, 0xab327965 +0, 1094, 1094, 1, 2359296, 0x5f8677d0 +0, 1109, 1109, 1, 2359296, 0x02135eb4 +0, 1125, 1125, 1, 2359296, 0x09784e4f +0, 1141, 1141, 1, 2359296, 0xa140a62d +0, 1156, 1156, 1, 2359296, 0xa140a62d +0, 1484, 1484, 1, 2359296, 0xa140a62d +0, 1516, 1516, 1, 2359296, 0xa140a62d +0, 1547, 1547, 1, 2359296, 0xa140a62d +0, 1641, 1641, 1, 2359296, 0xa140a62d +0, 1642, 1642, 1, 2359296, 0xa140a62d +0, 1656, 1656, 1, 2359296, 0xa140a62d +0, 1657, 1657, 1, 2359296, 0xa140a62d +0, 1672, 1672, 1, 2359296, 0xa140a62d +0, 1673, 1673, 1, 2359296, 0x92024e4f +0, 1687, 1687, 1, 2359296, 0xb1754dbe +0, 1688, 1688, 1, 2359296, 0x15ee5eb4 +0, 1703, 1703, 1, 2359296, 0xb1d9746e +0, 1719, 1719, 1, 2359296, 0xabe77360 +0, 1734, 1734, 1, 2359296, 0xaad07360 +0, 1750, 1750, 1, 2359296, 0x2a4c7360 +0, 1766, 1766, 1, 2359296, 0x69777360 +0, 1781, 1781, 1, 2359296, 0xe8e47360 +0, 2328, 2328, 1, 2359296, 0x29357360 +0, 3031, 3031, 1, 2359296, 0x69777360 +0, 3078, 3078, 1, 2359296, 0xa9b97360 +0, 3109, 3109, 1, 2359296, 0xd2697707 +0, 3141, 3141, 1, 2359296, 0x22a07965 +0, 3156, 3156, 1, 2359296, 0xf9327aa7 +0, 3172, 3172, 1, 2359296, 0xa5d277d0 +0, 3203, 3203, 1, 2359296, 0x97b6746e +0, 3328, 3328, 1, 2359296, 0x80bb746e +0, 4562, 4562, 1, 2359296, 0x530b719a +0, 4672, 4672, 1, 2359296, 0x4827665d +0, 4703, 4703, 1, 2359296, 0xc48c5eb4 +0, 5391, 5391, 1, 2359296, 0xe6465eb4 +0, 5578, 5578, 1, 2359296, 0xece455ec +0, 5594, 5594, 1, 2359296, 0xb5344dbe +0, 5609, 5609, 1, 2359296, 0xa140a62d +0, 5625, 5625, 1, 2359296, 0xa140a62d +0, 5641, 5641, 1, 2359296, 0xa140a62d +0, 5642, 5642, 1, 2359296, 0xa140a62d +0, 5656, 5656, 1, 2359296, 0xa140a62d +0, 5672, 5672, 1, 2359296, 0xa140a62d +0, 5703, 5703, 1, 2359296, 0xa140a62d +0, 5750, 5750, 1, 2359296, 0xa140a62d +0, 5766, 5766, 1, 2359296, 0xa140a62d +0, 5781, 5781, 1, 2359296, 0xa140a62d +0, 5797, 5797, 1, 2359296, 0xa140a62d +0, 5812, 5812, 1, 2359296, 0xa140a62d +0, 5875, 5875, 1, 2359296, 0xa140a62d +0, 5922, 5922, 1, 2359296, 0xa140a62d +0, 5984, 5984, 1, 2359296, 0xa140a62d +0, 6031, 6031, 1, 2359296, 0xa140a62d +0, 6047, 6047, 1, 2359296, 0xa140a62d +0, 6062, 6062, 1, 2359296, 0xa140a62d +0, 6406, 6406, 1, 2359296, 0xa140a62d +0, 6453, 6453, 1, 2359296, 0xa140a62d +0, 6469, 6469, 1, 2359296, 0xa140a62d +0, 6484, 6484, 1, 2359296, 0xa140a62d +0, 6500, 6500, 1, 2359296, 0xa140a62d +0, 6516, 6516, 1, 2359296, 0xa140a62d +0, 6531, 6531, 1, 2359296, 0xa140a62d +0, 6547, 6547, 1, 2359296, 0xa140a62d +0, 6562, 6562, 1, 2359296, 0x5c2a4cd9 +0, 6578, 6578, 1, 2359296, 0x28f94e4f +0, 6594, 6594, 1, 2359296, 0x9acb4820 +0, 6609, 6609, 1, 2359296, 0x9ec716e1 +0, 6625, 6625, 1, 2359296, 0xaf5f3fa4 +0, 6641, 6641, 1, 2359296, 0x7d633218 +0, 6642, 6642, 1, 2359296, 0x34fb2016 +0, 6656, 6656, 1, 2359296, 0x61351665 +0, 6812, 6812, 1, 2359296, 0xb23c1039 +0, 6828, 6828, 1, 2359296, 0x59290d69 +0, 6844, 6844, 1, 2359296, 0x639c132d +0, 6859, 6859, 1, 2359296, 0x0b252237 +0, 6875, 6875, 1, 2359296, 0xe66f2fc5 +0, 6891, 6891, 1, 2359296, 0xa8b33761 +0, 6906, 6906, 1, 2359296, 0x81a63f8b +0, 6969, 6969, 1, 2359296, 0x18074843 +0, 6984, 6984, 1, 2359296, 0x434a5195 +0, 7000, 7000, 1, 2359296, 0x6da15116 +0, 7001, 7001, 1, 2359296, 0xca755420 +0, 7016, 7016, 1, 2359296, 0xe6fc5457 +0, 7017, 7017, 1, 2359296, 0x271d53fd +0, 7031, 7031, 1, 2359296, 0xa15b554f +0, 7281, 7281, 1, 2359296, 0x49f6578d +0, 7282, 7282, 1, 2359296, 0x2c0c4e4f +0, 7297, 7297, 1, 2359296, 0x7e924e4f +0, 7298, 7298, 1, 2359296, 0x32ff4e4f +0, 7312, 7312, 1, 2359296, 0x23ad4e4f +0, 7313, 7313, 1, 2359296, 0x7ddc4e4f +0, 7328, 7328, 1, 2359296, 0xd0624e4f +0, 7329, 7329, 1, 2359296, 0x22f74e4f +0, 7781, 7781, 1, 2359296, 0x49fa4e4f +0, 7797, 7797, 1, 2359296, 0x6a5a5027 +0, 7812, 7812, 1, 2359296, 0x9f935027 +0, 7828, 7828, 1, 2359296, 0xc5e55027 +0, 7844, 7844, 1, 2359296, 0xd4cc5027 +0, 8250, 8250, 1, 2359296, 0xd2ab5027 +0, 8266, 8266, 1, 2359296, 0x68f04e4f +0, 8281, 8281, 1, 2359296, 0xd0b44e4f +0, 8297, 8297, 1, 2359296, 0xfced4e4f +0, 8298, 8298, 1, 2359296, 0x8b0d4e4f +0, 8312, 8312, 1, 2359296, 0x09db4e4f +0, 8328, 8328, 1, 2359296, 0x4d0f4e4f +0, 8329, 8329, 1, 2359296, 0xad824dbe +0, 8344, 8344, 1, 2359296, 0x9aca4dbe +0, 8345, 8345, 1, 2359296, 0x755a4dbe +0, 8359, 8359, 1, 2359296, 0xc6824d2d +0, 8360, 8360, 1, 2359296, 0x7c344c0e +0, 8375, 8375, 1, 2359296, 0x50f04c0e +0, 8391, 8391, 1, 2359296, 0xfa594c0e +0, 8406, 8406, 1, 2359296, 0x4d494c0e +0, 8422, 8422, 1, 2359296, 0xf6b24c0e +0, 8437, 8437, 1, 2359296, 0xcb6e4c0e +0, 8453, 8453, 1, 2359296, 0xbd024c0e +0, 8516, 8516, 1, 2359296, 0x245b4dbe +0, 8531, 8531, 1, 2359296, 0x47874e4f +0, 8547, 8547, 1, 2359296, 0xdead4e4f +0, 8562, 8562, 1, 2359296, 0x847e4e4f +0, 9344, 9344, 1, 2359296, 0x1a13e47c +0, 9345, 9345, 1, 2359296, 0x46b3e321 +0, 9876, 9876, 1, 2359296, 0x76c0e35d +0, 9922, 9922, 1, 2359296, 0xf6d9e519 +0, 9938, 9938, 1, 2359296, 0xac0fe4b3 +0, 9954, 9954, 1, 2359296, 0x3a3fe424 +0, 9955, 9955, 1, 2359296, 0xa97ce1a8 +0, 9969, 9969, 1, 2359296, 0x12fae01d +0, 9970, 9970, 1, 2359296, 0x65b4df14 +0, 9985, 9985, 1, 2359296, 0x82d0e032 +0, 9986, 9986, 1, 2359296, 0xa452e0cf +0, 10001, 10001, 1, 2359296, 0x22d6df37 diff --git a/tests/ref/fate/iff-byterun1 b/tests/ref/fate/iff-byterun1 index 8e6f949f62..ccb852fb07 100644 --- a/tests/ref/fate/iff-byterun1 +++ b/tests/ref/fate/iff-byterun1 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 5/6 -0, 0, 0, 0, 230400, 0x35e51c62 +0, 0, 0, 1, 230400, 0x35e51c62 diff --git a/tests/ref/fate/iff-ilbm b/tests/ref/fate/iff-ilbm index 38c43eb589..93e026da97 100644 --- a/tests/ref/fate/iff-ilbm +++ b/tests/ref/fate/iff-ilbm @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 1/1 -0, 0, 0, 0, 230400, 0x0929e342 +0, 0, 0, 1, 230400, 0x0929e342 diff --git a/tests/ref/fate/iv8-demux b/tests/ref/fate/iv8-demux index 518f3de974..5b4cf0d4b0 100644 --- a/tests/ref/fate/iv8-demux +++ b/tests/ref/fate/iv8-demux @@ -4,28 +4,28 @@ #codec_id 0: mpeg4 #dimensions 0: 704x576 #sar 0: 1/1 -0, 0, 0, 0, 20883, 0x347191e2 -0, 3600, 3600, 0, 20882, 0xe1573905 -0, 7200, 7200, 0, 20894, 0xd54f516a -0, 10800, 10800, 0, 20891, 0x1b5c5039 -0, 14400, 14400, 0, 20883, 0x8e785b4d -0, 18000, 18000, 0, 20870, 0xd26ca1f6 -0, 21600, 21600, 0, 21448, 0x946f5b2b -0, 25200, 25200, 0, 21433, 0xb18687c5 -0, 28800, 28800, 0, 20865, 0xc0eb3fce -0, 32399, 32399, 0, 20842, 0x9d0728ba -0, 35999, 35999, 0, 20878, 0xf60f5dee -0, 39600, 39600, 0, 20866, 0x3bde568f -0, 43200, 43200, 0, 20884, 0x22736993 -0, 46800, 46800, 0, 20860, 0xf56f2fca -0, 50400, 50400, 0, 20872, 0xf39e3cb3 -0, 53999, 53999, 0, 20835, 0xa3c4363b -0, 57600, 57600, 0, 20905, 0x552853d1 -0, 61200, 61200, 0, 20874, 0xed0b91ec -0, 64799, 64799, 0, 20877, 0xe1623e01 -0, 68399, 68399, 0, 20933, 0x19906564 -0, 72000, 72000, 0, 20891, 0x3d064fd3 -0, 75600, 75600, 0, 20834, 0xcb774dbc -0, 79200, 79200, 0, 20870, 0xbc536589 -0, 82800, 82800, 0, 21421, 0xc99a68e4 -0, 86400, 86400, 0, 12869, 0x5684e304 +0, 0, 0, 3600, 20883, 0x347191e2 +0, 3600, 3600, 3600, 20882, 0xe1573905 +0, 7200, 7200, 3600, 20894, 0xd54f516a +0, 10800, 10800, 3600, 20891, 0x1b5c5039 +0, 14400, 14400, 3600, 20883, 0x8e785b4d +0, 18000, 18000, 3600, 20870, 0xd26ca1f6 +0, 21600, 21600, 3600, 21448, 0x946f5b2b +0, 25200, 25200, 3600, 21433, 0xb18687c5 +0, 28800, 28800, 3600, 20865, 0xc0eb3fce +0, 32399, 32399, 3600, 20842, 0x9d0728ba +0, 35999, 35999, 3600, 20878, 0xf60f5dee +0, 39600, 39600, 3600, 20866, 0x3bde568f +0, 43200, 43200, 3600, 20884, 0x22736993 +0, 46800, 46800, 3600, 20860, 0xf56f2fca +0, 50400, 50400, 3600, 20872, 0xf39e3cb3 +0, 53999, 53999, 3600, 20835, 0xa3c4363b +0, 57600, 57600, 3600, 20905, 0x552853d1 +0, 61200, 61200, 3600, 20874, 0xed0b91ec +0, 64799, 64799, 3600, 20877, 0xe1623e01 +0, 68399, 68399, 3600, 20933, 0x19906564 +0, 72000, 72000, 3600, 20891, 0x3d064fd3 +0, 75600, 75600, 3600, 20834, 0xcb774dbc +0, 79200, 79200, 3600, 20870, 0xbc536589 +0, 82800, 82800, 3600, 21421, 0xc99a68e4 +0, 86400, 86400, 3600, 12869, 0x5684e304 diff --git a/tests/ref/fate/mimic b/tests/ref/fate/mimic index e36e6a8c91..06209481af 100644 --- a/tests/ref/fate/mimic +++ b/tests/ref/fate/mimic @@ -3,79 +3,79 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 0/1 -0, 0, 0, 0, 115200, 0xa974d407 -0, 548, 548, 0, 115200, 0x72618b84 -0, 1088, 1088, 0, 115200, 0x87768573 -0, 1759, 1759, 0, 115200, 0x5d218e3e -0, 2437, 2437, 0, 115200, 0x0c0db41c -0, 3076, 3076, 0, 115200, 0xb777fd48 -0, 3908, 3908, 0, 115200, 0x40765de7 -0, 4545, 4545, 0, 115200, 0x370a3c90 -0, 5092, 5092, 0, 115200, 0xc605785a -0, 6016, 6016, 0, 115200, 0x49468b23 -0, 6560, 6560, 0, 115200, 0x986b6fd4 -0, 7648, 7648, 0, 115200, 0x30f22ef8 -0, 8164, 8164, 0, 115200, 0xa90bd608 -0, 8836, 8836, 0, 115200, 0x9cf36518 -0, 9632, 9632, 0, 115200, 0x4ef1a679 -0, 9922, 9922, 0, 115200, 0x0df65873 -0, 10316, 10316, 0, 115200, 0xfecd4233 -0, 11104, 11104, 0, 115200, 0xee2f26cb -0, 11776, 11776, 0, 115200, 0x795f612d -0, 12321, 12321, 0, 115200, 0xbbb90125 -0, 12992, 12992, 0, 115200, 0x9230fb6e -0, 13805, 13805, 0, 115200, 0x11869996 -0, 14468, 14468, 0, 115200, 0x6b5c892b -0, 15136, 15136, 0, 115200, 0x88bdb9cd -0, 15937, 15937, 0, 115200, 0x364bc5a0 -0, 16608, 16608, 0, 115200, 0x6b66d817 -0, 17281, 17281, 0, 115200, 0xd3a41252 -0, 18089, 18089, 0, 115200, 0x0cf5612f -0, 18754, 18754, 0, 115200, 0x9752d055 -0, 19808, 19808, 0, 115200, 0x486e9f6f -0, 20484, 20484, 0, 115200, 0x3eab62f8 -0, 21031, 21031, 0, 115200, 0xa7f52762 -0, 21957, 21957, 0, 115200, 0xfd4c4bbc -0, 22498, 22498, 0, 115200, 0x194023f6 -0, 22880, 22880, 0, 115200, 0xd4668dad -0, 23680, 23680, 0, 115200, 0x6b20d64b -0, 24353, 24353, 0, 115200, 0xf2572aae -0, 24901, 24901, 0, 115200, 0xc3554f25 -0, 25695, 25695, 0, 115200, 0xeeb5073a -0, 26495, 26495, 0, 115200, 0xbd46291f -0, 27040, 27040, 0, 115200, 0x0526838d -0, 28107, 28107, 0, 115200, 0x85b2e864 -0, 28778, 28778, 0, 115200, 0xcfd894bc -0, 29316, 29316, 0, 115200, 0x644f10fb -0, 30240, 30240, 0, 115200, 0x556e4d88 -0, 30786, 30786, 0, 115200, 0x93243614 -0, 31983, 31983, 0, 115200, 0x754275c5 -0, 32929, 32929, 0, 115200, 0x7f648bf3 -0, 33600, 33600, 0, 115200, 0xece18c9b -0, 34271, 34271, 0, 115200, 0x385d52c1 -0, 35201, 35201, 0, 115200, 0xafc58e4a -0, 35743, 35743, 0, 115200, 0x50daf750 -0, 36384, 36384, 0, 115200, 0xf6bc67d1 -0, 37344, 37344, 0, 115200, 0xb64b6e07 -0, 38028, 38028, 0, 115200, 0x8751ed15 -0, 38657, 38657, 0, 115200, 0x329ce803 -0, 39334, 39334, 0, 115200, 0x40b2cb05 -0, 40129, 40129, 0, 115200, 0x60f3517d -0, 40802, 40802, 0, 115200, 0xe0d46fdf -0, 41472, 41472, 0, 115200, 0x204529fa -0, 42276, 42276, 0, 115200, 0xd5afaf22 -0, 42944, 42944, 0, 115200, 0xd3cb3d4c -0, 43616, 43616, 0, 115200, 0x87973a79 -0, 44421, 44421, 0, 115200, 0xe3b2f917 -0, 45092, 45092, 0, 115200, 0xf1923238 -0, 45632, 45632, 0, 115200, 0x51494d71 -0, 46561, 46561, 0, 115200, 0x58bc59bb -0, 47105, 47105, 0, 115200, 0xd0273fdb -0, 47776, 47776, 0, 115200, 0x6cc79700 -0, 48294, 48294, 0, 115200, 0xc8172d31 -0, 48960, 48960, 0, 115200, 0x8eb037ef -0, 49504, 49504, 0, 115200, 0xc0bc2d76 -0, 50053, 50053, 0, 115200, 0x663c467a -0, 50597, 50597, 0, 115200, 0xd085e950 -0, 51520, 51520, 0, 115200, 0x7d198d72 -0, 52092, 52092, 0, 115200, 0x6ebacda0 +0, 0, 0, 1, 115200, 0xa974d407 +0, 548, 548, 1, 115200, 0x72618b84 +0, 1088, 1088, 1, 115200, 0x87768573 +0, 1759, 1759, 1, 115200, 0x5d218e3e +0, 2437, 2437, 1, 115200, 0x0c0db41c +0, 3076, 3076, 1, 115200, 0xb777fd48 +0, 3908, 3908, 1, 115200, 0x40765de7 +0, 4545, 4545, 1, 115200, 0x370a3c90 +0, 5092, 5092, 1, 115200, 0xc605785a +0, 6016, 6016, 1, 115200, 0x49468b23 +0, 6560, 6560, 1, 115200, 0x986b6fd4 +0, 7648, 7648, 1, 115200, 0x30f22ef8 +0, 8164, 8164, 1, 115200, 0xa90bd608 +0, 8836, 8836, 1, 115200, 0x9cf36518 +0, 9632, 9632, 1, 115200, 0x4ef1a679 +0, 9922, 9922, 1, 115200, 0x0df65873 +0, 10316, 10316, 1, 115200, 0xfecd4233 +0, 11104, 11104, 1, 115200, 0xee2f26cb +0, 11776, 11776, 1, 115200, 0x795f612d +0, 12321, 12321, 1, 115200, 0xbbb90125 +0, 12992, 12992, 1, 115200, 0x9230fb6e +0, 13805, 13805, 1, 115200, 0x11869996 +0, 14468, 14468, 1, 115200, 0x6b5c892b +0, 15136, 15136, 1, 115200, 0x88bdb9cd +0, 15937, 15937, 1, 115200, 0x364bc5a0 +0, 16608, 16608, 1, 115200, 0x6b66d817 +0, 17281, 17281, 1, 115200, 0xd3a41252 +0, 18089, 18089, 1, 115200, 0x0cf5612f +0, 18754, 18754, 1, 115200, 0x9752d055 +0, 19808, 19808, 1, 115200, 0x486e9f6f +0, 20484, 20484, 1, 115200, 0x3eab62f8 +0, 21031, 21031, 1, 115200, 0xa7f52762 +0, 21957, 21957, 1, 115200, 0xfd4c4bbc +0, 22498, 22498, 1, 115200, 0x194023f6 +0, 22880, 22880, 1, 115200, 0xd4668dad +0, 23680, 23680, 1, 115200, 0x6b20d64b +0, 24353, 24353, 1, 115200, 0xf2572aae +0, 24901, 24901, 1, 115200, 0xc3554f25 +0, 25695, 25695, 1, 115200, 0xeeb5073a +0, 26495, 26495, 1, 115200, 0xbd46291f +0, 27040, 27040, 1, 115200, 0x0526838d +0, 28107, 28107, 1, 115200, 0x85b2e864 +0, 28778, 28778, 1, 115200, 0xcfd894bc +0, 29316, 29316, 1, 115200, 0x644f10fb +0, 30240, 30240, 1, 115200, 0x556e4d88 +0, 30786, 30786, 1, 115200, 0x93243614 +0, 31983, 31983, 1, 115200, 0x754275c5 +0, 32929, 32929, 1, 115200, 0x7f648bf3 +0, 33600, 33600, 1, 115200, 0xece18c9b +0, 34271, 34271, 1, 115200, 0x385d52c1 +0, 35201, 35201, 1, 115200, 0xafc58e4a +0, 35743, 35743, 1, 115200, 0x50daf750 +0, 36384, 36384, 1, 115200, 0xf6bc67d1 +0, 37344, 37344, 1, 115200, 0xb64b6e07 +0, 38028, 38028, 1, 115200, 0x8751ed15 +0, 38657, 38657, 1, 115200, 0x329ce803 +0, 39334, 39334, 1, 115200, 0x40b2cb05 +0, 40129, 40129, 1, 115200, 0x60f3517d +0, 40802, 40802, 1, 115200, 0xe0d46fdf +0, 41472, 41472, 1, 115200, 0x204529fa +0, 42276, 42276, 1, 115200, 0xd5afaf22 +0, 42944, 42944, 1, 115200, 0xd3cb3d4c +0, 43616, 43616, 1, 115200, 0x87973a79 +0, 44421, 44421, 1, 115200, 0xe3b2f917 +0, 45092, 45092, 1, 115200, 0xf1923238 +0, 45632, 45632, 1, 115200, 0x51494d71 +0, 46561, 46561, 1, 115200, 0x58bc59bb +0, 47105, 47105, 1, 115200, 0xd0273fdb +0, 47776, 47776, 1, 115200, 0x6cc79700 +0, 48294, 48294, 1, 115200, 0xc8172d31 +0, 48960, 48960, 1, 115200, 0x8eb037ef +0, 49504, 49504, 1, 115200, 0xc0bc2d76 +0, 50053, 50053, 1, 115200, 0x663c467a +0, 50597, 50597, 1, 115200, 0xd085e950 +0, 51520, 51520, 1, 115200, 0x7d198d72 +0, 52092, 52092, 1, 115200, 0x6ebacda0 diff --git a/tests/ref/fate/mss2-pal b/tests/ref/fate/mss2-pal index a2fb12fdfc..ae5de4ec1f 100644 --- a/tests/ref/fate/mss2-pal +++ b/tests/ref/fate/mss2-pal @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 9216, 0xd3c106ef -0, 100, 100, 0, 9216, 0x8871f7c2 +0, 0, 0, 1, 9216, 0xd3c106ef +0, 100, 100, 1, 9216, 0x8871f7c2 diff --git a/tests/ref/fate/mss2-pals b/tests/ref/fate/mss2-pals index a2fb12fdfc..ae5de4ec1f 100644 --- a/tests/ref/fate/mss2-pals +++ b/tests/ref/fate/mss2-pals @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 9216, 0xd3c106ef -0, 100, 100, 0, 9216, 0x8871f7c2 +0, 0, 0, 1, 9216, 0xd3c106ef +0, 100, 100, 1, 9216, 0x8871f7c2 diff --git a/tests/ref/fate/mss2-rgb555 b/tests/ref/fate/mss2-rgb555 index 10f1f03e7f..95661e776c 100644 --- a/tests/ref/fate/mss2-rgb555 +++ b/tests/ref/fate/mss2-rgb555 @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 6144, 0x4145b7ae -0, 100, 100, 0, 6144, 0x3b2b38de +0, 0, 0, 1, 6144, 0x4145b7ae +0, 100, 100, 1, 6144, 0x3b2b38de diff --git a/tests/ref/fate/mss2-rgb555s b/tests/ref/fate/mss2-rgb555s index 10f1f03e7f..95661e776c 100644 --- a/tests/ref/fate/mss2-rgb555s +++ b/tests/ref/fate/mss2-rgb555s @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 6144, 0x4145b7ae -0, 100, 100, 0, 6144, 0x3b2b38de +0, 0, 0, 1, 6144, 0x4145b7ae +0, 100, 100, 1, 6144, 0x3b2b38de diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg index b6f3b080dc..bc5af1ca22 100644 --- a/tests/ref/fate/nuv-rtjpeg +++ b/tests/ref/fate/nuv-rtjpeg @@ -3,11 +3,11 @@ #codec_id 0: rawvideo #dimensions 0: 640x480 #sar 0: 1/1 -0, 118, 118, 0, 460800, 0x54aedafe -0, 152, 152, 0, 460800, 0xb7aa8b56 -0, 177, 177, 0, 460800, 0x283ea3b5 -0, 202, 202, 0, 460800, 0x283ea3b5 -0, 235, 235, 0, 460800, 0x10e577de -0, 269, 269, 0, 460800, 0x4e091ee2 -0, 302, 302, 0, 460800, 0x2ea88828 -0, 335, 335, 0, 460800, 0x4b7f4df0 +0, 118, 118, 1, 460800, 0x54aedafe +0, 152, 152, 1, 460800, 0xb7aa8b56 +0, 177, 177, 1, 460800, 0x283ea3b5 +0, 202, 202, 1, 460800, 0x283ea3b5 +0, 235, 235, 1, 460800, 0x10e577de +0, 269, 269, 1, 460800, 0x4e091ee2 +0, 302, 302, 1, 460800, 0x2ea88828 +0, 335, 335, 1, 460800, 0x4b7f4df0 diff --git a/tests/ref/fate/segment-mp4-to-ts b/tests/ref/fate/segment-mp4-to-ts index 847c1a297d..dfefb0af20 100644 --- a/tests/ref/fate/segment-mp4-to-ts +++ b/tests/ref/fate/segment-mp4-to-ts @@ -4,35 +4,35 @@ #codec_id 0: h264 #dimensions 0: 640x360 #sar 0: 1/1 -0, -7200, 0, 0, 22630, 0x9b109541, S=1, 1, 0x00e000e0 -0, -3600, 14400, 0, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 -0, 0, 7200, 0, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 -0, 3600, 3600, 0, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 -0, 7200, 10800, 0, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 -0, 10800, 28800, 0, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 -0, 14400, 21600, 0, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 -0, 18000, 18000, 0, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 -0, 21600, 25200, 0, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 -0, 25200, 43200, 0, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 -0, 28800, 36000, 0, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 -0, 32400, 32400, 0, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 -0, 36000, 39600, 0, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 -0, 39600, 57600, 0, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 -0, 43200, 50400, 0, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 -0, 46800, 46800, 0, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 -0, 50400, 54000, 0, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 -0, 54000, 72000, 0, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 -0, 57600, 64800, 0, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 -0, 61200, 61200, 0, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 -0, 64800, 68400, 0, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 -0, 68400, 86400, 0, 26555, 0x5629b584, S=1, 1, 0x00e000e0 -0, 72000, 79200, 0, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 -0, 75600, 75600, 0, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 -0, 79200, 82800, 0, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 -0, 82800, 100800, 0, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 -0, 86400, 93600, 0, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 -0, 90000, 90000, 0, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 -0, 93600, 97200, 0, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 +0, -7200, 0, 3600, 22630, 0x9b109541, S=1, 1, 0x00e000e0 +0, -3600, 14400, 3600, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 +0, 0, 7200, 3600, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 +0, 3600, 3600, 3600, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 +0, 7200, 10800, 3600, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 +0, 10800, 28800, 3600, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 +0, 14400, 21600, 3600, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 +0, 18000, 18000, 3600, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 +0, 21600, 25200, 3600, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 +0, 25200, 43200, 3600, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 +0, 28800, 36000, 3600, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 +0, 32400, 32400, 3600, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 +0, 36000, 39600, 3600, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 +0, 39600, 57600, 3600, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 +0, 43200, 50400, 3600, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 +0, 46800, 46800, 3600, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 +0, 50400, 54000, 3600, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 +0, 54000, 72000, 3600, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 +0, 57600, 64800, 3600, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 +0, 61200, 61200, 3600, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 68400, 3600, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 +0, 68400, 86400, 3600, 26555, 0x5629b584, S=1, 1, 0x00e000e0 +0, 72000, 79200, 3600, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 +0, 75600, 75600, 3600, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 +0, 79200, 82800, 3600, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 +0, 82800, 100800, 3600, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 +0, 86400, 93600, 3600, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 +0, 90000, 90000, 3600, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 +0, 93600, 97200, 3600, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 0, 97200, 115200, 3600, 4268, 0xec1235b5, F=0x0, S=1, 1, 0x00e000e0 0, 100800, 108000, 3600, 1119, 0x65f51fb7, F=0x0, S=1, 1, 0x00e000e0 0, 104400, 104400, 3600, 766, 0x213b78d3, F=0x0, S=1, 1, 0x00e000e0 diff --git a/tests/ref/fate/smjpeg-demux b/tests/ref/fate/smjpeg-demux index 042f9ff9ec..cb2da6909d 100644 --- a/tests/ref/fate/smjpeg-demux +++ b/tests/ref/fate/smjpeg-demux @@ -9,239 +9,239 @@ #sample_rate 1: 22050 #channel_layout 1: 4 #channel_layout_name 1: mono -0, 0, 0, 0, 734, 0x5a042c2c +0, 0, 0, 111, 734, 0x5a042c2c 1, 0, 0, 23, 260, 0x00000000 1, 23, 23, 23, 260, 0x00000000 1, 46, 46, 23, 260, 0xac9e0a9b 1, 69, 69, 23, 260, 0x89256f5b 1, 92, 92, 23, 260, 0x8e646e36 -0, 111, 111, 0, 763, 0xb5893f2f +0, 111, 111, 111, 763, 0xb5893f2f 1, 116, 116, 23, 260, 0x3ab972fc 1, 139, 139, 23, 260, 0xaea86bb2 1, 162, 162, 23, 260, 0x2366447a 1, 185, 185, 23, 260, 0x82c14f9c 1, 208, 208, 23, 260, 0xcdcf6fa8 -0, 222, 222, 0, 3023, 0x0f3907d3 +0, 222, 222, 111, 3023, 0x0f3907d3 1, 232, 232, 23, 260, 0xb3ed64bd 1, 255, 255, 23, 260, 0xac304b92 1, 278, 278, 23, 260, 0xc8bc553b 1, 301, 301, 23, 260, 0xd35572b4 1, 325, 325, 23, 260, 0x182f6190 -0, 333, 333, 0, 4800, 0x22e6e18a +0, 333, 333, 111, 4800, 0x22e6e18a 1, 348, 348, 23, 260, 0xbf9145c0 1, 371, 371, 23, 260, 0x0ec85a7e 1, 394, 394, 23, 260, 0x3684720e 1, 417, 417, 23, 260, 0xe985616a 1, 441, 441, 23, 260, 0x12b147dc -0, 444, 444, 0, 6417, 0x427adde5 +0, 444, 444, 111, 6417, 0x427adde5 1, 464, 464, 23, 260, 0xb8b55dd9 1, 487, 487, 23, 260, 0xfd4a7007 1, 510, 510, 23, 260, 0xfcc05c9a 1, 534, 534, 23, 260, 0x20f74aea -0, 555, 555, 0, 6776, 0x7a74c6ad +0, 555, 555, 111, 6776, 0x7a74c6ad 1, 557, 557, 23, 260, 0x025359ca 1, 580, 580, 23, 260, 0xace44ba1 1, 603, 603, 23, 260, 0x03506929 1, 626, 626, 23, 260, 0x8a926f17 1, 650, 650, 23, 260, 0x4a7061e7 -0, 666, 666, 0, 6808, 0x1f6eb7c3 +0, 666, 666, 111, 6808, 0x1f6eb7c3 1, 673, 673, 23, 260, 0xf8b66cc9 1, 696, 696, 23, 260, 0xe8c96dec 1, 719, 719, 23, 260, 0x672a54a6 1, 743, 743, 23, 260, 0xe97b5698 1, 766, 766, 23, 260, 0x377f684d -0, 777, 777, 0, 6726, 0x452087e6 +0, 777, 777, 111, 6726, 0x452087e6 1, 789, 789, 23, 260, 0xe9a66786 1, 812, 812, 23, 260, 0xf8e17080 1, 835, 835, 23, 260, 0x65eb662a 1, 859, 859, 23, 260, 0xd8d361e9 1, 882, 882, 23, 260, 0xb8115a0b -0, 888, 888, 0, 6829, 0xee82b109 +0, 888, 888, 111, 6829, 0xee82b109 1, 905, 905, 23, 260, 0xa5a85461 1, 928, 928, 23, 260, 0xf401663b 1, 952, 952, 23, 260, 0x042f714e 1, 975, 975, 23, 260, 0xdf195820 1, 998, 998, 23, 260, 0x0a67653c -0, 999, 999, 0, 7055, 0xf41f1108 +0, 999, 999, 111, 7055, 0xf41f1108 1, 1021, 1021, 23, 260, 0xe9b44d02 1, 1044, 1044, 23, 260, 0xbd4747b9 1, 1068, 1068, 23, 260, 0x3ef66738 1, 1091, 1091, 23, 260, 0x0f4a6e44 -0, 1111, 1111, 0, 6977, 0xf8fe1ede +0, 1111, 1111, 111, 6977, 0xf8fe1ede 1, 1114, 1114, 23, 260, 0xaa3d6eb6 1, 1137, 1137, 23, 260, 0xb9a46c4a 1, 1160, 1160, 23, 260, 0x4f974c2e 1, 1184, 1184, 23, 260, 0x9e714a00 1, 1207, 1207, 23, 260, 0x601a7152 -0, 1222, 1222, 0, 6942, 0x9ad105c6 +0, 1222, 1222, 111, 6942, 0x9ad105c6 1, 1230, 1230, 23, 260, 0xaf317064 1, 1253, 1253, 23, 260, 0x163d4829 1, 1277, 1277, 23, 260, 0xc56b4f1a 1, 1300, 1300, 23, 260, 0x7623729c 1, 1323, 1323, 23, 260, 0xa514694f -0, 1333, 1333, 0, 6926, 0xe239dad6 +0, 1333, 1333, 111, 6926, 0xe239dad6 1, 1346, 1346, 23, 260, 0x93ee4ad8 1, 1369, 1369, 23, 260, 0x6d8e573f 1, 1393, 1393, 23, 260, 0x13256d68 1, 1416, 1416, 23, 260, 0x187761a2 1, 1439, 1439, 23, 260, 0x426045e7 -0, 1444, 1444, 0, 6966, 0x81dcfab1 +0, 1444, 1444, 111, 6966, 0x81dcfab1 1, 1462, 1462, 23, 260, 0x7e7e5891 1, 1486, 1486, 23, 260, 0xd6926dcc 1, 1509, 1509, 23, 260, 0xf0196061 1, 1532, 1532, 23, 260, 0x7cac49a3 -0, 1555, 1555, 0, 6896, 0x31e6cc02 +0, 1555, 1555, 111, 6896, 0x31e6cc02 1, 1555, 1555, 23, 260, 0x24f4549a 1, 1578, 1578, 23, 260, 0x937f551d 1, 1602, 1602, 23, 260, 0x9bf462c5 1, 1625, 1625, 23, 260, 0xd1e07436 1, 1648, 1648, 23, 260, 0xdab36215 -0, 1666, 1666, 0, 6889, 0x1cc1006e +0, 1666, 1666, 111, 6889, 0x1cc1006e 1, 1671, 1671, 23, 260, 0xabc5662b 1, 1695, 1695, 23, 260, 0xa24f6bf1 1, 1718, 1718, 23, 260, 0x39e664b2 1, 1741, 1741, 23, 260, 0xf5dc54ca 1, 1764, 1764, 23, 260, 0xc3b16974 -0, 1777, 1777, 0, 6933, 0xc303f87f +0, 1777, 1777, 111, 6933, 0xc303f87f 1, 1787, 1787, 23, 260, 0x6cf46bca 1, 1811, 1811, 23, 260, 0x7a6b69b9 1, 1834, 1834, 23, 260, 0xc02f69b9 1, 1857, 1857, 23, 260, 0x7fc764a9 1, 1880, 1880, 23, 260, 0xd9705b09 -0, 1888, 1888, 0, 7034, 0xb4970a20 +0, 1888, 1888, 111, 7034, 0xb4970a20 1, 1904, 1904, 23, 260, 0x17b05f49 1, 1927, 1927, 23, 260, 0x10ad647c 1, 1950, 1950, 23, 260, 0xf9636d69 1, 1973, 1973, 23, 260, 0x622b5ad9 1, 1996, 1996, 23, 260, 0x175b646d -0, 1999, 1999, 0, 6961, 0xf064095d +0, 1999, 1999, 111, 6961, 0xf064095d 1, 2020, 2020, 23, 260, 0x722b5827 1, 2043, 2043, 23, 260, 0x83614974 1, 2066, 2066, 23, 260, 0x80366587 1, 2089, 2089, 23, 260, 0x050f6bf9 -0, 2111, 2111, 0, 7089, 0x5ba350f9 +0, 2111, 2111, 111, 7089, 0x5ba350f9 1, 2113, 2113, 23, 260, 0x949d6735 1, 2136, 2136, 23, 260, 0x62cd7184 1, 2159, 2159, 23, 260, 0x21e45713 1, 2182, 2182, 23, 260, 0x56314509 1, 2205, 2205, 23, 260, 0x7a1570d3 -0, 2222, 2222, 0, 7078, 0xa83f3e88 +0, 2222, 2222, 111, 7078, 0xa83f3e88 1, 2229, 2229, 23, 260, 0x205a6ffb 1, 2252, 2252, 23, 260, 0xead94483 1, 2275, 2275, 23, 260, 0x93c84f10 1, 2298, 2298, 23, 260, 0xdf45726f 1, 2321, 2321, 23, 260, 0x35016f1e -0, 2333, 2333, 0, 7147, 0xcda66cfc +0, 2333, 2333, 111, 7147, 0xcda66cfc 1, 2345, 2345, 23, 260, 0xa8114bcd 1, 2368, 2368, 23, 260, 0x14c45130 1, 2391, 2391, 23, 260, 0x97b07052 1, 2414, 2414, 23, 260, 0x039b6c77 1, 2438, 2438, 23, 260, 0x46f74635 -0, 2444, 2444, 0, 7173, 0xb7455859 +0, 2444, 2444, 111, 7173, 0xb7455859 1, 2461, 2461, 23, 260, 0x4116540d 1, 2484, 2484, 23, 260, 0x26747067 1, 2507, 2507, 23, 260, 0x37f16485 1, 2530, 2530, 23, 260, 0x631d4a33 1, 2554, 2554, 23, 260, 0x14ed598d -0, 2555, 2555, 0, 7213, 0x97b89994 +0, 2555, 2555, 111, 7213, 0x97b89994 1, 2577, 2577, 23, 260, 0x3f9349e7 1, 2600, 2600, 23, 260, 0x91295757 1, 2623, 2623, 23, 260, 0x95de72bc 1, 2647, 2647, 23, 260, 0xc7ee5ddb -0, 2666, 2666, 0, 7170, 0xca8b2948 +0, 2666, 2666, 111, 7170, 0xca8b2948 1, 2670, 2670, 23, 260, 0x38e965cd 1, 2693, 2693, 23, 260, 0xfae169e9 1, 2716, 2716, 23, 260, 0x9c226143 1, 2739, 2739, 23, 260, 0x1a804dbe 1, 2763, 2763, 23, 260, 0x4aeb633c -0, 2777, 2777, 0, 7174, 0xc7cc6bbb +0, 2777, 2777, 111, 7174, 0xc7cc6bbb 1, 2786, 2786, 23, 260, 0xa66e6bbb 1, 2809, 2809, 23, 260, 0x51d17109 1, 2832, 2832, 23, 260, 0x2bc86b9b 1, 2856, 2856, 23, 260, 0xe56e6378 1, 2879, 2879, 23, 260, 0x95665b47 -0, 2888, 2888, 0, 7235, 0xc2e68d2b +0, 2888, 2888, 111, 7235, 0xc2e68d2b 1, 2902, 2902, 23, 260, 0x1c255fdb 1, 2925, 2925, 23, 260, 0x3a2456cb 1, 2948, 2948, 23, 260, 0xe18e7270 1, 2972, 2972, 23, 260, 0x55b65c60 1, 2995, 2995, 23, 260, 0x62be6515 -0, 3000, 3000, 0, 7261, 0x8204a423 +0, 3000, 3000, 111, 7261, 0x8204a423 1, 3018, 3018, 23, 260, 0xdba25d09 1, 3041, 3041, 23, 260, 0xd7cc4e40 1, 3065, 3065, 23, 260, 0x335661be 1, 3088, 3088, 23, 260, 0xc3286de3 -0, 3111, 3111, 0, 7353, 0xacc7e7c0 +0, 3111, 3111, 111, 7353, 0xacc7e7c0 1, 3111, 3111, 23, 260, 0x47e76e35 1, 3134, 3134, 23, 260, 0x4b716f77 1, 3157, 3157, 23, 260, 0x0716519e 1, 3181, 3181, 23, 260, 0x032b4490 1, 3204, 3204, 23, 260, 0x15f067e8 -0, 3222, 3222, 0, 7065, 0x45035c5c +0, 3222, 3222, 111, 7065, 0x45035c5c 1, 3227, 3227, 23, 260, 0x16766ffa 1, 3250, 3250, 23, 260, 0xc94154ac 1, 3274, 3274, 23, 260, 0x74764bcd 1, 3297, 3297, 23, 260, 0x3fad6f8f 1, 3320, 3320, 23, 260, 0x5fa972a9 -0, 3333, 3333, 0, 7269, 0x72edbb76 +0, 3333, 3333, 111, 7269, 0x72edbb76 1, 3343, 3343, 23, 260, 0xde2a4b7b 1, 3366, 3366, 23, 260, 0xd8494408 1, 3390, 3390, 23, 260, 0x843d71a6 1, 3413, 3413, 23, 260, 0x87fd6b60 1, 3436, 3436, 23, 260, 0x1cc04a39 -0, 3444, 3444, 0, 7220, 0xb926772f +0, 3444, 3444, 111, 7220, 0xb926772f 1, 3459, 3459, 23, 260, 0x9ca24d94 1, 3482, 3482, 23, 260, 0x820a7087 1, 3506, 3506, 23, 260, 0x631166b2 1, 3529, 3529, 23, 260, 0x2f20492a 1, 3552, 3552, 23, 260, 0x932156d0 -0, 3555, 3555, 0, 7326, 0x0a66c632 +0, 3555, 3555, 111, 7326, 0x0a66c632 1, 3575, 3575, 23, 260, 0xdad54c90 1, 3599, 3599, 23, 260, 0xcce84fc9 1, 3622, 3622, 23, 260, 0xba317486 1, 3645, 3645, 23, 260, 0xf5a4626a -0, 3666, 3666, 0, 7225, 0xe39076ab +0, 3666, 3666, 111, 7225, 0xe39076ab 1, 3668, 3668, 23, 260, 0x324669fd 1, 3691, 3691, 23, 260, 0xc7d37113 1, 3715, 3715, 23, 260, 0xc6e0644f 1, 3738, 3738, 23, 260, 0x1b91522e 1, 3761, 3761, 23, 260, 0x9b84667d -0, 3777, 3777, 0, 7265, 0xe0209036 +0, 3777, 3777, 111, 7265, 0xe0209036 1, 3784, 3784, 23, 260, 0xed7e66eb 1, 3808, 3808, 23, 260, 0xaf806d1f 1, 3831, 3831, 23, 260, 0x13a66941 1, 3854, 3854, 23, 260, 0x13095a41 1, 3877, 3877, 23, 260, 0x5ba05491 -0, 3888, 3888, 0, 7337, 0x7a5dc093 +0, 3888, 3888, 111, 7337, 0x7a5dc093 1, 3900, 3900, 23, 260, 0xbf785887 1, 3924, 3924, 23, 260, 0x21965973 1, 3947, 3947, 23, 260, 0xd9aa7134 1, 3970, 3970, 23, 260, 0x3add62bc 1, 3993, 3993, 23, 260, 0xb9626260 -0, 4000, 4000, 0, 7246, 0x519a7a3c +0, 4000, 4000, 111, 7246, 0x519a7a3c 1, 4017, 4017, 23, 260, 0x5b08629f 1, 4040, 4040, 23, 260, 0x43a34659 1, 4063, 4063, 23, 260, 0x68575bda 1, 4086, 4086, 23, 260, 0xd98b715a 1, 4109, 4109, 23, 260, 0x7d816a77 -0, 4111, 4111, 0, 7266, 0x352c8078 +0, 4111, 4111, 111, 7266, 0x352c8078 1, 4133, 4133, 23, 260, 0x16af6ff1 1, 4156, 4156, 23, 260, 0x6d4557a7 1, 4179, 4179, 23, 260, 0x0743401a 1, 4202, 4202, 23, 260, 0x410563d8 -0, 4222, 4222, 0, 7323, 0xcaf69d7c +0, 4222, 4222, 111, 7323, 0xcaf69d7c 1, 4226, 4226, 23, 260, 0x561371d1 1, 4249, 4249, 23, 260, 0x3ef15872 1, 4272, 4272, 23, 260, 0x1dd04972 1, 4295, 4295, 23, 260, 0xed226c62 1, 4318, 4318, 23, 260, 0x20857046 -0, 4333, 4333, 0, 7309, 0x98c1e6f7 +0, 4333, 4333, 111, 7309, 0x98c1e6f7 1, 4342, 4342, 23, 260, 0xed7f4724 1, 4365, 4365, 23, 260, 0x7a7445cf 1, 4388, 4388, 23, 260, 0x06ad6a93 1, 4411, 4411, 23, 260, 0xdd1b6c91 1, 4435, 4435, 23, 260, 0x05b94d27 -0, 4444, 4444, 0, 7121, 0x913d5bd6 +0, 4444, 4444, 111, 7121, 0x913d5bd6 1, 4458, 4458, 23, 260, 0x12cc5062 1, 4481, 4481, 23, 260, 0x44526d0f 1, 4504, 4504, 23, 260, 0xf2ac6d95 diff --git a/tests/ref/fate/vp9-tiling-pedestrian b/tests/ref/fate/vp9-tiling-pedestrian index 4b25a2914a..173869faa9 100644 --- a/tests/ref/fate/vp9-tiling-pedestrian +++ b/tests/ref/fate/vp9-tiling-pedestrian @@ -7,5 +7,5 @@ #dimensions 0: 1920x1080 #sar 0: 1/1 #stream#, dts, pts, duration, size, hash -0, 0, 0, 0, 3110400, 1e6c2e768a5107e57e6d626f0511193a -0, 40, 40, 0, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d +0, 0, 0, 1, 3110400, 1e6c2e768a5107e57e6d626f0511193a +0, 40, 40, 1, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d diff --git a/tests/ref/lavf-fate/vp8.ogg b/tests/ref/lavf-fate/vp8.ogg index 1a40825569..06240160b5 100644 --- a/tests/ref/lavf-fate/vp8.ogg +++ b/tests/ref/lavf-fate/vp8.ogg @@ -1,3 +1,3 @@ -c56d8dce728d46d4f0ab4c7cc9f86abc *tests/data/lavf-fate/lavf.vp8.ogg +20f1e9b1714513a0ba85ca636e818784 *tests/data/lavf-fate/lavf.vp8.ogg 95009 tests/data/lavf-fate/lavf.vp8.ogg -tests/data/lavf-fate/lavf.vp8.ogg CRC=0x8c067a66 +tests/data/lavf-fate/lavf.vp8.ogg CRC=0xa5857a66 From patchwork Tue Dec 1 20:19:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24222 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DE9F444BA85 for ; Tue, 1 Dec 2020 22:31:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B49CF689ADE; Tue, 1 Dec 2020 22:31:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F1F5689910 for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 97C09296B23 for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 6-k6xC0ChPin for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 24C89296B54 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 3644F3A038D; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:45 +0100 Message-Id: <20201201201949.18834-5-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] ffmpeg: stop accessing deprecated stream-embedded codec context X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- fftools/ffmpeg.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 80f436eab3..b446d9b206 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3568,12 +3568,6 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, "Error initializing the output stream codec context.\n"); exit_program(1); } - /* - * FIXME: ost->st->codec should't be needed here anymore. - */ - ret = avcodec_copy_context(ost->st->codec, ost->enc_ctx); - if (ret < 0) - return ret; if (ost->enc_ctx->nb_coded_side_data) { int i; @@ -3618,8 +3612,6 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, // copy estimated duration as a hint to the muxer if (ost->st->duration <= 0 && ist && ist->st->duration > 0) ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); - - ost->st->codec->codec= ost->enc_ctx->codec; } else if (ost->stream_copy) { ret = init_output_stream_streamcopy(ost); if (ret < 0) @@ -4011,7 +4003,7 @@ static int check_keyboard_interaction(int64_t cur_time) if (key == 'd' || key == 'D'){ int debug=0; if(key == 'D') { - debug = input_streams[0]->st->codec->debug<<1; + debug = input_streams[0]->dec_ctx->debug << 1; if(!debug) debug = 1; while(debug & (FF_DEBUG_DCT_COEFF #if FF_API_DEBUG_MV @@ -4034,7 +4026,7 @@ static int check_keyboard_interaction(int64_t cur_time) fprintf(stderr,"error parsing debug value\n"); } for(i=0;ist->codec->debug = debug; + input_streams[i]->dec_ctx->debug = debug; } for(i=0;i X-Patchwork-Id: 24228 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5EBDE44BA85 for ; Tue, 1 Dec 2020 22:32:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 399A4689AF5; Tue, 1 Dec 2020 22:32:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FB606899E0 for ; Tue, 1 Dec 2020 22:31:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 8E129296B61 for ; Tue, 1 Dec 2020 21:31:46 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 6CblVRq7nKEp for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id E1B5B296B63 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4857D3A0421; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:46 +0100 Message-Id: <20201201201949.18834-6-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] tests: stop using -vsync drop X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It depends on the muxer generating the timestamps, which is deprecated and scheduled for removal on next bump. A bunch of tests change timestamps, because of ffmpeg.c is not generating them correctly. This should be fixed later. --- tests/fate/h264.mak | 334 +++++----- tests/fate/hevc.mak | 2 +- tests/fate/lossless-video.mak | 3 +- tests/fate/video.mak | 2 +- .../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 +++--- .../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 +- .../hevc-conformance-BUMPING_A_ericsson_1 | 90 +-- .../fate/hevc-conformance-CIP_A_Panasonic_3 | 4 +- .../fate/hevc-conformance-CIP_C_Panasonic_2 | 4 +- .../fate/hevc-conformance-DELTAQP_A_BRCM_4 | 2 +- .../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 +- .../ref/fate/hevc-conformance-SDH_A_Orange_3 | 4 +- tests/ref/fate/lagarith-ticket4119-drop | 8 - tests/ref/fate/mpeg2-ticket6677 | 14 +- 58 files changed, 3574 insertions(+), 3583 deletions(-) delete mode 100644 tests/ref/fate/lagarith-ticket4119-drop diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index e4b9758e1e..e034e6ae0f 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -233,7 +233,7 @@ FATE_SAMPLES_AVCONV += $(FATE_H264-yes) FATE_SAMPLES_FFPROBE += $(FATE_H264_FFPROBE-yes) fate-h264: $(FATE_H264-yes) $(FATE_H264_FFPROBE-yes) -fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264 +fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264 #force framerate so that the option is tested, theres no other case that tests it, its not needed at all otherwise here fate-h264-conformance-ba1_ft_c: CMD = framecrc -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264 @@ -253,173 +253,173 @@ fate-h264-conformance-caba2_sva_b: CMD = framecrc -i $(TARGET_SAM fate-h264-conformance-caba3_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_Sony_C.jsv fate-h264-conformance-caba3_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_SVA_B.264 fate-h264-conformance-caba3_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 -fate-h264-conformance-cabac_mot_fld0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l -fate-h264-conformance-cabac_mot_frm0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l -fate-h264-conformance-cabac_mot_mbaff0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l -fate-h264-conformance-cabac_mot_picaff0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l -fate-h264-conformance-cabaci3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv -fate-h264-conformance-cabast3_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv -fate-h264-conformance-cabastbr3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv -fate-h264-conformance-cabref3_sand_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264 -fate-h264-conformance-cacqp3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv -fate-h264-conformance-cafi1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264 -fate-h264-conformance-cama1_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv -fate-h264-conformance-cama1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264 -fate-h264-conformance-cama1_vtc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc -fate-h264-conformance-cama2_vtc_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc -fate-h264-conformance-cama3_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264 -fate-h264-conformance-cama3_vtc_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc -fate-h264-conformance-camaci3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv -fate-h264-conformance-camanl1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264 -fate-h264-conformance-camanl2_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264 -fate-h264-conformance-camanl3_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264 -fate-h264-conformance-camasl3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv -fate-h264-conformance-camp_mot_mbaff_l30: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l -fate-h264-conformance-camp_mot_mbaff_l31: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l -fate-h264-conformance-canl1_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv -fate-h264-conformance-canl1_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264 -fate-h264-conformance-canl1_toshiba_g: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264 -fate-h264-conformance-canl2_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv -fate-h264-conformance-canl2_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264 -fate-h264-conformance-canl3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv -fate-h264-conformance-canl3_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264 -fate-h264-conformance-canl4_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264 -fate-h264-conformance-canlma2_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv -fate-h264-conformance-canlma3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv -fate-h264-conformance-capa1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264 -fate-h264-conformance-capama3_sand_f: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 -fate-h264-conformance-capcm1_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264 -fate-h264-conformance-capcmnl1_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264 -fate-h264-conformance-capm3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv -fate-h264-conformance-caqp1_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv -fate-h264-conformance-cavlc_mot_fld0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l -fate-h264-conformance-cavlc_mot_frm0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l -fate-h264-conformance-cavlc_mot_mbaff0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l -fate-h264-conformance-cavlc_mot_picaff0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l -fate-h264-conformance-cawp1_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264 -fate-h264-conformance-cawp5_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264 -fate-h264-conformance-ci1_ft_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264 -fate-h264-conformance-ci_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264 -fate-h264-conformance-cvbs3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv -fate-h264-conformance-cvcanlma2_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv +fate-h264-conformance-cabac_mot_fld0_full: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l +fate-h264-conformance-cabac_mot_frm0_full: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l +fate-h264-conformance-cabac_mot_mbaff0_full: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l +fate-h264-conformance-cabac_mot_picaff0_full: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l +fate-h264-conformance-cabaci3_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv +fate-h264-conformance-cabast3_sony_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv +fate-h264-conformance-cabastbr3_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv +fate-h264-conformance-cabref3_sand_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264 +fate-h264-conformance-cacqp3_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv +fate-h264-conformance-cafi1_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264 +fate-h264-conformance-cama1_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv +fate-h264-conformance-cama1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264 +fate-h264-conformance-cama1_vtc_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc +fate-h264-conformance-cama2_vtc_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc +fate-h264-conformance-cama3_sand_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264 +fate-h264-conformance-cama3_vtc_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc +fate-h264-conformance-camaci3_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv +fate-h264-conformance-camanl1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264 +fate-h264-conformance-camanl2_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264 +fate-h264-conformance-camanl3_sand_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264 +fate-h264-conformance-camasl3_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv +fate-h264-conformance-camp_mot_mbaff_l30: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l +fate-h264-conformance-camp_mot_mbaff_l31: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l +fate-h264-conformance-canl1_sony_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv +fate-h264-conformance-canl1_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264 +fate-h264-conformance-canl1_toshiba_g: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264 +fate-h264-conformance-canl2_sony_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv +fate-h264-conformance-canl2_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264 +fate-h264-conformance-canl3_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv +fate-h264-conformance-canl3_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264 +fate-h264-conformance-canl4_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264 +fate-h264-conformance-canlma2_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv +fate-h264-conformance-canlma3_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv +fate-h264-conformance-capa1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264 +fate-h264-conformance-capama3_sand_f: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 +fate-h264-conformance-capcm1_sand_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264 +fate-h264-conformance-capcmnl1_sand_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264 +fate-h264-conformance-capm3_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv +fate-h264-conformance-caqp1_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv +fate-h264-conformance-cavlc_mot_fld0_full_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l +fate-h264-conformance-cavlc_mot_frm0_full_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l +fate-h264-conformance-cavlc_mot_mbaff0_full_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l +fate-h264-conformance-cavlc_mot_picaff0_full_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l +fate-h264-conformance-cawp1_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264 +fate-h264-conformance-cawp5_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264 +fate-h264-conformance-ci1_ft_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264 +fate-h264-conformance-ci_mw_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264 +fate-h264-conformance-cvbs3_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv +fate-h264-conformance-cvcanlma2_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv fate-h264-conformance-cvfc1_sony_c: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv -fate-h264-conformance-cvfi1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv -fate-h264-conformance-cvfi1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264 -fate-h264-conformance-cvfi2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv -fate-h264-conformance-cvfi2_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264 -fate-h264-conformance-cvma1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv -fate-h264-conformance-cvma1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264 -fate-h264-conformance-cvmanl1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264 -fate-h264-conformance-cvmanl2_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264 -fate-h264-conformance-cvmapaqp3_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv -fate-h264-conformance-cvmaqp2_sony_g: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv -fate-h264-conformance-cvmaqp3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv -fate-h264-conformance-cvmp_mot_fld_l30_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l -fate-h264-conformance-cvmp_mot_frm_l31_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l -fate-h264-conformance-cvnlfi1_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv -fate-h264-conformance-cvnlfi2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv -fate-h264-conformance-cvpa1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264 -fate-h264-conformance-cvpcmnl1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264 -fate-h264-conformance-cvpcmnl2_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264 -fate-h264-conformance-cvwp1_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264 -fate-h264-conformance-cvwp2_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264 -fate-h264-conformance-cvwp3_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264 -fate-h264-conformance-cvwp5_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264 -fate-h264-conformance-fi1_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv -fate-h264-conformance-frext-alphaconformanceg: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264 -fate-h264-conformance-frext-bcrm_freh10: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 -vsync drop -fate-h264-conformance-frext-brcm_freh11: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 -vsync drop -fate-h264-conformance-frext-brcm_freh3: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264 -fate-h264-conformance-frext-brcm_freh4: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 -vsync drop -fate-h264-conformance-frext-brcm_freh5: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264 -fate-h264-conformance-frext-brcm_freh8: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264 -fate-h264-conformance-frext-brcm_freh9: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264 -fate-h264-conformance-frext-freh12_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264 -fate-h264-conformance-frext-freh1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264 -fate-h264-conformance-frext-freh2_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264 -fate-h264-conformance-frext-freh6: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 -vsync drop -fate-h264-conformance-frext-freh7_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync drop -fate-h264-conformance-frext-frext01_jvc_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264 -fate-h264-conformance-frext-frext02_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264 -fate-h264-conformance-frext-frext1_panasonic_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc -fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0 -fate-h264-conformance-frext-frext3_panasonic_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc -fate-h264-conformance-frext-frext4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc -fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264 -fate-h264-conformance-frext-hcaff1_hhi_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264 -fate-h264-conformance-frext-hcafr1_hhi_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264 -fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264 -fate-h264-conformance-frext-hcafr3_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264 -fate-h264-conformance-frext-hcafr4_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264 -fate-h264-conformance-frext-hcamff1_hhi_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264 -fate-h264-conformance-frext-hi422fr10_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264 -fate-h264-conformance-frext-hi422fr13_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-hi422fr1_sony_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv -fate-h264-conformance-frext-hi422fr6_sony_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-hpca_brcm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264 -fate-h264-conformance-frext-hpcadq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264 -fate-h264-conformance-frext-hpcafl_bcrm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync drop -fate-h264-conformance-frext-hpcaflnl_bcrm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync drop -fate-h264-conformance-frext-hpcalq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264 -fate-h264-conformance-frext-hpcamapalq_bcrm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0 -fate-h264-conformance-frext-hpcamolq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264 -fate-h264-conformance-frext-hpcanl_brcm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264 -fate-h264-conformance-frext-hpcaq2lq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264 -fate-h264-conformance-frext-hpcv_brcm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264 -fate-h264-conformance-frext-hpcvfl_bcrm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync drop -fate-h264-conformance-frext-hpcvflnl_bcrm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync drop -fate-h264-conformance-frext-hpcvmolq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264 -fate-h264-conformance-frext-hpcvnl_brcm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264 -fate-h264-conformance-frext-pph10i1_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i2_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i3_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i5_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i6_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph10i7_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale -fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale -fate-h264-conformance-hcbp2_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264 -fate-h264-conformance-hcmp1_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264 -fate-h264-conformance-ls_sva_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264 -fate-h264-conformance-midr_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264 -fate-h264-conformance-mps_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264 -fate-h264-conformance-mr1_bt_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264 -fate-h264-conformance-mr1_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264 -fate-h264-conformance-mr2_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264 -fate-h264-conformance-mr2_tandberg_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264 -fate-h264-conformance-mr3_tandberg_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264 -fate-h264-conformance-mr4_tandberg_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264 -fate-h264-conformance-mr5_tandberg_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264 -fate-h264-conformance-mr6_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264 -fate-h264-conformance-mr7_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264 -fate-h264-conformance-mr8_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264 -fate-h264-conformance-mr9_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264 -fate-h264-conformance-mv1_brcm_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264 -fate-h264-conformance-nl1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv -fate-h264-conformance-nl2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv -fate-h264-conformance-nl3_sva_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264 -fate-h264-conformance-nlmq1_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264 -fate-h264-conformance-nlmq2_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264 -fate-h264-conformance-nrf_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264 -fate-h264-conformance-sharp_mp_field_1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt -fate-h264-conformance-sharp_mp_field_2_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt -fate-h264-conformance-sharp_mp_field_3_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt -fate-h264-conformance-sharp_mp_paff_1r2: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt -fate-h264-conformance-sharp_mp_paff_2r: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt -fate-h264-conformance-sl1_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264 -fate-h264-conformance-sva_ba1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264 -fate-h264-conformance-sva_ba2_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264 -fate-h264-conformance-sva_base_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264 -fate-h264-conformance-sva_cl1_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264 -fate-h264-conformance-sva_fm1_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264 -fate-h264-conformance-sva_nl1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264 -fate-h264-conformance-sva_nl2_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 +fate-h264-conformance-cvfi1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv +fate-h264-conformance-cvfi1_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264 +fate-h264-conformance-cvfi2_sony_h: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv +fate-h264-conformance-cvfi2_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264 +fate-h264-conformance-cvma1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv +fate-h264-conformance-cvma1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264 +fate-h264-conformance-cvmanl1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264 +fate-h264-conformance-cvmanl2_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264 +fate-h264-conformance-cvmapaqp3_sony_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv +fate-h264-conformance-cvmaqp2_sony_g: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv +fate-h264-conformance-cvmaqp3_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv +fate-h264-conformance-cvmp_mot_fld_l30_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l +fate-h264-conformance-cvmp_mot_frm_l31_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l +fate-h264-conformance-cvnlfi1_sony_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv +fate-h264-conformance-cvnlfi2_sony_h: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv +fate-h264-conformance-cvpa1_toshiba_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264 +fate-h264-conformance-cvpcmnl1_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264 +fate-h264-conformance-cvpcmnl2_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264 +fate-h264-conformance-cvwp1_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264 +fate-h264-conformance-cvwp2_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264 +fate-h264-conformance-cvwp3_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264 +fate-h264-conformance-cvwp5_toshiba_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264 +fate-h264-conformance-fi1_sony_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv +fate-h264-conformance-frext-alphaconformanceg: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264 +fate-h264-conformance-frext-bcrm_freh10: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 +fate-h264-conformance-frext-brcm_freh11: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 +fate-h264-conformance-frext-brcm_freh3: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264 +fate-h264-conformance-frext-brcm_freh4: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 +fate-h264-conformance-frext-brcm_freh5: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264 +fate-h264-conformance-frext-brcm_freh8: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264 +fate-h264-conformance-frext-brcm_freh9: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264 +fate-h264-conformance-frext-freh12_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264 +fate-h264-conformance-frext-freh1_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264 +fate-h264-conformance-frext-freh2_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264 +fate-h264-conformance-frext-freh6: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 +fate-h264-conformance-frext-freh7_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 +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 0 +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 +fate-h264-conformance-frext-hcaff1_hhi_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264 +fate-h264-conformance-frext-hcafr1_hhi_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264 +fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264 +fate-h264-conformance-frext-hcafr3_hhi_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264 +fate-h264-conformance-frext-hcafr4_hhi_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264 +fate-h264-conformance-frext-hcamff1_hhi_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264 +fate-h264-conformance-frext-hi422fr10_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264 +fate-h264-conformance-frext-hi422fr13_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-hi422fr1_sony_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv +fate-h264-conformance-frext-hi422fr6_sony_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-hpca_brcm_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264 +fate-h264-conformance-frext-hpcadq_brcm_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264 +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 0 +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 +fate-h264-conformance-frext-hpcv_brcm_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264 +fate-h264-conformance-frext-hpcvfl_bcrm_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 +fate-h264-conformance-frext-hpcvflnl_bcrm_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 +fate-h264-conformance-frext-hpcvmolq_brcm_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264 +fate-h264-conformance-frext-hpcvnl_brcm_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264 +fate-h264-conformance-frext-pph10i1_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i2_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i3_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i4_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i5_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i6_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph10i7_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le -vf scale +fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le -vf scale +fate-h264-conformance-hcbp2_hhi_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264 +fate-h264-conformance-hcmp1_hhi_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264 +fate-h264-conformance-ls_sva_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264 +fate-h264-conformance-midr_mw_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264 +fate-h264-conformance-mps_mw_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264 +fate-h264-conformance-mr1_bt_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264 +fate-h264-conformance-mr1_mw_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264 +fate-h264-conformance-mr2_mw_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264 +fate-h264-conformance-mr2_tandberg_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264 +fate-h264-conformance-mr3_tandberg_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264 +fate-h264-conformance-mr4_tandberg_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264 +fate-h264-conformance-mr5_tandberg_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264 +fate-h264-conformance-mr6_bt_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264 +fate-h264-conformance-mr7_bt_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264 +fate-h264-conformance-mr8_bt_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264 +fate-h264-conformance-mr9_bt_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264 +fate-h264-conformance-mv1_brcm_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264 +fate-h264-conformance-nl1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv +fate-h264-conformance-nl2_sony_h: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv +fate-h264-conformance-nl3_sva_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264 +fate-h264-conformance-nlmq1_jvc_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264 +fate-h264-conformance-nlmq2_jvc_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264 +fate-h264-conformance-nrf_mw_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264 +fate-h264-conformance-sharp_mp_field_1_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt +fate-h264-conformance-sharp_mp_field_2_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt +fate-h264-conformance-sharp_mp_field_3_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt +fate-h264-conformance-sharp_mp_paff_1r2: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt +fate-h264-conformance-sharp_mp_paff_2r: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt +fate-h264-conformance-sl1_sva_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264 +fate-h264-conformance-sva_ba1_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264 +fate-h264-conformance-sva_ba2_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264 +fate-h264-conformance-sva_base_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264 +fate-h264-conformance-sva_cl1_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264 +fate-h264-conformance-sva_fm1_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264 +fate-h264-conformance-sva_nl1_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264 +fate-h264-conformance-sva_nl2_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -c:v copy -f h264 diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 9a32a7d74c..a963ad36a6 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -192,7 +192,7 @@ HEVC_SAMPLES_444_12BIT_LARGE = \ define FATE_HEVC_TEST FATE_HEVC += fate-hevc-conformance-$(1) -fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p endef define FATE_HEVC_TEST_10BIT diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 3a6acdc48a..a81c6e9ab0 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -13,12 +13,11 @@ fate-lagarith-yv12: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yv12.avi FATE_LAGARITH += fate-lagarith-red fate-lagarith-red: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-red.avi -FATE_LAGARITH += fate-lagarith-ticket4119 fate-lagarith-ticket4119-cfr fate-lagarith-ticket4119-vfr fate-lagarith-ticket4119-pass fate-lagarith-ticket4119-drop +FATE_LAGARITH += fate-lagarith-ticket4119 fate-lagarith-ticket4119-cfr fate-lagarith-ticket4119-vfr fate-lagarith-ticket4119-pass fate-lagarith-ticket4119: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync cfr fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough -fate-lagarith-ticket4119-drop: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync drop FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH) fate-lagarith: $(FATE_LAGARITH) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index f2e1eb3af8..4877740863 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -246,7 +246,7 @@ FATE_VIDEO-$(call DEMDEC, MPEGPS, MPEG2VIDEO) += fate-mpeg2-ticket6024 fate-mpeg2-ticket6024: CMD = framecrc -flags +bitexact -idct simple -flags +truncated -i $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg -an FATE_VIDEO-$(call DEMDEC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677 -fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -vsync drop -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs +fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le -vf scale diff --git a/tests/ref/fate/h264-conformance-cabac_mot_fld0_full b/tests/ref/fate/h264-conformance-cabac_mot_fld0_full index 8778fef98e..62bea9cd98 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full b/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full index 5651e4b57c..465cde7616 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cabref3_sand_d b/tests/ref/fate/h264-conformance-cabref3_sand_d index d5cd445879..5dfdfac3aa 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cafi1_sva_c b/tests/ref/fate/h264-conformance-cafi1_sva_c index 11d958fd4c..91ae0fd934 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-capa1_toshiba_b b/tests/ref/fate/h264-conformance-capa1_toshiba_b index c88dc547ea..8a97a30459 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-capama3_sand_f b/tests/ref/fate/h264-conformance-capama3_sand_f index b847b9a2b9..50d5460493 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, 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 +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 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 0ee9a397f5..7c5663e623 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, 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 +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 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 c0f6a5ed12..8b63e8b5ea 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvfi1_sony_d b/tests/ref/fate/h264-conformance-cvfi1_sony_d index bf998bcf8a..bcb2a15068 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvfi1_sva_c b/tests/ref/fate/h264-conformance-cvfi1_sva_c index 55628842f5..1a4841a377 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvfi2_sony_h b/tests/ref/fate/h264-conformance-cvfi2_sony_h index deb9b38ad8..f86d077f0a 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvfi2_sva_c b/tests/ref/fate/h264-conformance-cvfi2_sva_c index e2a0b6da78..5fe4546d1b 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e b/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e index 8cc81e62ac..d29adc899e 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, 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 +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 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 94d4dff0b1..2f3f50dc92 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, 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 +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 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 fc6b1b7d5e..25d46c4bb4 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvnlfi1_sony_c b/tests/ref/fate/h264-conformance-cvnlfi1_sony_c index 02a6b53752..47b1a4b2ac 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvnlfi2_sony_h b/tests/ref/fate/h264-conformance-cvnlfi2_sony_h index c7128ba336..48d625e1cb 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b index 6bf9ee3934..fb4104f18d 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-fi1_sony_e b/tests/ref/fate/h264-conformance-fi1_sony_e index c48306679c..4b3dedce5c 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-bcrm_freh10 b/tests/ref/fate/h264-conformance-frext-bcrm_freh10 index 7592f6c516..4e41aa6cdc 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh11 b/tests/ref/fate/h264-conformance-frext-brcm_freh11 index 5bb9aa447e..1ba3b7e181 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh4 b/tests/ref/fate/h264-conformance-frext-brcm_freh4 index 9898def9fd..019df15b1d 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-freh6 b/tests/ref/fate/h264-conformance-frext-freh6 index 57ac261800..a5264d61dc 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-freh7_b b/tests/ref/fate/h264-conformance-frext-freh7_b index b078cf1b35..cb56f627cf 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b b/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b index 67badb6c2b..f541135929 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c index 0febed6d6f..25551fb021 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c index 9958f1616f..d6c41dd643 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b b/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b index 1b03e88a1f..72b15b11e1 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, 0, 0, 1, 152064, 0xf8248ceb -0, 1, 1, 1, 152064, 0xb6204c81 +0, 1, 1, 1, 152064, 0xf8248ceb +0, 2, 2, 1, 152064, 0xb6204c81 0, 2, 2, 1, 152064, 0x22fb1737 0, 3, 3, 1, 152064, 0xce8c3fd7 -0, 4, 4, 1, 152064, 0xee88cedc +0, 5, 5, 1, 152064, 0xee88cedc 0, 5, 5, 1, 152064, 0x1d4209ca -0, 6, 6, 1, 152064, 0x6fb15238 -0, 7, 7, 1, 152064, 0x505200c2 +0, 7, 7, 1, 152064, 0x6fb15238 +0, 8, 8, 1, 152064, 0x505200c2 0, 8, 8, 1, 152064, 0xb73574ba 0, 9, 9, 1, 152064, 0x0586a097 -0, 10, 10, 1, 152064, 0xed50fe02 +0, 11, 11, 1, 152064, 0xed50fe02 0, 11, 11, 1, 152064, 0x222221ab 0, 12, 12, 1, 152064, 0x8afefd46 -0, 13, 13, 1, 152064, 0x6832c5cc -0, 14, 14, 1, 152064, 0xba4c8110 +0, 14, 14, 1, 152064, 0x6832c5cc +0, 15, 15, 1, 152064, 0xba4c8110 0, 15, 15, 1, 152064, 0x95c07e1e 0, 16, 16, 1, 152064, 0xc5d6fde9 -0, 17, 17, 1, 152064, 0xe75a4921 -0, 18, 18, 1, 152064, 0x53b61688 +0, 18, 18, 1, 152064, 0xe75a4921 +0, 19, 19, 1, 152064, 0x53b61688 0, 19, 19, 1, 152064, 0x0335424b -0, 20, 20, 1, 152064, 0x621742c7 -0, 21, 21, 1, 152064, 0x4f69f41b +0, 21, 21, 1, 152064, 0x621742c7 +0, 22, 22, 1, 152064, 0x4f69f41b 0, 22, 22, 1, 152064, 0x6b3f65d7 -0, 23, 23, 1, 152064, 0x8dfde04f +0, 24, 24, 1, 152064, 0x8dfde04f 0, 24, 24, 1, 152064, 0x30750ff5 -0, 25, 25, 1, 152064, 0xe3d70f3c +0, 26, 26, 1, 152064, 0xe3d70f3c 0, 26, 26, 1, 152064, 0x0c1af825 -0, 27, 27, 1, 152064, 0x58a53935 +0, 28, 28, 1, 152064, 0x58a53935 0, 28, 28, 1, 152064, 0xc63d9e98 -0, 29, 29, 1, 152064, 0xa85fdc48 +0, 30, 30, 1, 152064, 0xa85fdc48 0, 30, 30, 1, 152064, 0x01bb9784 -0, 31, 31, 1, 152064, 0xdd5cb509 +0, 32, 32, 1, 152064, 0xdd5cb509 0, 32, 32, 1, 152064, 0x29ae7d2b -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, 34, 34, 1, 152064, 0xdb08593e +0, 35, 35, 1, 152064, 0x372d5d4e +0, 36, 36, 1, 152064, 0x31522664 +0, 37, 37, 1, 152064, 0x3f13f335 0, 37, 37, 1, 152064, 0xfd10c19a -0, 38, 38, 1, 152064, 0xef728975 -0, 39, 39, 1, 152064, 0x8e79234d -0, 40, 40, 1, 152064, 0x47022791 +0, 39, 39, 1, 152064, 0xef728975 +0, 40, 40, 1, 152064, 0x8e79234d +0, 41, 41, 1, 152064, 0x47022791 0, 41, 41, 1, 152064, 0x1ef9d297 0, 42, 42, 1, 152064, 0x77bf9738 0, 43, 43, 1, 152064, 0xd6bc8f03 -0, 44, 44, 1, 152064, 0x283ded4a -0, 45, 45, 1, 152064, 0xd87098d1 +0, 45, 45, 1, 152064, 0x283ded4a +0, 46, 46, 1, 152064, 0xd87098d1 0, 46, 46, 1, 152064, 0x300077a2 0, 47, 47, 1, 152064, 0x30ffbea4 -0, 48, 48, 1, 152064, 0x5dc5356b +0, 49, 49, 1, 152064, 0x5dc5356b 0, 49, 49, 1, 152064, 0x31cce185 0, 50, 50, 1, 152064, 0x47fc9148 -0, 51, 51, 1, 152064, 0x1641491e +0, 52, 52, 1, 152064, 0x1641491e 0, 52, 52, 1, 152064, 0x2184937d -0, 53, 53, 1, 152064, 0x126eb74a +0, 54, 54, 1, 152064, 0x126eb74a 0, 54, 54, 1, 152064, 0x25c07593 0, 55, 55, 1, 152064, 0xb1294e7e -0, 56, 56, 1, 152064, 0x8b35f45d -0, 57, 57, 1, 152064, 0x54765025 +0, 57, 57, 1, 152064, 0x8b35f45d +0, 58, 58, 1, 152064, 0x54765025 0, 58, 58, 1, 152064, 0x1d17e901 -0, 59, 59, 1, 152064, 0xaeab358d -0, 60, 60, 1, 152064, 0xf682c91f +0, 60, 60, 1, 152064, 0xaeab358d +0, 61, 61, 1, 152064, 0xf682c91f 0, 61, 61, 1, 152064, 0x0b4c9b06 0, 62, 62, 1, 152064, 0x45f326dc -0, 63, 63, 1, 152064, 0x132eeda3 +0, 64, 64, 1, 152064, 0x132eeda3 0, 64, 64, 1, 152064, 0x3c9b8e16 0, 65, 65, 1, 152064, 0x1be133c1 0, 66, 66, 1, 152064, 0xfa876720 -0, 67, 67, 1, 152064, 0x1666cdb8 +0, 68, 68, 1, 152064, 0x1666cdb8 0, 68, 68, 1, 152064, 0x362f418f 0, 69, 69, 1, 152064, 0x926b4a96 0, 70, 70, 1, 152064, 0xee3da1df -0, 71, 71, 1, 152064, 0xc11f025d +0, 72, 72, 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, 79, 79, 1, 152064, 0xb52f4bf5 -0, 80, 80, 1, 152064, 0x30870027 +0, 80, 80, 1, 152064, 0xb52f4bf5 +0, 81, 81, 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, 86, 86, 1, 152064, 0xcc4a7542 -0, 87, 87, 1, 152064, 0x21fc9a9d +0, 87, 87, 1, 152064, 0xcc4a7542 +0, 88, 88, 1, 152064, 0x21fc9a9d 0, 88, 88, 1, 152064, 0x91587574 0, 89, 89, 1, 152064, 0x30929cc2 0, 90, 90, 1, 152064, 0xf07606b7 -0, 91, 91, 1, 152064, 0x0476b876 -0, 92, 92, 1, 152064, 0x213333dc +0, 92, 92, 1, 152064, 0x0476b876 +0, 93, 93, 1, 152064, 0x213333dc 0, 93, 93, 1, 152064, 0x87c67597 -0, 94, 94, 1, 152064, 0x05434641 -0, 95, 95, 1, 152064, 0x959eeffc +0, 95, 95, 1, 152064, 0x05434641 +0, 96, 96, 1, 152064, 0x959eeffc 0, 96, 96, 1, 152064, 0x92a130b4 -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, 98, 98, 1, 152064, 0x53d0b544 +0, 99, 99, 1, 152064, 0xaf8c233e +0, 100, 100, 1, 152064, 0xd3d4259a +0, 101, 101, 1, 152064, 0xa0287753 0, 101, 101, 1, 152064, 0xfa23972a 0, 102, 102, 1, 152064, 0xacae756d -0, 103, 103, 1, 152064, 0xd8b58b5c +0, 104, 104, 1, 152064, 0xd8b58b5c 0, 104, 104, 1, 152064, 0x7db2c755 -0, 105, 105, 1, 152064, 0x31e7b79a -0, 106, 106, 1, 152064, 0xd8660d98 +0, 106, 106, 1, 152064, 0x31e7b79a +0, 107, 107, 1, 152064, 0xd8660d98 0, 107, 107, 1, 152064, 0xdcf0d10d 0, 108, 108, 1, 152064, 0x3e6567e6 -0, 109, 109, 1, 152064, 0xec3530fd +0, 110, 110, 1, 152064, 0xec3530fd 0, 110, 110, 1, 152064, 0xf686c61a 0, 111, 111, 1, 152064, 0x6e706804 -0, 112, 112, 1, 152064, 0x5fd4a1a3 -0, 113, 113, 1, 152064, 0xbb3384f7 +0, 113, 113, 1, 152064, 0x5fd4a1a3 +0, 114, 114, 1, 152064, 0xbb3384f7 0, 114, 114, 1, 152064, 0x8ffb14dd -0, 115, 115, 1, 152064, 0x01253a73 -0, 116, 116, 1, 152064, 0xf89c15df +0, 116, 116, 1, 152064, 0x01253a73 +0, 117, 117, 1, 152064, 0xf89c15df 0, 117, 117, 1, 152064, 0xda2b0b4c -0, 118, 118, 1, 152064, 0xfc9dfcc1 -0, 119, 119, 1, 152064, 0xfef4f0fa +0, 119, 119, 1, 152064, 0xfc9dfcc1 +0, 120, 120, 1, 152064, 0xfef4f0fa 0, 120, 120, 1, 152064, 0x91669bea -0, 121, 121, 1, 152064, 0x3664a565 +0, 122, 122, 1, 152064, 0x3664a565 0, 122, 122, 1, 152064, 0x32dd7923 0, 123, 123, 1, 152064, 0x26825231 0, 124, 124, 1, 152064, 0x5f81896e -0, 125, 125, 1, 152064, 0x0c64ca2f +0, 126, 126, 1, 152064, 0x0c64ca2f 0, 126, 126, 1, 152064, 0x488bb665 -0, 127, 127, 1, 152064, 0x4d183a0f +0, 128, 128, 1, 152064, 0x4d183a0f 0, 128, 128, 1, 152064, 0xed169321 0, 129, 129, 1, 152064, 0xcec22917 0, 130, 130, 1, 152064, 0xbe04ea6c -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, 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, 136, 136, 1, 152064, 0x0818ff3c 0, 137, 137, 1, 152064, 0xb4f2c42b 0, 138, 138, 1, 152064, 0xe029f979 -0, 139, 139, 1, 152064, 0x97c54c2f -0, 140, 140, 1, 152064, 0xd101c3b5 +0, 140, 140, 1, 152064, 0x97c54c2f +0, 141, 141, 1, 152064, 0xd101c3b5 0, 141, 141, 1, 152064, 0x5ed1f5d4 -0, 142, 142, 1, 152064, 0xc28264d1 +0, 143, 143, 1, 152064, 0xc28264d1 0, 143, 143, 1, 152064, 0xa162dd31 0, 144, 144, 1, 152064, 0x2ee872ce -0, 145, 145, 1, 152064, 0x809a8fce +0, 146, 146, 1, 152064, 0x809a8fce 0, 146, 146, 1, 152064, 0xcfcc3ef9 -0, 147, 147, 1, 152064, 0xa5be6ce3 +0, 148, 148, 1, 152064, 0xa5be6ce3 0, 148, 148, 1, 152064, 0xd75930a0 -0, 149, 149, 1, 152064, 0x28acb80f -0, 150, 150, 1, 152064, 0x223f2152 -0, 151, 151, 1, 152064, 0x0cf070cb +0, 150, 150, 1, 152064, 0x28acb80f +0, 151, 151, 1, 152064, 0x223f2152 +0, 152, 152, 1, 152064, 0x0cf070cb 0, 152, 152, 1, 152064, 0xcc7d011e -0, 153, 153, 1, 152064, 0xb2c2a63c +0, 154, 154, 1, 152064, 0xb2c2a63c 0, 154, 154, 1, 152064, 0x15514caa -0, 155, 155, 1, 152064, 0x0c6d18ee +0, 156, 156, 1, 152064, 0x0c6d18ee 0, 156, 156, 1, 152064, 0x33b4265d 0, 157, 157, 1, 152064, 0xb4abaaaf -0, 158, 158, 1, 152064, 0x26a7a856 +0, 159, 159, 1, 152064, 0x26a7a856 0, 159, 159, 1, 152064, 0xc75249cc -0, 160, 160, 1, 152064, 0x59ccb0e1 -0, 161, 161, 1, 152064, 0xc613f202 -0, 162, 162, 1, 152064, 0xd1c0e171 +0, 161, 161, 1, 152064, 0x59ccb0e1 +0, 162, 162, 1, 152064, 0xc613f202 +0, 163, 163, 1, 152064, 0xd1c0e171 0, 163, 163, 1, 152064, 0xa195da2b 0, 164, 164, 1, 152064, 0xbc7ed475 0, 165, 165, 1, 152064, 0x99206e2c -0, 166, 166, 1, 152064, 0x0ef04e03 -0, 167, 167, 1, 152064, 0x68cbc6a1 +0, 167, 167, 1, 152064, 0x0ef04e03 +0, 168, 168, 1, 152064, 0x68cbc6a1 0, 168, 168, 1, 152064, 0x2a5304b1 0, 169, 169, 1, 152064, 0xf017978b 0, 170, 170, 1, 152064, 0x94f5641a -0, 171, 171, 1, 152064, 0xd681bd8f +0, 172, 172, 1, 152064, 0xd681bd8f 0, 172, 172, 1, 152064, 0x16e1e3a3 -0, 173, 173, 1, 152064, 0xe4486c7e -0, 174, 174, 1, 152064, 0xa1bd394e +0, 174, 174, 1, 152064, 0xe4486c7e +0, 175, 175, 1, 152064, 0xa1bd394e 0, 175, 175, 1, 152064, 0x49ad5959 -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, 177, 177, 1, 152064, 0x82219b70 +0, 178, 178, 1, 152064, 0x64e2abcf +0, 179, 179, 1, 152064, 0x6d7d05d8 +0, 180, 180, 1, 152064, 0xd9ac2251 0, 180, 180, 1, 152064, 0xf477eee5 -0, 181, 181, 1, 152064, 0xb9826a78 +0, 182, 182, 1, 152064, 0xb9826a78 0, 182, 182, 1, 152064, 0x97828a37 -0, 183, 183, 1, 152064, 0x12099b1f +0, 184, 184, 1, 152064, 0x12099b1f 0, 184, 184, 1, 152064, 0x1ec45fa7 -0, 185, 185, 1, 152064, 0xfd5501c9 +0, 186, 186, 1, 152064, 0xfd5501c9 0, 186, 186, 1, 152064, 0x6a8b26a3 -0, 187, 187, 1, 152064, 0xae58ff40 -0, 188, 188, 1, 152064, 0xc0f47aa1 +0, 188, 188, 1, 152064, 0xae58ff40 +0, 189, 189, 1, 152064, 0xc0f47aa1 0, 189, 189, 1, 152064, 0x08bfa548 0, 190, 190, 1, 152064, 0x7f2ff5ef -0, 191, 191, 1, 152064, 0x5efa94a3 -0, 192, 192, 1, 152064, 0xf786f970 -0, 193, 193, 1, 152064, 0xab6bc712 +0, 192, 192, 1, 152064, 0x5efa94a3 +0, 193, 193, 1, 152064, 0xf786f970 +0, 194, 194, 1, 152064, 0xab6bc712 0, 194, 194, 1, 152064, 0x25647bee -0, 195, 195, 1, 152064, 0x54333ad5 -0, 196, 196, 1, 152064, 0xb3a99413 +0, 196, 196, 1, 152064, 0x54333ad5 +0, 197, 197, 1, 152064, 0xb3a99413 0, 197, 197, 1, 152064, 0xe7a78a0d -0, 198, 198, 1, 152064, 0xa5054abc -0, 199, 199, 1, 152064, 0xb94896ea +0, 199, 199, 1, 152064, 0xa5054abc +0, 200, 200, 1, 152064, 0xb94896ea 0, 200, 200, 1, 152064, 0x9f641bca -0, 201, 201, 1, 152064, 0x7363901c +0, 202, 202, 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, 206, 206, 1, 152064, 0xa3442925 -0, 207, 207, 1, 152064, 0x7d06c7e9 +0, 207, 207, 1, 152064, 0xa3442925 +0, 208, 208, 1, 152064, 0x7d06c7e9 0, 208, 208, 1, 152064, 0xa45e32df 0, 209, 209, 1, 152064, 0xf5ed407f -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, 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, 215, 215, 1, 152064, 0xae6b37da -0, 216, 216, 1, 152064, 0xdf09b6cd +0, 217, 217, 1, 152064, 0xdf09b6cd 0, 217, 217, 1, 152064, 0x2d39e1c0 -0, 218, 218, 1, 152064, 0xc8284a76 -0, 219, 219, 1, 152064, 0x7d7bbe76 +0, 219, 219, 1, 152064, 0xc8284a76 +0, 220, 220, 1, 152064, 0x7d7bbe76 0, 220, 220, 1, 152064, 0xcfed7416 0, 221, 221, 1, 152064, 0x81caaedd 0, 222, 222, 1, 152064, 0x9dcdd771 -0, 223, 223, 1, 152064, 0x46c1331b -0, 224, 224, 1, 152064, 0xace60efa +0, 224, 224, 1, 152064, 0x46c1331b +0, 225, 225, 1, 152064, 0xace60efa 0, 225, 225, 1, 152064, 0x9e0909f7 -0, 226, 226, 1, 152064, 0x72f5a321 +0, 227, 227, 1, 152064, 0x72f5a321 0, 227, 227, 1, 152064, 0x68f8cdcc 0, 228, 228, 1, 152064, 0xcc59fdd9 -0, 229, 229, 1, 152064, 0xc0a700c6 -0, 230, 230, 1, 152064, 0xf4254dcf +0, 230, 230, 1, 152064, 0xc0a700c6 +0, 231, 231, 1, 152064, 0xf4254dcf 0, 231, 231, 1, 152064, 0xc59b46d1 -0, 232, 232, 1, 152064, 0x2e5b2524 -0, 233, 233, 1, 152064, 0x46051293 +0, 233, 233, 1, 152064, 0x2e5b2524 +0, 234, 234, 1, 152064, 0x46051293 0, 234, 234, 1, 152064, 0x3cbcd1cd 0, 235, 235, 1, 152064, 0x9f308587 -0, 236, 236, 1, 152064, 0x6b91633f +0, 237, 237, 1, 152064, 0x6b91633f 0, 237, 237, 1, 152064, 0xb7191012 -0, 238, 238, 1, 152064, 0xd2fd030f -0, 239, 239, 1, 152064, 0x15a0ae2e -0, 240, 240, 1, 152064, 0xac3920d0 +0, 239, 239, 1, 152064, 0xd2fd030f +0, 240, 240, 1, 152064, 0x15a0ae2e +0, 241, 241, 1, 152064, 0xac3920d0 0, 241, 241, 1, 152064, 0x0eef80aa 0, 242, 242, 1, 152064, 0x319008f1 -0, 243, 243, 1, 152064, 0x7734450c +0, 244, 244, 1, 152064, 0x7734450c 0, 244, 244, 1, 152064, 0xf112df62 0, 245, 245, 1, 152064, 0x1dd8ffae -0, 246, 246, 1, 152064, 0x655ef429 +0, 247, 247, 1, 152064, 0x655ef429 0, 247, 247, 1, 152064, 0x27026213 -0, 248, 248, 1, 152064, 0x5c14b015 -0, 249, 249, 1, 152064, 0x9512abeb -0, 250, 250, 1, 152064, 0x961812b2 +0, 249, 249, 1, 152064, 0x5c14b015 +0, 250, 250, 1, 152064, 0x9512abeb +0, 251, 251, 1, 152064, 0x961812b2 0, 251, 251, 1, 152064, 0xb8890aea 0, 252, 252, 1, 152064, 0x4519db9a 0, 253, 253, 1, 152064, 0xf358034a -0, 254, 254, 1, 152064, 0x45d9f2ab +0, 255, 255, 1, 152064, 0x45d9f2ab 0, 255, 255, 1, 152064, 0xebd47e7d 0, 256, 256, 1, 152064, 0x15578be9 -0, 257, 257, 1, 152064, 0x1b373b2d +0, 258, 258, 1, 152064, 0x1b373b2d 0, 258, 258, 1, 152064, 0xbbe707e5 0, 259, 259, 1, 152064, 0x5bf62385 -0, 260, 260, 1, 152064, 0x832e6ef5 -0, 261, 261, 1, 152064, 0x761e5968 +0, 261, 261, 1, 152064, 0x832e6ef5 +0, 262, 262, 1, 152064, 0x761e5968 0, 262, 262, 1, 152064, 0x251f984d -0, 263, 263, 1, 152064, 0xbda48899 +0, 264, 264, 1, 152064, 0xbda48899 0, 264, 264, 1, 152064, 0x3fd843b9 -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, 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, 278, 278, 1, 152064, 0x9a8be637 0, 279, 279, 1, 152064, 0x165d9a12 -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, 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, 286, 286, 1, 152064, 0x4283eda8 -0, 287, 287, 1, 152064, 0xef793c49 +0, 288, 288, 1, 152064, 0xef793c49 0, 288, 288, 1, 152064, 0x68ac2afe -0, 289, 289, 1, 152064, 0x3d1ab510 +0, 290, 290, 1, 152064, 0x3d1ab510 0, 290, 290, 1, 152064, 0x98d3ec95 0, 291, 291, 1, 152064, 0x09f7e512 -0, 292, 292, 1, 152064, 0x801355dd -0, 293, 293, 1, 152064, 0xf2e87a11 +0, 293, 293, 1, 152064, 0x801355dd +0, 294, 294, 1, 152064, 0xf2e87a11 0, 294, 294, 1, 152064, 0x16757601 0, 295, 295, 1, 152064, 0x3074d74a -0, 296, 296, 1, 152064, 0xec8c1290 -0, 297, 297, 1, 152064, 0x46fb1877 +0, 297, 297, 1, 152064, 0xec8c1290 +0, 298, 298, 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 0febed6d6f..25551fb021 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a b/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a index 9958f1616f..d6c41dd643 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-mr3_tandberg_b b/tests/ref/fate/h264-conformance-mr3_tandberg_b index b0948448cd..e86d721836 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-mr6_bt_b b/tests/ref/fate/h264-conformance-mr6_bt_b index 34aa8bfd46..ddfc3d98ee 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-mr7_bt_b b/tests/ref/fate/h264-conformance-mr7_bt_b index 551767ce1d..becd797c8f 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-mr8_bt_b b/tests/ref/fate/h264-conformance-mr8_bt_b index 7981c42245..40373e6985 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-mr9_bt_b b/tests/ref/fate/h264-conformance-mr9_bt_b index bbd90e67f9..99dd0dc322 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, 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 +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 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 cdabcceca6..688cd2a391 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, 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 +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 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 0574f8ff87..aa21e01465 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, 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 +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 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 6a92245f2f..45792a1b21 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 b/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 index 8a7aa249f6..35168666cc 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, 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 +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 diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_2r b/tests/ref/fate/h264-conformance-sharp_mp_paff_2r index ded91a9bed..9fb88701f5 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1 b/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1 index fe890040e6..046b1846f8 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 b/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 index 3adef2f366..ebe0f676d2 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, 0, 0, 1, 149760, 0x6e1f16d0 -0, 1, 1, 1, 149760, 0x5be5bde9 +0, 2, 2, 1, 149760, 0x6e1f16d0 +0, 3, 3, 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 8e6c681cfe..74f7f8cd74 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, 0, 0, 1, 149760, 0xcd1019b2 -0, 1, 1, 1, 149760, 0xeb39efeb +0, 2, 2, 1, 149760, 0xcd1019b2 +0, 3, 3, 1, 149760, 0xeb39efeb diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 index 2abd58b64b..5ca3faf58f 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, 95, 95, 1, 3133440, 0x5300e459 +0, 96, 96, 1, 3133440, 0x5300e459 diff --git a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 index 7ac223ef7b..a375c4806e 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 index 5de9da9a39..0c930f6556 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 index f107e937d7..83fd3bc313 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 index cc4a22f92e..e71e3131a0 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 index 233b042671..ffc4f51773 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 b/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 index 51ea08b584..fbbedb236c 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 b/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 index 53e733bd75..e661ff245e 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, 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 +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 diff --git a/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 b/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 index f3ef192c6a..e5bc4f8121 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, 0, 0, 1, 3110400, 0x0117aa5d -0, 1, 1, 1, 3110400, 0xa737bc56 +0, 2, 2, 1, 3110400, 0x0117aa5d +0, 3, 3, 1, 3110400, 0xa737bc56 diff --git a/tests/ref/fate/lagarith-ticket4119-drop b/tests/ref/fate/lagarith-ticket4119-drop deleted file mode 100644 index c7738aeca8..0000000000 --- a/tests/ref/fate/lagarith-ticket4119-drop +++ /dev/null @@ -1,8 +0,0 @@ -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: rawvideo -#dimensions 0: 640x360 -#sar 0: 0/1 -0, 0, 0, 1, 691200, 0x00000000 -0, 1, 1, 1, 691200, 0x1c4a6f24 -0, 2, 2, 1, 691200, 0x1fa0474c diff --git a/tests/ref/fate/mpeg2-ticket6677 b/tests/ref/fate/mpeg2-ticket6677 index e963e32f2d..2079a08c20 100644 --- a/tests/ref/fate/mpeg2-ticket6677 +++ b/tests/ref/fate/mpeg2-ticket6677 @@ -3,10 +3,10 @@ #codec_id 0: rawvideo #dimensions 0: 720x480 #sar 0: 8/9 -0, 0, 0, 1, 518400, 0xc1866f5f -0, 1, 1, 1, 518400, 0x9ba32764 -0, 2, 2, 1, 518400, 0xa9031bb8 -0, 3, 3, 1, 518400, 0x5e2c3502 -0, 4, 4, 1, 518400, 0xe860027a -0, 5, 5, 1, 518400, 0xa9152430 -0, 6, 6, 1, 518400, 0xb98dd9f7 +0, 1, 1, 1, 518400, 0xc1866f5f +0, 2, 2, 1, 518400, 0x9ba32764 +0, 4, 4, 1, 518400, 0xa9031bb8 +0, 5, 5, 1, 518400, 0x5e2c3502 +0, 6, 6, 1, 518400, 0xe860027a +0, 7, 7, 1, 518400, 0xa9152430 +0, 9, 9, 1, 518400, 0xb98dd9f7 From patchwork Tue Dec 1 20:19:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24226 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 53CE944BA85 for ; Tue, 1 Dec 2020 22:31:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36870689B8C; Tue, 1 Dec 2020 22:31:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86202689AB4 for ; Tue, 1 Dec 2020 22:31:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 8CECC296B5D for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id z8aHdyYQmXKE for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id E1BC7296B64 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4C9493A0453; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:47 +0100 Message-Id: <20201201201949.18834-7-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] mjpegdec: convert to receive_frame() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will be useful in the following commit. --- libavcodec/jpeglsdec.c | 2 +- libavcodec/mjpegdec.c | 71 +++++++++++++++++++++++++---------- libavcodec/mjpegdec.h | 8 ++-- libavcodec/sp5xdec.c | 28 ++++++-------- tests/ref/fate/exif-image-jpg | 4 +- 5 files changed, 72 insertions(+), 41 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 0b1e139048..e72f9f2315 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -551,7 +551,7 @@ AVCodec ff_jpegls_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - .decode = ff_mjpeg_decode_frame, + .receive_frame = ff_mjpeg_receive_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 147dd819e5..96dfc3dc19 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -36,6 +36,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "copy_block.h" +#include "decode.h" #include "hwconfig.h" #include "idctdsp.h" #include "internal.h" @@ -163,6 +164,10 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->picture_ptr = s->picture; } + s->pkt = av_packet_alloc(); + if (!s->pkt) + return AVERROR(ENOMEM); + s->avctx = avctx; ff_blockdsp_init(&s->bdsp, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags); @@ -2336,12 +2341,32 @@ static void reset_icc_profile(MJpegDecodeContext *s) s->iccnum = 0; } -int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, - AVPacket *avpkt) +static int mjpeg_get_packet(AVCodecContext *avctx) +{ + MJpegDecodeContext *s = avctx->priv_data; + int ret; + + av_packet_unref(s->pkt); + ret = ff_decode_get_packet(avctx, s->pkt); + if (ret < 0) + return ret; + +#if CONFIG_SP5X_DECODER || CONFIG_AMV_DECODER + if (avctx->codec_id == AV_CODEC_ID_SP5X || + avctx->codec_id == AV_CODEC_ID_AMV) { + ret = ff_sp5x_process_packet(avctx, s->pkt); + if (ret < 0) + return ret; + } +#endif + + s->buf_size = s->pkt->size; + + return 0; +} + +int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) { - AVFrame *frame = data; - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; MJpegDecodeContext *s = avctx->priv_data; const uint8_t *buf_end, *buf_ptr; const uint8_t *unescaped_buf_ptr; @@ -2352,8 +2377,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int ret = 0; int is16bit; - s->buf_size = buf_size; - av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; @@ -2361,8 +2384,12 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (s->iccnum != 0) reset_icc_profile(s); - buf_ptr = buf; - buf_end = buf + buf_size; + ret = mjpeg_get_packet(avctx); + if (ret < 0) + return ret; + + buf_ptr = s->pkt->data; + buf_end = s->pkt->data + s->pkt->size; while (buf_ptr < buf_end) { /* find start next marker */ start_code = ff_mjpeg_find_marker(s, &buf_ptr, buf_end, @@ -2374,7 +2401,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } else if (unescaped_buf_size > INT_MAX / 8) { av_log(avctx, AV_LOG_ERROR, "MJPEG packet 0x%x too big (%d/%d), corrupt data?\n", - start_code, unescaped_buf_size, buf_size); + start_code, unescaped_buf_size, s->pkt->size); return AVERROR_INVALIDDATA; } av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%"PTRDIFF_SPECIFIER"\n", @@ -2511,6 +2538,7 @@ eoi_parser: } if (avctx->skip_frame == AVDISCARD_ALL) { s->got_picture = 0; + ret = AVERROR(EAGAIN); goto the_end_no_picture; } if (s->avctx->hwaccel) { @@ -2522,9 +2550,10 @@ eoi_parser: } if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0) return ret; - *got_frame = 1; s->got_picture = 0; + frame->pkt_dts = s->pkt->dts; + if (!s->lossless) { int qp = FFMAX3(s->qscale[0], s->qscale[1], @@ -2533,7 +2562,7 @@ eoi_parser: AVBufferRef *qp_table_buf = av_buffer_alloc(qpw); if (qp_table_buf) { memset(qp_table_buf->data, qp, qpw); - av_frame_set_qp_table(data, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1); + av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1); } if(avctx->debug & FF_DEBUG_QP) @@ -2774,7 +2803,7 @@ the_end: } if (s->stereo3d) { - AVStereo3D *stereo = av_stereo3d_create_side_data(data); + AVStereo3D *stereo = av_stereo3d_create_side_data(frame); if (stereo) { stereo->type = s->stereo3d->type; stereo->flags = s->stereo3d->flags; @@ -2792,7 +2821,7 @@ the_end: for (i = 0; i < s->iccnum; i++) total_size += s->iccdatalens[i]; - sd = av_frame_new_side_data(data, AV_FRAME_DATA_ICC_PROFILE, total_size); + sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size); if (!sd) { av_log(s->avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); return AVERROR(ENOMEM); @@ -2805,14 +2834,16 @@ the_end: } } - av_dict_copy(&((AVFrame *) data)->metadata, s->exif_metadata, 0); + av_dict_copy(&frame->metadata, s->exif_metadata, 0); av_dict_free(&s->exif_metadata); + ret = 0; + the_end_no_picture: av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n", buf_end - buf_ptr); -// return buf_end - buf_ptr; - return buf_ptr - buf; + + return ret; } av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) @@ -2830,6 +2861,8 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) } else if (s->picture_ptr) av_frame_unref(s->picture_ptr); + av_packet_free(&s->pkt); + av_freep(&s->buffer); av_freep(&s->stereo3d); av_freep(&s->ljpeg_buffer); @@ -2882,7 +2915,7 @@ AVCodec ff_mjpeg_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - .decode = ff_mjpeg_decode_frame, + .receive_frame = ff_mjpeg_receive_frame, .flush = decode_flush, .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, @@ -2910,7 +2943,7 @@ AVCodec ff_thp_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - .decode = ff_mjpeg_decode_frame, + .receive_frame = ff_mjpeg_receive_frame, .flush = decode_flush, .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 9d1666bebd..66fb0ddcba 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -49,6 +49,8 @@ typedef struct MJpegDecodeContext { GetBitContext gb; int buf_size; + AVPacket *pkt; + int start_code; /* current start code */ int buffer_size; uint8_t *buffer; @@ -156,9 +158,7 @@ typedef struct MJpegDecodeContext { int ff_mjpeg_decode_init(AVCodecContext *avctx); int ff_mjpeg_decode_end(AVCodecContext *avctx); -int ff_mjpeg_decode_frame(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt); +int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame); int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s); @@ -169,4 +169,6 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s, const uint8_t **buf_ptr, const uint8_t *buf_end, const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size); +int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt); + #endif /* AVCODEC_MJPEGDEC_H */ diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 815f9ad50e..7be6cf37a9 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -30,14 +30,11 @@ #include "mjpegdec.h" #include "sp5x.h" - -static int sp5x_decode_frame(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt) +int ff_sp5x_process_packet(AVCodecContext *avctx, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - AVPacket avpkt_recoded; + AVBufferRef *buf_recoded; const int qscale = 5; uint8_t *recoded; int i = 0, j = 0; @@ -45,9 +42,10 @@ static int sp5x_decode_frame(AVCodecContext *avctx, if (!avctx->width || !avctx->height) return -1; - recoded = av_mallocz(buf_size + 1024); - if (!recoded) + buf_recoded = av_buffer_allocz(buf_size + 1024); + if (!buf_recoded) return -1; + recoded = buf_recoded->data; /* SOI */ recoded[j++] = 0xFF; @@ -84,14 +82,12 @@ static int sp5x_decode_frame(AVCodecContext *avctx, recoded[j++] = 0xFF; recoded[j++] = 0xD9; - av_init_packet(&avpkt_recoded); - avpkt_recoded.data = recoded; - avpkt_recoded.size = j; - i = ff_mjpeg_decode_frame(avctx, data, got_frame, &avpkt_recoded); - - av_free(recoded); + av_buffer_unref(&avpkt->buf); + avpkt->buf = buf_recoded; + avpkt->data = recoded; + avpkt->size = j; - return i < 0 ? i : avpkt->size; + return 0; } #if CONFIG_SP5X_DECODER @@ -103,7 +99,7 @@ AVCodec ff_sp5x_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - .decode = sp5x_decode_frame, + .receive_frame = ff_mjpeg_receive_frame, .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, @@ -118,7 +114,7 @@ AVCodec ff_amv_decoder = { .priv_data_size = sizeof(MJpegDecodeContext), .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, - .decode = sp5x_decode_frame, + .receive_frame = ff_mjpeg_receive_frame, .max_lowres = 3, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg index eb18dede21..1563f3ef6a 100644 --- a/tests/ref/fate/exif-image-jpg +++ b/tests/ref/fate/exif-image-jpg @@ -6,8 +6,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 -best_effort_timestamp=0 -best_effort_timestamp_time=0.000000 +best_effort_timestamp=N/A +best_effort_timestamp_time=N/A pkt_duration=1 pkt_duration_time=0.040000 pkt_pos=N/A From patchwork Tue Dec 1 20:19:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24224 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 308F144BA85 for ; Tue, 1 Dec 2020 22:31:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CBB9689AD1; Tue, 1 Dec 2020 22:31:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74E0E6899E0 for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 12882296B54 for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id xN11Mtl5GZpO for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id DBDD2296B62 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4FCAB3A045C; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:48 +0100 Message-Id: <20201201201949.18834-8-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] codec_desc: add SMVJPEG flags X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Same flags as MJPEG, as it's essentially the same thing. --- libavcodec/codec_desc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3b148883b8..fc5a5be46e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1512,6 +1512,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_SMVJPEG, .type = AVMEDIA_TYPE_VIDEO, .name = "smvjpeg", + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, .long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"), }, { From patchwork Tue Dec 1 20:19:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24227 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 39EF044BA85 for ; Tue, 1 Dec 2020 22:31:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EED9689BD5; Tue, 1 Dec 2020 22:31:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 833DA689AA7 for ; Tue, 1 Dec 2020 22:31:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id DE6FD296B62 for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id R9LeO_faCP3Q for ; Tue, 1 Dec 2020 21:31:43 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id D39AB296B61 for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 52E433A04F4; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:49 +0100 Message-Id: <20201201201949.18834-9-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] smvjpegdec: merge into mjpegdec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" SMVJPEG stores frames as slices of a big JPEG image. The decoder is implemented as a wrapper that instantiates a full internal MJPEG decoder, then forwards the decoded frames with offset data pointers. This is unnecessarily complex and fragile, not supporting useful decoder capabilities like direct rendering. Re-implement the decoder inside the MJPEG decoder, which is accomplished by returning each decoded frame multiple times, setting cropping information appropriately on each instance. One peculiar aspect of the previous design is that since - the smvjpeg decoder returns one frame per input packet - there are multiple frames in each packets (the aformentioned slices) the demuxer needs to return each packet multiple times. This is now also eliminated - the demuxer now returns each packet exactly once, with the duration set to the number of frames it decodes to. This also removes one of the last remaining internal uses of the old video decoding API. --- MAINTAINERS | 1 - configure | 1 + libavcodec/Makefile | 1 - libavcodec/mjpegdec.c | 88 +++++++++++++++- libavcodec/mjpegdec.h | 4 + libavcodec/smvjpegdec.c | 223 ---------------------------------------- libavformat/wavdec.c | 12 +-- tests/ref/fate/smvjpeg | 2 +- 8 files changed, 96 insertions(+), 236 deletions(-) delete mode 100644 libavcodec/smvjpegdec.c diff --git a/MAINTAINERS b/MAINTAINERS index 2464f82be3..00c9007671 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -235,7 +235,6 @@ Codecs: rv10.c Michael Niedermayer s3tc* Ivo van Poorten smc.c Mike Melanson - smvjpegdec.c Ash Hughes snow* Michael Niedermayer, Loren Merritt sonic.c Alex Beregszaszi speedhq.c Steinar H. Gunderson diff --git a/configure b/configure index 51e43fbf66..277c2d699a 100755 --- a/configure +++ b/configure @@ -2838,6 +2838,7 @@ rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp" screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" +smvjpeg_decoder_select="mjpeg_decoder" snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder" sonic_decoder_select="golomb rangecoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a6435c9e85..1f6e929a42 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -616,7 +616,6 @@ OBJS-$(CONFIG_SIREN_DECODER) += siren.o OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o OBJS-$(CONFIG_SMC_DECODER) += smc.o -OBJS-$(CONFIG_SMVJPEG_DECODER) += smvjpegdec.o OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o snow_dwt.o OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o snow_dwt.o \ h263.o h263data.o ituh263enc.o diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 96dfc3dc19..7cc5f2a32e 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -203,7 +203,19 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->interlace_polarity = 1; } - if ( avctx->extradata_size > 8 + if (avctx->codec_id == AV_CODEC_ID_SMVJPEG) { + if (avctx->extradata_size >= 4) + s->smv_frames_per_jpeg = AV_RL32(avctx->extradata); + + if (s->smv_frames_per_jpeg <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n"); + return AVERROR_INVALIDDATA; + } + + s->smv_frame = av_frame_alloc(); + if (!s->smv_frame) + return AVERROR(ENOMEM); + } else if (avctx->extradata_size > 8 && AV_RL32(avctx->extradata) == 0x2C && AV_RL32(avctx->extradata+4) == 0x18) { parse_avid(s, avctx->extradata, avctx->extradata_size); @@ -477,6 +489,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) size_change = 0; } + if (s->avctx->codec_id == AV_CODEC_ID_SMVJPEG) { + s->avctx->height = s->avctx->coded_height / s->smv_frames_per_jpeg; + if (s->avctx->height <= 0) + return AVERROR_INVALIDDATA; + } + if (s->got_picture && s->interlaced && (s->bottom_field == !s->interlace_polarity)) { if (s->progressive) { avpriv_request_sample(s->avctx, "progressively coded interlaced picture"); @@ -2341,6 +2359,42 @@ static void reset_icc_profile(MJpegDecodeContext *s) s->iccnum = 0; } +// SMV JPEG just stacks several output frames into one JPEG picture +// we handle that by setting up the cropping parameters appropriately +static int smv_process_frame(AVCodecContext *avctx, AVFrame *frame) +{ + MJpegDecodeContext *s = avctx->priv_data; + int ret; + + if (s->smv_next_frame > 0) { + av_assert0(s->smv_frame->buf[0]); + av_frame_unref(frame); + ret = av_frame_ref(frame, s->smv_frame); + if (ret < 0) + return ret; + } else { + av_assert0(frame->buf[0]); + av_frame_unref(s->smv_frame); + ret = av_frame_ref(s->smv_frame, frame); + if (ret < 0) + return ret; + } + + av_assert0((s->smv_next_frame + 1) * avctx->height <= avctx->coded_height); + + frame->width = avctx->coded_width; + frame->height = avctx->coded_height; + frame->crop_top = FFMIN(s->smv_next_frame * avctx->height, frame->height); + frame->crop_bottom = frame->height - (s->smv_next_frame + 1) * avctx->height; + + s->smv_next_frame = (s->smv_next_frame + 1) % s->smv_frames_per_jpeg; + + if (s->smv_next_frame == 0) + av_frame_unref(s->smv_frame); + + return 0; +} + static int mjpeg_get_packet(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; @@ -2377,6 +2431,9 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) int ret = 0; int is16bit; + if (avctx->codec_id == AV_CODEC_ID_SMVJPEG && s->smv_next_frame > 0) + return smv_process_frame(avctx, frame); + av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; @@ -2837,6 +2894,14 @@ the_end: av_dict_copy(&frame->metadata, s->exif_metadata, 0); av_dict_free(&s->exif_metadata); + if (avctx->codec_id == AV_CODEC_ID_SMVJPEG) { + ret = smv_process_frame(avctx, frame); + if (ret < 0) { + av_frame_unref(frame); + return ret; + } + } + ret = 0; the_end_no_picture: @@ -2863,6 +2928,8 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) av_packet_free(&s->pkt); + av_frame_free(&s->smv_frame); + av_freep(&s->buffer); av_freep(&s->stereo3d); av_freep(&s->ljpeg_buffer); @@ -2889,6 +2956,9 @@ static void decode_flush(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; s->got_picture = 0; + + s->smv_next_frame = 0; + av_frame_unref(s->smv_frame); } #if CONFIG_MJPEG_DECODER @@ -2950,3 +3020,19 @@ AVCodec ff_thp_decoder = { .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif + +#if CONFIG_SMVJPEG_DECODER +AVCodec ff_smvjpeg_decoder = { + .name = "smvjpeg", + .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_SMVJPEG, + .priv_data_size = sizeof(MJpegDecodeContext), + .init = ff_mjpeg_decode_init, + .close = ff_mjpeg_decode_end, + .receive_frame = ff_mjpeg_receive_frame, + .flush = decode_flush, + .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING, +}; +#endif diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 66fb0ddcba..d9844adf4e 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -142,6 +142,10 @@ typedef struct MJpegDecodeContext { int iccnum; int iccread; + AVFrame *smv_frame; + int smv_frames_per_jpeg; + int smv_next_frame; + // Raw stream data for hwaccel use. const uint8_t *raw_image_buffer; size_t raw_image_buffer_size; diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c deleted file mode 100644 index 973a9117f2..0000000000 --- a/libavcodec/smvjpegdec.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * SMV JPEG decoder - * Copyright (c) 2013 Ash Hughes - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * SMV JPEG decoder. - */ - -// #define DEBUG -#include "avcodec.h" -#include "libavutil/opt.h" -#include "libavutil/imgutils.h" -#include "mjpegdec.h" -#include "internal.h" - -typedef struct SMVJpegDecodeContext { - MJpegDecodeContext jpg; - AVFrame *picture[2]; /* pictures array */ - AVCodecContext* avctx; - int frames_per_jpeg; - int mjpeg_data_size; -} SMVJpegDecodeContext; - -static inline void smv_img_pnt_plane(uint8_t **dst, uint8_t *src, - int src_linesize, int height, int nlines) -{ - if (!dst || !src) - return; - src += (nlines) * src_linesize * height; - *dst = src; -} - -static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4], - const int src_linesizes[4], - enum AVPixelFormat pix_fmt, int width, int height, - int nlines) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - int i, planes_nb = 0; - - if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) - return; - - for (i = 0; i < desc->nb_components; i++) - planes_nb = FFMAX(planes_nb, desc->comp[i].plane + 1); - - for (i = 0; i < planes_nb; i++) { - int h = height; - if (i == 1 || i == 2) { - h = AV_CEIL_RSHIFT(height, desc->log2_chroma_h); - } - smv_img_pnt_plane(&dst_data[i], src_data[i], - src_linesizes[i], h, nlines); - } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) - dst_data[1] = src_data[1]; -} - -static av_cold int smvjpeg_decode_end(AVCodecContext *avctx) -{ - SMVJpegDecodeContext *s = avctx->priv_data; - MJpegDecodeContext *jpg = &s->jpg; - - jpg->picture_ptr = NULL; - av_frame_free(&s->picture[0]); - av_frame_free(&s->picture[1]); - avcodec_free_context(&s->avctx); - return 0; -} - -static av_cold int smvjpeg_decode_init(AVCodecContext *avctx) -{ - SMVJpegDecodeContext *s = avctx->priv_data; - AVCodec *codec; - AVDictionary *thread_opt = NULL; - int ret = 0, r; - - s->frames_per_jpeg = 0; - - s->picture[0] = av_frame_alloc(); - if (!s->picture[0]) - return AVERROR(ENOMEM); - - s->picture[1] = av_frame_alloc(); - if (!s->picture[1]) { - av_frame_free(&s->picture[0]); - return AVERROR(ENOMEM); - } - - s->jpg.picture_ptr = s->picture[0]; - - if (avctx->extradata_size >= 4) - s->frames_per_jpeg = AV_RL32(avctx->extradata); - - if (s->frames_per_jpeg <= 0) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n"); - ret = AVERROR_INVALIDDATA; - } - - codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); - if (!codec) { - av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n"); - smvjpeg_decode_end(avctx); - return AVERROR_DECODER_NOT_FOUND; - } - - s->avctx = avcodec_alloc_context3(codec); - - av_dict_set(&thread_opt, "threads", "1", 0); - s->avctx->refcounted_frames = 1; - s->avctx->flags = avctx->flags; - s->avctx->idct_algo = avctx->idct_algo; - if ((r = ff_codec_open2_recursive(s->avctx, codec, &thread_opt)) < 0) { - av_log(avctx, AV_LOG_ERROR, "MJPEG codec failed to open\n"); - ret = r; - } - av_dict_free(&thread_opt); - - if (ret < 0) - smvjpeg_decode_end(avctx); - return ret; -} - -static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - AVPacket *avpkt) -{ - const AVPixFmtDescriptor *desc; - SMVJpegDecodeContext *s = avctx->priv_data; - AVFrame* mjpeg_data = s->picture[0]; - int i, cur_frame = 0, ret = 0; - - cur_frame = avpkt->pts % s->frames_per_jpeg; - - /* cur_frame is later used to calculate the buffer offset, so it mustn't be negative */ - if (cur_frame < 0) - cur_frame += s->frames_per_jpeg; - - /* Are we at the start of a block? */ - if (!cur_frame) { - av_frame_unref(mjpeg_data); - ret = avcodec_decode_video2(s->avctx, mjpeg_data, &s->mjpeg_data_size, avpkt); - if (ret < 0) { - s->mjpeg_data_size = 0; - return ret; - } - } else if (!s->mjpeg_data_size) - return AVERROR(EINVAL); - - desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); - av_assert0(desc); - - if (mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) { - av_log(avctx, AV_LOG_ERROR, "Invalid height\n"); - return AVERROR_INVALIDDATA; - } - - /*use the last lot... */ - *data_size = s->mjpeg_data_size; - - avctx->pix_fmt = s->avctx->pix_fmt; - - /* We shouldn't get here if frames_per_jpeg <= 0 because this was rejected - in init */ - ret = ff_set_dimensions(avctx, mjpeg_data->width, mjpeg_data->height / s->frames_per_jpeg); - if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Failed to set dimensions\n"); - return ret; - } - - if (*data_size) { - s->picture[1]->extended_data = NULL; - s->picture[1]->width = avctx->width; - s->picture[1]->height = avctx->height; - s->picture[1]->format = avctx->pix_fmt; - smv_img_pnt(s->picture[1]->data, mjpeg_data->data, mjpeg_data->linesize, - avctx->pix_fmt, avctx->width, avctx->height, cur_frame); - for (i = 0; i < AV_NUM_DATA_POINTERS; i++) - s->picture[1]->linesize[i] = mjpeg_data->linesize[i]; - - ret = av_frame_ref(data, s->picture[1]); - if (ret < 0) - return ret; - } - - return avpkt->size; -} - -static const AVClass smvjpegdec_class = { - .class_name = "SMVJPEG decoder", - .item_name = av_default_item_name, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_smvjpeg_decoder = { - .name = "smvjpeg", - .long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_SMVJPEG, - .priv_data_size = sizeof(SMVJpegDecodeContext), - .init = smvjpeg_decode_init, - .close = smvjpeg_decode_end, - .decode = smvjpeg_decode_frame, - .priv_class = &smvjpegdec_class, -}; diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index df6030a42d..f49c25c48d 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -58,7 +58,6 @@ typedef struct WAVDemuxContext { int ignore_length; int max_size; int spdif; - int smv_cur_pt; int smv_given_first; int unaligned; // e.g. if an odd number of bytes ID3 tag was prepended int rifx; // RIFX: integer byte order for parameters is big endian @@ -497,7 +496,6 @@ static int wav_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } AV_WL32(vst->codecpar->extradata, wav->smv_frames_per_jpeg); - wav->smv_cur_pt = 0; goto break_loop; case MKTAG('L', 'I', 'S', 'T'): case MKTAG('l', 'i', 's', 't'): @@ -714,12 +712,9 @@ smv_retry: if (ret < 0) goto smv_out; pkt->pos -= 3; - pkt->pts = wav->smv_block * wav->smv_frames_per_jpeg + wav->smv_cur_pt; - wav->smv_cur_pt++; - if (wav->smv_frames_per_jpeg > 0) - wav->smv_cur_pt %= wav->smv_frames_per_jpeg; - if (!wav->smv_cur_pt) - wav->smv_block++; + pkt->pts = wav->smv_block * wav->smv_frames_per_jpeg; + pkt->duration = wav->smv_frames_per_jpeg; + wav->smv_block++; pkt->stream_index = 1; smv_out: @@ -781,7 +776,6 @@ static int wav_read_seek(AVFormatContext *s, timestamp = av_rescale_q(smv_timestamp, s->streams[1]->time_base, s->streams[0]->time_base); if (wav->smv_frames_per_jpeg > 0) { wav->smv_block = smv_timestamp / wav->smv_frames_per_jpeg; - wav->smv_cur_pt = smv_timestamp % wav->smv_frames_per_jpeg; } } diff --git a/tests/ref/fate/smvjpeg b/tests/ref/fate/smvjpeg index 360fad6595..0ab4f21309 100644 --- a/tests/ref/fate/smvjpeg +++ b/tests/ref/fate/smvjpeg @@ -2,7 +2,7 @@ #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 128x160 -#sar 0: 0/1 +#sar 0: 72/72 0, 0, 0, 1, 30720, 0x3a821807 0, 1, 1, 1, 30720, 0x95168e5d 0, 2, 2, 1, 30720, 0xd4d98e45