Merge remote branch 'qatar/master'

* qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c

Michael Niedermayer committed 15 years ago

Commit c55780d2 parents ff5278d 651b27643 files · +482 −374Browse files

Unified · Split

43 files

doc/APIchanges +32 −0
libavcodec/avcodec.h +1 −3
libavcodec/libopencore-amr.c +76 −79
libavcodec/libvo-aacenc.c +11 −9
libavcodec/libvo-amrwbenc.c +43 −36
libavcodec/msmpeg4.c +2 −1
libavcodec/version.h +3 −3
libavformat/applehttp.c +7 −4
libavformat/avformat.h +2 −2
libavformat/avio.c +21 −0
libavformat/avio.h +31 −2
libavformat/file.c +16 −0
libavformat/url.h +1 −0
libavformat/utils.c +4 −1
libavformat/version.h +1 −1
libswscale/rgb2rgb.c +0 −2
libswscale/swscale.c +0 −2
libswscale/swscale_internal.h +2 −0
tests/ref/fate/8bps +1 −1
tests/ref/fate/bethsoft-vid +1 −1
tests/ref/fate/bfi +1 −1
tests/ref/fate/corepng +1 −1
tests/ref/fate/creatureshock-avs +1 −1
tests/ref/fate/feeble-dxa +1 −1
tests/ref/fate/film-cvid-pcm-stereo-8bit +8 −8
tests/ref/fate/idroq-video-dpcm +1 −1
tests/ref/fate/interplay-mve-16bit +1 −1
tests/ref/fate/interplay-mve-8bit +1 −1
tests/ref/fate/lmlm4-demux +1 −1
tests/ref/fate/mtv +1 −1
tests/ref/fate/nuv +1 −1
tests/ref/fate/psx-str +23 −23
tests/ref/fate/sierra-vmd +89 −89
tests/ref/fate/siff +3 −3
tests/ref/fate/tiertex-seq +72 −72
tests/ref/fate/truemotion1-15 +1 −1
tests/ref/fate/truemotion1-24 +1 −1
tests/ref/fate/tscc-15bit +15 −15
tests/ref/fate/vqa-cc +1 −1
tests/ref/fate/wmv8-drm-nodec +1 −1
tests/ref/lavf/gxf +1 −1
tests/ref/lavf/mpg +1 −1
tests/ref/lavf/mxf +1 −1

doc/APIchanges+32−0

@@ -12,6 +12,38 @@ libavutil: 2009-03-08 · 11 unmodified lines
12		12
13	API changes, most recent first:	13	API changes, most recent first:
14		14
		15	2011-04-12 - lavf 52.107.0 - avio.h
		16	Avio cleanup, part II - deprecate the entire URLContext API:
		17	175389c add avio_check as a replacement for url_exist
		18	ff1ec0c add avio_pause and avio_seek_time as replacements
		19	for _av_url_read_fseek/fpause
		20	cdc6a87 deprecate av_protocol_next(), avio_enum_protocols
		21	should be used instead.
		22	80c6e23 rename url_set_interrupt_cb->avio_set_interrupt_cb.
		23	f87b1b3 rename open flags: URL_* -> AVIO_*
		24	f8270bb add avio_enum_protocols.
		25	5593f03 deprecate URLProtocol.
		26	c486dad deprecate URLContext.
		27	026e175 deprecate the typedef for URLInterruptCB
		28	8e76a19 deprecate av_register_protocol2.
		29	b840484 deprecate URL_PROTOCOL_FLAG_NESTED_SCHEME
		30	1305d93 deprecate av_url_read_seek
		31	fa104e1 deprecate av_url_read_pause
		32	727c7aa deprecate url_get_filename().
		33	5958df3 deprecate url_max_packet_size().
		34	1869ea0 deprecate url_get_file_handle().
		35	32a97d4 deprecate url_filesize().
		36	e52a914 deprecate url_close().
		37	58a48c6 deprecate url_seek().
		38	925e908 deprecate url_write().
		39	dce3756 deprecate url_read_complete().
		40	bc371ac deprecate url_read().
		41	0589da0 deprecate url_open().
		42	62eaaea deprecate url_connect.
		43	5652bb9 deprecate url_alloc.
		44	333e894 deprecate url_open_protocol
		45	e230705 deprecate url_poll and URLPollEntry
		46
15	2011-04-10 - lavu 50.40.0 - pixfmt.h	47	2011-04-10 - lavu 50.40.0 - pixfmt.h
16	Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats	48	Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
17		49

libavcodec/avcodec.h+1−3

@@ -2966,9 +2966,7 @@ typedef struct AVCodec { · 2965 unmodified lines
2966	const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1	2966	const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
2967	const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0	2967	const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
2968	uint8_t max_lowres; ///< maximum value for lowres supported by the decoder	2968	uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
2969		2969	const AVClass *priv_class; ///< AVClass for the private context
2970	AVClass *priv_class; ///< AVClass for the private context
2971
2972	const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}	2970	const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}
2973		2971
2974	/**	2972	/**

libavcodec/libopencore-amr.c+76−79

@@ -20,6 +20,8 @@ · 19 unmodified lines
20	*/	20	*/
21		21
22	#include "avcodec.h"	22	#include "avcodec.h"
		23	#include "libavutil/avstring.h"
		24	#include "libavutil/opt.h"
23		25
24	static void amr_decode_fix_avctx(AVCodecContext *avctx)	26	static void amr_decode_fix_avctx(AVCodecContext *avctx)
25	{	27	{
@@ -40,9 +42,6 @@ static void amr_decode_fix_avctx(AVCodecContext *avctx) · 14 unmodified lines
40	#include <opencore-amrnb/interf_dec.h>	42	#include <opencore-amrnb/interf_dec.h>
41	#include <opencore-amrnb/interf_enc.h>	43	#include <opencore-amrnb/interf_enc.h>
42		44
43	static const char nb_bitrate_unsupported[] =
44	"bitrate not supported: use one of 4.75k, 5.15k, 5.9k, 6.7k, 7.4k, 7.95k, 10.2k or 12.2k\n";
45
46	/* Common code for fixed and float version*/	45	/* Common code for fixed and float version*/
47	typedef struct AMR_bitrates {	46	typedef struct AMR_bitrates {
48	int rate;	47	int rate;
@@ -50,41 +49,61 @@ typedef struct AMR_bitrates { · 1 unmodified line
50	} AMR_bitrates;	49	} AMR_bitrates;
51		50
52	/* Match desired bitrate */	51	/* Match desired bitrate */
53	static int getBitrateMode(int bitrate)	52	static int get_bitrate_mode(int bitrate, void *log_ctx)
54	{	53	{
55	/* make the correspondance between bitrate and mode */	54	/* make the correspondance between bitrate and mode */
56	AMR_bitrates rates[] = { { 4750, MR475},	55	static const AMR_bitrates rates[] = {
57	{ 5150, MR515},	56	{ 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 },
58	{ 5900, MR59},	57	{ 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 }
59	{ 6700, MR67},	58	};
60	{ 7400, MR74},	59	int i, best = -1, min_diff = 0;
61	{ 7950, MR795},	60	char log_buf[200];
62	{10200, MR102},	61
63	{12200, MR122}, };	62	for (i = 0; i < 8; i++) {
64	int i;
65
66	for (i = 0; i < 8; i++)
67	if (rates[i].rate == bitrate)	63	if (rates[i].rate == bitrate)
68	return rates[i].mode;	64	return rates[i].mode;
69	/* no bitrate matching, return an error */	65	if (best < 0 \|\| abs(rates[i].rate - bitrate) < min_diff) {
70	return -1;	66	best = i;
		67	min_diff = abs(rates[i].rate - bitrate);
		68	}
		69	}
		70	/* no bitrate matching exactly, log a warning */
		71	snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of ");
		72	for (i = 0; i < 8; i++)
		73	av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i].rate / 1000.f);
		74	av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best].rate / 1000.f);
		75	av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf);
		76
		77	return best;
71	}	78	}
72		79
73	typedef struct AMRContext {	80	typedef struct AMRContext {
74	int frameCount;	81	AVClass *av_class;
75	void *decState;	82	int frame_count;
76	int *enstate;	83	void *dec_state;
		84	void *enc_state;
77	int enc_bitrate;	85	int enc_bitrate;
		86	int enc_mode;
		87	int enc_dtx;
78	} AMRContext;	88	} AMRContext;
79		89
		90	static const AVOption options[] = {
		91	{ "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM \| AV_OPT_FLAG_ENCODING_PARAM },
		92	{ NULL }
		93	};
		94
		95	static const AVClass class = {
		96	"libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT
		97	};
		98
80	static av_cold int amr_nb_decode_init(AVCodecContext *avctx)	99	static av_cold int amr_nb_decode_init(AVCodecContext *avctx)
81	{	100	{
82	AMRContext *s = avctx->priv_data;	101	AMRContext *s = avctx->priv_data;
83		102
84	s->frameCount = 0;	103	s->frame_count = 0;
85	s->decState = Decoder_Interface_init();	104	s->dec_state = Decoder_Interface_init();
86	if (!s->decState) {	105	if (!s->dec_state) {
87	av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");	106	av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n");
88	return -1;	107	return -1;
89	}	108	}
90		109
@@ -92,7 +111,7 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx) · 1 unmodified line
92		111
93	if (avctx->channels > 1) {	112	if (avctx->channels > 1) {
94	av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");	113	av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
95	return -1;	114	return AVERROR(ENOSYS);
96	}	115	}
97		116
98	return 0;	117	return 0;
@@ -102,7 +121,7 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx) · 3 unmodified lines
102	{	121	{
103	AMRContext *s = avctx->priv_data;	122	AMRContext *s = avctx->priv_data;
104		123
105	Decoder_Interface_exit(s->decState);	124	Decoder_Interface_exit(s->dec_state);
106	return 0;	125	return 0;
107	}	126	}
108		127
@@ -111,29 +130,28 @@ static int amr_nb_decode_frame(AVCodecContext avctx, void data, · 2 unmodified lines
111	{	130	{
112	const uint8_t *buf = avpkt->data;	131	const uint8_t *buf = avpkt->data;
113	int buf_size = avpkt->size;	132	int buf_size = avpkt->size;
114	AMRContext *s = avctx->priv_data;	133	AMRContext *s = avctx->priv_data;
115	const uint8_t *amrData = buf;
116	static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };	134	static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
117	enum Mode dec_mode;	135	enum Mode dec_mode;
118	int packet_size;	136	int packet_size;
119		137
120	/* av_log(NULL, AV_LOG_DEBUG, "amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",	138	av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",
121	buf, buf_size, s->frameCount); */	139	buf, buf_size, s->frame_count);
122		140
123	dec_mode = (buf[0] >> 3) & 0x000F;	141	dec_mode = (buf[0] >> 3) & 0x000F;
124	packet_size = block_size[dec_mode] + 1;	142	packet_size = block_size[dec_mode] + 1;
125		143
126	if (packet_size > buf_size) {	144	if (packet_size > buf_size) {
127	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",	145	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
128	buf_size, packet_size);	146	buf_size, packet_size);
129	return -1;	147	return AVERROR_INVALIDDATA;
130	}	148	}
131		149
132	s->frameCount++;	150	s->frame_count++;
133	/* av_log(NULL, AV_LOG_DEBUG, "packet_size=%d amrData= 0x%X %X %X %X\n",	151	av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n",
134	packet_size, amrData[0], amrData[1], amrData[2], amrData[3]); */	152	packet_size, buf[0], buf[1], buf[2], buf[3]);
135	/* call decoder */	153	/* call decoder */
136	Decoder_Interface_Decode(s->decState, amrData, data, 0);	154	Decoder_Interface_Decode(s->dec_state, buf, data, 0);
137	data_size = 160 2;	155	data_size = 160 2;
138		156
139	return packet_size;	157	return packet_size;
@@ -155,31 +173,29 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) · 15 unmodified lines
155	{	173	{
156	AMRContext *s = avctx->priv_data;	174	AMRContext *s = avctx->priv_data;
157		175
158	s->frameCount = 0;	176	s->frame_count = 0;
159		177
160	if (avctx->sample_rate != 8000) {	178	if (avctx->sample_rate != 8000) {
161	av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");	179	av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
162	return -1;	180	return AVERROR(ENOSYS);
163	}	181	}
164		182
165	if (avctx->channels != 1) {	183	if (avctx->channels != 1) {
166	av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");	184	av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
167	return -1;	185	return AVERROR(ENOSYS);
168	}	186	}
169		187
170	avctx->frame_size = 160;	188	avctx->frame_size = 160;
171	avctx->coded_frame = avcodec_alloc_frame();	189	avctx->coded_frame = avcodec_alloc_frame();
172		190
173	s->enstate=Encoder_Interface_init(0);	191	s->enc_state = Encoder_Interface_init(s->enc_dtx);
174	if (!s->enstate) {	192	if (!s->enc_state) {
175	av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");	193	av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
176	return -1;	194	return -1;
177	}	195	}
178		196
179	if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {	197	s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
180	av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);	198	s->enc_bitrate = avctx->bit_rate;
181	return -1;
182	}
183		199
184	return 0;	200	return 0;
185	}	201	}
@@ -188,7 +204,7 @@ static av_cold int amr_nb_encode_close(AVCodecContext *avctx) · 2 unmodified lines
188	{	204	{
189	AMRContext *s = avctx->priv_data;	205	AMRContext *s = avctx->priv_data;
190		206
191	Encoder_Interface_exit(s->enstate);	207	Encoder_Interface_exit(s->enc_state);
192	av_freep(&avctx->coded_frame);	208	av_freep(&avctx->coded_frame);
193	return 0;	209	return 0;
194	}	210	}
@@ -200,15 +216,15 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, · 5 unmodified lines
200	AMRContext *s = avctx->priv_data;	216	AMRContext *s = avctx->priv_data;
201	int written;	217	int written;
202		218
203	if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {	219	if (s->enc_bitrate != avctx->bit_rate) {
204	av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);	220	s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
205	return -1;	221	s->enc_bitrate = avctx->bit_rate;
206	}	222	}
207		223
208	written = Encoder_Interface_Encode(s->enstate, s->enc_bitrate, data,	224	written = Encoder_Interface_Encode(s->enc_state, s->enc_mode, data,
209	frame, 0);	225	frame, 0);
210	/* av_log(NULL, AV_LOG_DEBUG, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",	226	av_dlog(avctx, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
211	written, s->enc_bitrate, frame[0] ); */	227	written, s->enc_mode, frame[0]);
212		228
213	return written;	229	return written;
214	}	230	}
@@ -224,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = { · 9 unmodified lines
224	NULL,	240	NULL,
225	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},	241	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
226	.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),	242	.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
		243	.priv_class = &class,
227	};	244	};
228		245
229	#endif	246	#endif
@@ -231,42 +248,24 @@ AVCodec ff_libopencore_amrnb_encoder = { · 1 unmodified line
231	/* -----------AMR wideband ------------*/	248	/* -----------AMR wideband ------------*/
232	#if CONFIG_LIBOPENCORE_AMRWB	249	#if CONFIG_LIBOPENCORE_AMRWB
233		250
234	#ifdef _TYPEDEF_H
235	//To avoid duplicate typedefs from typedef in amr-nb
236	#define typedef_h
237	#endif
238
239	#include <opencore-amrwb/dec_if.h>	251	#include <opencore-amrwb/dec_if.h>
240	#include <opencore-amrwb/if_rom.h>	252	#include <opencore-amrwb/if_rom.h>
241		253
242	static const char wb_bitrate_unsupported[] =
243	"bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, 18.25k, 19.85k, 23.05k, or 23.85k\n";
244
245	/* Common code for fixed and float version*/
246	typedef struct AMRWB_bitrates {
247	int rate;
248	int mode;
249	} AMRWB_bitrates;
250
251	typedef struct AMRWBContext {	254	typedef struct AMRWBContext {
252	int frameCount;
253	void *state;	255	void *state;
254	int mode;
255	Word16 allow_dtx;
256	} AMRWBContext;	256	} AMRWBContext;
257		257
258	static av_cold int amr_wb_decode_init(AVCodecContext *avctx)	258	static av_cold int amr_wb_decode_init(AVCodecContext *avctx)
259	{	259	{
260	AMRWBContext *s = avctx->priv_data;	260	AMRWBContext *s = avctx->priv_data;
261		261
262	s->frameCount = 0;	262	s->state = D_IF_init();
263	s->state = D_IF_init();
264		263
265	amr_decode_fix_avctx(avctx);	264	amr_decode_fix_avctx(avctx);
266		265
267	if (avctx->channels > 1) {	266	if (avctx->channels > 1) {
268	av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");	267	av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");
269	return -1;	268	return AVERROR(ENOSYS);
270	}	269	}
271		270
272	return 0;	271	return 0;
@@ -277,8 +276,7 @@ static int amr_wb_decode_frame(AVCodecContext avctx, void data, · 4 unmodified lines
277	{	276	{
278	const uint8_t *buf = avpkt->data;	277	const uint8_t *buf = avpkt->data;
279	int buf_size = avpkt->size;	278	int buf_size = avpkt->size;
280	AMRWBContext *s = avctx->priv_data;	279	AMRWBContext *s = avctx->priv_data;
281	const uint8_t *amrData = buf;
282	int mode;	280	int mode;
283	int packet_size;	281	int packet_size;
284	static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};	282	static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
@@ -287,17 +285,16 @@ static int amr_wb_decode_frame(AVCodecContext avctx, void data, · 2 unmodified lines
287	/* nothing to do */	285	/* nothing to do */
288	return 0;	286	return 0;
289		287
290	mode = (amrData[0] >> 3) & 0x000F;	288	mode = (buf[0] >> 3) & 0x000F;
291	packet_size = block_size[mode];	289	packet_size = block_size[mode];
292		290
293	if (packet_size > buf_size) {	291	if (packet_size > buf_size) {
294	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",	292	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
295	buf_size, packet_size + 1);	293	buf_size, packet_size + 1);
296	return -1;	294	return AVERROR_INVALIDDATA;
297	}	295	}
298		296
299	s->frameCount++;	297	D_IF_decode(s->state, buf, data, _good_frame);
300	D_IF_decode(s->state, amrData, data, _good_frame);
301	data_size = 320 2;	298	data_size = 320 2;
302	return packet_size;	299	return packet_size;
303	}	300	}

libavcodec/libvo-aacenc.c+11−9

         return AVERROR_UNKNOWN;
     }
-    avctx->extradata_size = 2;
-    avctx->extradata      = av_mallocz(avctx->extradata_size +
-                                       FF_INPUT_BUFFER_PADDING_SIZE);
-    if (!avctx->extradata)
-        return AVERROR(ENOMEM);
     for (index = 0; index < 16; index++)
         if (avctx->sample_rate == ff_mpeg4audio_sample_rates[index])
             break;
                                     avctx->sample_rate);
         return AVERROR_NOTSUPP;
     }
-    avctx->extradata[0] = 0x02 << 3 | index >> 1;
+    if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
-    avctx->extradata[1] = (index & 0x01) << 7 | avctx->channels << 3;
+        avctx->extradata_size = 2;
+        avctx->extradata      = av_mallocz(avctx->extradata_size +
+                                           FF_INPUT_BUFFER_PADDING_SIZE);
+        if (!avctx->extradata)
+            return AVERROR(ENOMEM);
+        avctx->extradata[0] = 0x02 << 3 | index >> 1;
+        avctx->extradata[1] = (index & 0x01) << 7 | avctx->channels << 3;
+    }
     return 0;
 }
     aac_encode_close,
     NULL,
     .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
-    .long_name = NULL_IF_CONFIG_SMALL("VisualOn libvo-aacenc AAC"),
+    .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),
 };

libavcodec/libvo-amrwbenc.c+43−36

@@ -22,41 +22,50 @@ · 21 unmodified lines
22	#include <vo-amrwbenc/enc_if.h>	22	#include <vo-amrwbenc/enc_if.h>
23		23
24	#include "avcodec.h"	24	#include "avcodec.h"
25		25	#include "libavutil/avstring.h"
26	static const char wb_bitrate_unsupported[] =	26	#include "libavutil/opt.h"
27	"bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, "
28	"18.25k, 19.85k, 23.05k, or 23.85k\n";
29
30	typedef struct AMRWB_bitrates {
31	int rate;
32	int mode;
33	} AMRWB_bitrates;
34		27
35	typedef struct AMRWBContext {	28	typedef struct AMRWBContext {
		29	AVClass *av_class;
36	void *state;	30	void *state;
37	int mode;	31	int mode;
		32	int last_bitrate;
38	int allow_dtx;	33	int allow_dtx;
39	} AMRWBContext;	34	} AMRWBContext;
40		35
41	static int getWBBitrateMode(int bitrate)	36	static const AVOption options[] = {
		37	{ "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRWBContext, allow_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM \| AV_OPT_FLAG_ENCODING_PARAM },
		38	{ NULL }
		39	};
		40
		41	static const AVClass class = {
		42	"libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
		43	};
		44
		45	static int get_wb_bitrate_mode(int bitrate, void *log_ctx)
42	{	46	{
43	/* make the correspondance between bitrate and mode */	47	/* make the correspondance between bitrate and mode */
44	AMRWB_bitrates rates[] = { { 6600, 0},	48	static const int rates[] = { 6600, 8850, 12650, 14250, 15850, 18250,
45	{ 8850, 1},	49	19850, 23050, 23850 };
46	{12650, 2},	50	int i, best = -1, min_diff = 0;
47	{14250, 3},	51	char log_buf[200];
48	{15850, 4},	52
49	{18250, 5},	53	for (i = 0; i < 9; i++) {
50	{19850, 6},	54	if (rates[i] == bitrate)
51	{23050, 7},	55	return i;
52	{23850, 8}, };	56	if (best < 0 \|\| abs(rates[i] - bitrate) < min_diff) {
53	int i;	57	best = i;
54		58	min_diff = abs(rates[i] - bitrate);
		59	}
		60	}
		61	/* no bitrate matching exactly, log a warning */
		62	snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of ");
55	for (i = 0; i < 9; i++)	63	for (i = 0; i < 9; i++)
56	if (rates[i].rate == bitrate)	64	av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i] / 1000.f);
57	return rates[i].mode;	65	av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best] / 1000.f);
58	/* no bitrate matching, return an error */	66	av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf);
59	return -1;	67
		68	return best;
60	}	69	}
61		70
62	static av_cold int amr_wb_encode_init(AVCodecContext *avctx)	71	static av_cold int amr_wb_encode_init(AVCodecContext *avctx)
@@ -65,24 +74,21 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx) · 2 unmodified lines
65		74
66	if (avctx->sample_rate != 16000) {	75	if (avctx->sample_rate != 16000) {
67	av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n");	76	av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n");
68	return -1;	77	return AVERROR(ENOSYS);
69	}	78	}
70		79
71	if (avctx->channels != 1) {	80	if (avctx->channels != 1) {
72	av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");	81	av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
73	return -1;	82	return AVERROR(ENOSYS);
74	}	83	}
75		84
76	if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {	85	s->mode = get_wb_bitrate_mode(avctx->bit_rate, avctx);
77	av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);	86	s->last_bitrate = avctx->bit_rate;
78	return -1;
79	}
80		87
81	avctx->frame_size = 320;	88	avctx->frame_size = 320;
82	avctx->coded_frame = avcodec_alloc_frame();	89	avctx->coded_frame = avcodec_alloc_frame();
83		90
84	s->state = E_IF_init();	91	s->state = E_IF_init();
85	s->allow_dtx = 0;
86		92
87	return 0;	93	return 0;
88	}	94	}
@@ -103,9 +109,9 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, · 14 unmodified lines
103	AMRWBContext *s = avctx->priv_data;	109	AMRWBContext *s = avctx->priv_data;
104	int size;	110	int size;
105		111
106	if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {	112	if (s->last_bitrate != avctx->bit_rate) {
107	av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);	113	s->mode = get_wb_bitrate_mode(avctx->bit_rate, avctx);
108	return -1;	114	s->last_bitrate = avctx->bit_rate;
109	}	115	}
110	size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);	116	size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);
111	return size;	117	return size;
@@ -121,7 +127,8 @@ AVCodec ff_libvo_amrwbenc_encoder = { · 9 unmodified lines
121	amr_wb_encode_close,	127	amr_wb_encode_close,
122	NULL,	128	NULL,
123	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},	129	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
124	.long_name = NULL_IF_CONFIG_SMALL("VisualOn libvo-amrwbenc Adaptive Multi-Rate "	130	.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "
125	"(AMR) Wide-Band"),	131	"(AMR) Wide-Band"),
		132	.priv_class = &class,
126	};	133	};
127		134

libavcodec/msmpeg4.c+2−1

@@ -1279,7 +1279,8 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) · 1278 unmodified lines
1279	int i;	1279	int i;
1280	MVTable *mv;	1280	MVTable *mv;
1281		1281
1282	ff_h263_decode_init(avctx);	1282	if (ff_h263_decode_init(avctx) < 0)
		1283	return -1;
1283		1284
1284	common_init(s);	1285	common_init(s);
1285		1286

libavcodec/version.h+3−3

@@ -66,10 +66,10 @@ · 65 unmodified lines
66	#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53)	66	#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53)
67	#endif	67	#endif
68	#ifndef FF_API_OLD_SAMPLE_FMT	68	#ifndef FF_API_OLD_SAMPLE_FMT
69	#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 53)	69	#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54)
70	#endif	70	#endif
71	#ifndef FF_API_OLD_AUDIOCONVERT	71	#ifndef FF_API_OLD_AUDIOCONVERT
72	#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53)	72	#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
73	#endif	73	#endif
74	#ifndef FF_API_HURRY_UP	74	#ifndef FF_API_HURRY_UP
75	#define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53)	75	#define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53)
@@ -84,7 +84,7 @@ · 8 unmodified lines
84	#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)	84	#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)
85	#endif	85	#endif
86	#ifndef FF_API_REQUEST_CHANNELS	86	#ifndef FF_API_REQUEST_CHANNELS
87	#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 53)	87	#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
88	#endif	88	#endif
89		89
90	#endif /* AVCODEC_VERSION_H */	90	#endif /* AVCODEC_VERSION_H */

libavformat/applehttp.c+7−4

     c->end_of_segment = 1;
     c->cur_seq_no = v->cur_seq_no;
-    v->needed = 0;
+    if (v->ctx) {
-    for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams; i++) {
+        v->needed = 0;
-        if (v->parent->streams[i]->discard < AVDISCARD_ALL)
+        for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;
-            v->needed = 1;
+             i++) {
+            if (v->parent->streams[i]->discard < AVDISCARD_ALL)
+                v->needed = 1;
+        }
     }
     if (!v->needed) {
         av_log(v->parent, AV_LOG_INFO, "No longer receiving variant %d\n",

libavformat/avformat.h+2−2

@@ -317,7 +317,7 @@ typedef struct AVOutputFormat { · 316 unmodified lines
317		317
318	enum CodecID subtitle_codec; /*< default subtitle codec /	318	enum CodecID subtitle_codec; /*< default subtitle codec /
319		319
320	#if FF_API_OLD_METADATA	320	#if FF_API_OLD_METADATA2
321	const AVMetadataConv *metadata_conv;	321	const AVMetadataConv *metadata_conv;
322	#endif	322	#endif
323		323
@@ -437,7 +437,7 @@ typedef struct AVInputFormat { · 113 unmodified lines
437	*/	437	*/
438	int (read_seek2)(struct AVFormatContext s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);	438	int (read_seek2)(struct AVFormatContext s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
439		439
440	#if FF_API_OLD_METADATA	440	#if FF_API_OLD_METADATA2
441	const AVMetadataConv *metadata_conv;	441	const AVMetadataConv *metadata_conv;
442	#endif	442	#endif
443		443

libavformat/avio.c+21−0

@@ -363,6 +363,7 @@ int ffurl_close(URLContext *h) · 362 unmodified lines
363	return ret;	363	return ret;
364	}	364	}
365		365
		366	#if FF_API_OLD_AVIO
366	int url_exist(const char *filename)	367	int url_exist(const char *filename)
367	{	368	{
368	URLContext *h;	369	URLContext *h;
@@ -371,6 +372,26 @@ int url_exist(const char *filename) · 2 unmodified lines
371	ffurl_close(h);	372	ffurl_close(h);
372	return 1;	373	return 1;
373	}	374	}
		375	#endif
		376
		377	int avio_check(const char *url, int flags)
		378	{
		379	URLContext *h;
		380	int ret = ffurl_alloc(&h, url, flags);
		381	if (ret)
		382	return ret;
		383
		384	if (h->prot->url_check) {
		385	ret = h->prot->url_check(h, flags);
		386	} else {
		387	ret = ffurl_connect(h);
		388	if (ret >= 0)
		389	ret = flags;
		390	}
		391
		392	ffurl_close(h);
		393	return ret;
		394	}
374		395
375	int64_t ffurl_size(URLContext *h)	396	int64_t ffurl_size(URLContext *h)
376	{	397	{

libavformat/avio.h+31−2

     int priv_data_size;
     const AVClass *priv_data_class;
     int flags;
+    int (*url_check)(URLContext *h, int mask);
 } URLProtocol;
 typedef struct URLPollEntry {
 /** return the written or read size */
 attribute_deprecated int url_close_buf(AVIOContext *s);
-#endif // FF_API_OLD_AVIO
 /**
  * Return a non-zero value if the resource indicated by url
  * exists, 0 otherwise.
+ * @deprecated Use avio_check instead.
  */
-int url_exist(const char *url);
+attribute_deprecated int url_exist(const char *url);
+#endif // FF_API_OLD_AVIO
+/**
+ * Return AVIO_* access flags corresponding to the access permissions
+ * of the resource in url, or a negative value corresponding to an
+ * AVERROR code in case of failure. The returned access flags are
+ * masked by the value in flags.
+ *
+ * @note This function is intrinsically unsafe, in the sense that the
+ * checked resource may change its existence or permission status from
+ * one call to another. Thus you should not trust the returned value,
+ * unless you are sure that no other processes are accessing the
+ * checked resource.
+ *
+ * @note This function is slightly broken until next major bump
+ *       because of AVIO_RDONLY == 0. Don't use it until then.
+ */
+int avio_check(const char *url, int flags);
 /**
  * The callback is called in blocking functions to test regulary if
  * constants, optionally ORed with other flags.
  * @{
  */
+#if LIBAVFORMAT_VERSION_MAJOR < 53
 #define AVIO_RDONLY 0  /**< read-only */
 #define AVIO_WRONLY 1  /**< write-only */
 #define AVIO_RDWR   2  /**< read-write */
+#else
+#define AVIO_RDONLY 1  /**< read-only */
+#define AVIO_WRONLY 2  /**< write-only */
+#define AVIO_RDWR   4  /**< read-write */
+#endif
 /**
  * @}
  */
  * Warning: non-blocking protocols is work-in-progress; this flag may be
  * silently ignored.
  */
+#if LIBAVFORMAT_VERSION_MAJOR < 53
 #define AVIO_FLAG_NONBLOCK 4
+#else
+#define AVIO_FLAG_NONBLOCK 8
+#endif
 /**
  * Create and initialize a AVIOContext for accessing the

libavformat/file.c+16−0

     return close(fd);
 }
+static int file_check(URLContext *h, int mask)
+{
+    struct stat st;
+    int ret = stat(h->filename, &st);
+    if (ret < 0)
+        return AVERROR(errno);
+    ret |= st.st_mode&S_IRUSR ? mask&AVIO_RDONLY : 0;
+    ret |= st.st_mode&S_IWUSR ? mask&AVIO_WRONLY : 0;
+    ret |= st.st_mode&S_IWUSR && st.st_mode&S_IRUSR ? mask&AVIO_RDWR : 0;
+    return ret;
+}
 URLProtocol ff_file_protocol = {
     .name                = "file",
     .url_open            = file_open,
     .url_seek            = file_seek,
     .url_close           = file_close,
     .url_get_file_handle = file_get_handle,
+    .url_check           = file_check,
 };
 #endif /* CONFIG_FILE_PROTOCOL */
     .url_read            = file_read,
     .url_write           = file_write,
     .url_get_file_handle = file_get_handle,
+    .url_check           = file_check,
 };
 #endif /* CONFIG_PIPE_PROTOCOL */

libavformat/url.h+1−0

@@ -59,6 +59,7 @@ typedef struct URLProtocol { · 58 unmodified lines
59	int priv_data_size;	59	int priv_data_size;
60	const AVClass *priv_data_class;	60	const AVClass *priv_data_class;
61	int flags;	61	int flags;
		62	int (url_check)(URLContext h, int mask);
62	} URLProtocol;	63	} URLProtocol;
63	#endif	64	#endif
64		65

libavformat/utils.c+4−1

     AVStream *st2= s->streams[ next->stream_index];
     int64_t a= st2->time_base.num * (int64_t)st ->time_base.den;
     int64_t b= st ->time_base.num * (int64_t)st2->time_base.den;
-    return av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN) < next->dts;
+    int64_t dts1 = av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN);
+    if (dts1==next->dts && dts1==av_rescale_rnd(pkt->dts, b, a, AV_ROUND_UP))
+        return pkt->stream_index < next->stream_index;
+    return dts1 < next->dts;
 }
 int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){

libavformat/version.h+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	#include "libavutil/avutil.h"	24	#include "libavutil/avutil.h"
25		25
26	#define LIBAVFORMAT_VERSION_MAJOR 52	26	#define LIBAVFORMAT_VERSION_MAJOR 52
27	#define LIBAVFORMAT_VERSION_MINOR 106	27	#define LIBAVFORMAT_VERSION_MINOR 107
28	#define LIBAVFORMAT_VERSION_MICRO 0	28	#define LIBAVFORMAT_VERSION_MICRO 0
29		29
30	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	30	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

libswscale/rgb2rgb.c+0−2

@@ -30,8 +30,6 @@ · 29 unmodified lines
30	#include "swscale.h"	30	#include "swscale.h"
31	#include "swscale_internal.h"	31	#include "swscale_internal.h"
32		32
33	#define FAST_BGR2YV12 // use 7-bit instead of 15-bit coefficients
34
35	void (rgb24tobgr32)(const uint8_t src, uint8_t *dst, long src_size);	33	void (rgb24tobgr32)(const uint8_t src, uint8_t *dst, long src_size);
36	void (rgb24tobgr16)(const uint8_t src, uint8_t *dst, long src_size);	34	void (rgb24tobgr16)(const uint8_t src, uint8_t *dst, long src_size);
37	void (rgb24tobgr15)(const uint8_t src, uint8_t *dst, long src_size);	35	void (rgb24tobgr15)(const uint8_t src, uint8_t *dst, long src_size);

libswscale/swscale.c+0−2

@@ -77,8 +77,6 @@ untested special converters · 76 unmodified lines
77	//#undef ARCH_X86	77	//#undef ARCH_X86
78	#define DITHER1XBPP	78	#define DITHER1XBPP
79		79
80	#define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit
81
82	#define isPacked(x) ( \	80	#define isPacked(x) ( \
83	(x)==PIX_FMT_PAL8 \	81	(x)==PIX_FMT_PAL8 \
84	\|\| (x)==PIX_FMT_YUYV422 \	82	\|\| (x)==PIX_FMT_YUYV422 \

libswscale/swscale_internal.h+2−0

@@ -31,6 +31,8 @@ · 30 unmodified lines
31		31
32	#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long	32	#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
33		33
		34	#define FAST_BGR2YV12 //use 7-bit instead of 15-bit coefficients
		35
34	#define MAX_FILTER_SIZE 256	36	#define MAX_FILTER_SIZE 256
35		37
36	#if ARCH_X86	38	#if ARCH_X86

tests/ref/fate/8bps+1−1

@@ -1,5 +1,5 @@
1	1, 0, 2048, 0x3d042426
2	0, 0, 259200, 0x7e91df07	1	0, 0, 259200, 0x7e91df07
		2	1, 0, 2048, 0x3d042426
3	1, 4180, 2048, 0x5bcae456	3	1, 4180, 2048, 0x5bcae456
4	0, 7200, 259200, 0x7e91df07	4	0, 7200, 259200, 0x7e91df07
5	1, 8359, 2048, 0xb6043655	5	1, 8359, 2048, 0xb6043655

tests/ref/fate/bethsoft-vid+1−1

@@ -1,5 +1,5 @@
1	1, 0, 1480, 0x00000000
2	0, 0, 192000, 0x00000000	1	0, 0, 192000, 0x00000000
		2	1, 0, 1480, 0x00000000
3	0, 1500, 192000, 0x01a6cf45	3	0, 1500, 192000, 0x01a6cf45
4	0, 3000, 192000, 0xd07d57e9	4	0, 3000, 192000, 0xd07d57e9
5	0, 4500, 192000, 0x3cb1dff5	5	0, 4500, 192000, 0x3cb1dff5

tests/ref/fate/bfi+1−1

@@ -1,5 +1,5 @@
1	1, 0, 17768, 0x07df135c
2	0, 0, 134400, 0xc218b00c	1	0, 0, 134400, 0xc218b00c
		2	1, 0, 17768, 0x07df135c
3	0, 10000, 134400, 0x114daf7c	3	0, 10000, 134400, 0x114daf7c
4	0, 20000, 134400, 0xe14db24c	4	0, 20000, 134400, 0xe14db24c
5	0, 30000, 134400, 0x88c71df7	5	0, 30000, 134400, 0x88c71df7

tests/ref/fate/corepng+1−1

@@ -1,5 +1,5 @@
1	1, 0, 11026, 0x27ad637c
2	0, 0, 230400, 0x03e25ead	1	0, 0, 230400, 0x03e25ead
		2	1, 0, 11026, 0x27ad637c
3	0, 6000, 230400, 0x0a520ffd	3	0, 6000, 230400, 0x0a520ffd
4	0, 12000, 230400, 0x0b11a671	4	0, 12000, 230400, 0x0b11a671
5	0, 18000, 230400, 0x7d3fce32	5	0, 18000, 230400, 0x7d3fce32

tests/ref/fate/creatureshock-avs+1−1

@@ -1,5 +1,5 @@
1	1, 0, 16372, 0xfaaab59d
2	0, 0, 188892, 0xcb5be3dd	1	0, 0, 188892, 0xcb5be3dd
		2	1, 0, 16372, 0xfaaab59d
3	0, 6000, 188892, 0x0f313ebc	3	0, 6000, 188892, 0x0f313ebc
4	0, 12000, 188892, 0xc0da25cc	4	0, 12000, 188892, 0xc0da25cc
5	0, 18000, 188892, 0xad6e1d44	5	0, 18000, 188892, 0xad6e1d44

tests/ref/fate/feeble-dxa+1−1

@@ -1,5 +1,5 @@
1	1, 0, 1000, 0x64cd9403
2	0, 0, 921600, 0x0d03844f	1	0, 0, 921600, 0x0d03844f
		2	1, 0, 1000, 0x64cd9403
3	1, 4082, 1000, 0xa4ef8a9d	3	1, 4082, 1000, 0xa4ef8a9d
4	1, 8163, 1000, 0x75c19868	4	1, 8163, 1000, 0x75c19868
5	0, 9000, 921600, 0x0d03844f	5	0, 9000, 921600, 0x0d03844f

tests/ref/fate/film-cvid-pcm-stereo-8bit+8−8

@@ -1,5 +1,5 @@
1	1, 0, 88192, 0x23bb50ae
2	0, 0, 107520, 0xa6c9fdd2	1	0, 0, 107520, 0xa6c9fdd2
		2	1, 0, 88192, 0x23bb50ae
3	0, 3000, 107520, 0x61eb28c1	3	0, 3000, 107520, 0x61eb28c1
4	0, 6000, 107520, 0x45e20af7	4	0, 6000, 107520, 0x45e20af7
5	0, 9000, 107520, 0x45e20af7	5	0, 9000, 107520, 0x45e20af7
@@ -31,8 +31,8 @@ · 25 unmodified lines
31	0, 81000, 107520, 0xee7324f0	31	0, 81000, 107520, 0xee7324f0
32	0, 84000, 107520, 0xe15025b3	32	0, 84000, 107520, 0xe15025b3
33	0, 87000, 107520, 0xe15025b3	33	0, 87000, 107520, 0xe15025b3
34	1, 90000, 44112, 0x18fed048
35	0, 90000, 107520, 0x8afa312e	34	0, 90000, 107520, 0x8afa312e
		35	1, 90000, 44112, 0x18fed048
36	0, 93000, 107520, 0x8afa312e	36	0, 93000, 107520, 0x8afa312e
37	0, 96000, 107520, 0x717a7d0f	37	0, 96000, 107520, 0x717a7d0f
38	0, 99000, 107520, 0x717a7d0f	38	0, 99000, 107520, 0x717a7d0f
@@ -65,8 +65,8 @@ · 26 unmodified lines
65	0, 171000, 107520, 0x14147bd6	65	0, 171000, 107520, 0x14147bd6
66	0, 174000, 107520, 0x07d54bec	66	0, 174000, 107520, 0x07d54bec
67	0, 177000, 107520, 0x07d54bec	67	0, 177000, 107520, 0x07d54bec
68	1, 180000, 44112, 0xddc19d91
69	0, 180000, 107520, 0xe287a0a7	68	0, 180000, 107520, 0xe287a0a7
		69	1, 180000, 44112, 0xddc19d91
70	0, 183000, 107520, 0xe287a0a7	70	0, 183000, 107520, 0xe287a0a7
71	0, 186000, 107520, 0xc023a14d	71	0, 186000, 107520, 0xc023a14d
72	0, 189000, 107520, 0xc023a14d	72	0, 189000, 107520, 0xc023a14d
@@ -99,8 +99,8 @@ · 26 unmodified lines
99	0, 261000, 107520, 0x3e0e4d8d	99	0, 261000, 107520, 0x3e0e4d8d
100	0, 264000, 107520, 0xd268865b	100	0, 264000, 107520, 0xd268865b
101	0, 267000, 107520, 0xd268865b	101	0, 267000, 107520, 0xd268865b
102	1, 270000, 44112, 0x99c8c3d9
103	0, 270000, 107520, 0x89a4efeb	102	0, 270000, 107520, 0x89a4efeb
		103	1, 270000, 44112, 0x99c8c3d9
104	0, 273000, 107520, 0x89a4efeb	104	0, 273000, 107520, 0x89a4efeb
105	0, 276000, 107520, 0x70ca2478	105	0, 276000, 107520, 0x70ca2478
106	0, 279000, 107520, 0x70ca2478	106	0, 279000, 107520, 0x70ca2478
@@ -133,8 +133,8 @@ · 26 unmodified lines
133	0, 351000, 107520, 0x3a1d7571	133	0, 351000, 107520, 0x3a1d7571
134	0, 354000, 107520, 0x3a1d7571	134	0, 354000, 107520, 0x3a1d7571
135	0, 357000, 107520, 0x3a1d7571	135	0, 357000, 107520, 0x3a1d7571
136	1, 360000, 44112, 0x9e475274
137	0, 360000, 107520, 0xe974733e	136	0, 360000, 107520, 0xe974733e
		137	1, 360000, 44112, 0x9e475274
138	0, 363000, 107520, 0xe974733e	138	0, 363000, 107520, 0xe974733e
139	0, 366000, 107520, 0x999c6fbf	139	0, 366000, 107520, 0x999c6fbf
140	0, 369000, 107520, 0x999c6fbf	140	0, 369000, 107520, 0x999c6fbf
@@ -167,8 +167,8 @@ · 26 unmodified lines
167	0, 441000, 107520, 0xfce5fd07	167	0, 441000, 107520, 0xfce5fd07
168	0, 444000, 107520, 0xd993f193	168	0, 444000, 107520, 0xd993f193
169	0, 447000, 107520, 0xd993f193	169	0, 447000, 107520, 0xd993f193
170	1, 450000, 44112, 0xb8f86e48
171	0, 450000, 107520, 0x4d48e7b4	170	0, 450000, 107520, 0x4d48e7b4
		171	1, 450000, 44112, 0xb8f86e48
172	0, 453000, 107520, 0x4d48e7b4	172	0, 453000, 107520, 0x4d48e7b4
173	0, 456000, 107520, 0x61ccdf83	173	0, 456000, 107520, 0x61ccdf83
174	0, 459000, 107520, 0x61ccdf83	174	0, 459000, 107520, 0x61ccdf83
@@ -201,8 +201,8 @@ · 26 unmodified lines
201	0, 531000, 107520, 0xf464c343	201	0, 531000, 107520, 0xf464c343
202	0, 534000, 107520, 0xf464c343	202	0, 534000, 107520, 0xf464c343
203	0, 537000, 107520, 0xf464c343	203	0, 537000, 107520, 0xf464c343
204	1, 540000, 44112, 0xe0ac619f
205	0, 540000, 107520, 0xf464c343	204	0, 540000, 107520, 0xf464c343
		205	1, 540000, 44112, 0xe0ac619f
206	0, 543000, 107520, 0xf464c343	206	0, 543000, 107520, 0xf464c343
207	0, 546000, 107520, 0xf2b2c712	207	0, 546000, 107520, 0xf2b2c712
208	0, 549000, 107520, 0xf2b2c712	208	0, 549000, 107520, 0xf2b2c712
@@ -235,8 +235,8 @@ · 26 unmodified lines
235	0, 621000, 107520, 0x5ecc379e	235	0, 621000, 107520, 0x5ecc379e
236	0, 624000, 107520, 0xea09432a	236	0, 624000, 107520, 0xea09432a
237	0, 627000, 107520, 0xea09432a	237	0, 627000, 107520, 0xea09432a
238	1, 630000, 44112, 0x00000000
239	0, 630000, 107520, 0xe01e6b73	238	0, 630000, 107520, 0xe01e6b73
		239	1, 630000, 44112, 0x00000000
240	0, 633000, 107520, 0xe01e6b73	240	0, 633000, 107520, 0xe01e6b73
241	0, 636000, 107520, 0x1d13bba8	241	0, 636000, 107520, 0x1d13bba8
242	0, 639000, 107520, 0x1d13bba8	242	0, 639000, 107520, 0x1d13bba8

tests/ref/fate/idroq-video-dpcm+1−1

@@ -1,5 +1,5 @@
1	1, 0, 29824, 0x77e265b7
2	0, 0, 393216, 0x56995aac	1	0, 0, 393216, 0x56995aac
		2	1, 0, 29824, 0x77e265b7
3	0, 3000, 393216, 0xf9ed5d6c	3	0, 3000, 393216, 0xf9ed5d6c
4	0, 6000, 393216, 0xd3285d75	4	0, 6000, 393216, 0xd3285d75
5	0, 9000, 393216, 0x82d15d62	5	0, 9000, 393216, 0x82d15d62

tests/ref/fate/interplay-mve-16bit+1−1

@@ -1,5 +1,5 @@
1	1, 0, 5788, 0x916d2db8
2	0, 0, 614400, 0x00000000	1	0, 0, 614400, 0x00000000
		2	1, 0, 5788, 0x916d2db8
3	1, 2953, 5888, 0xc65cb069	3	1, 2953, 5888, 0xc65cb069
4	0, 3002, 614400, 0x00000000	4	0, 3002, 614400, 0x00000000
5	1, 5957, 5888, 0xd8ec1acc	5	1, 5957, 5888, 0xd8ec1acc

tests/ref/fate/interplay-mve-8bit+1−1

@@ -1,5 +1,5 @@
1	1, 0, 5848, 0xea04292b
2	0, 0, 414720, 0xa5cd50ca	1	0, 0, 414720, 0xa5cd50ca
		2	1, 0, 5848, 0xea04292b
3	1, 5967, 5888, 0x0e59e942	3	1, 5967, 5888, 0x0e59e942
4	0, 6006, 414720, 0x3facd321	4	0, 6006, 414720, 0x3facd321
5	1, 11976, 5888, 0x56d480f6	5	1, 11976, 5888, 0x56d480f6

tests/ref/fate/lmlm4-demux+1−1

@@ -1,5 +1,5 @@
1	1, 0, 768, 0xaebcbebb
2	0, 0, 5951, 0xe9118e0d	1	0, 0, 5951, 0xe9118e0d
		2	1, 0, 768, 0xaebcbebb
3	1, 2160, 768, 0xaebcbebb	3	1, 2160, 768, 0xaebcbebb
4	0, 3003, 1672, 0x4b80d4ca	4	0, 3003, 1672, 0x4b80d4ca
5	1, 4320, 768, 0xaebcbebb	5	1, 4320, 768, 0xaebcbebb

tests/ref/fate/mtv+1−1

@@ -1,5 +1,5 @@
1	1, 0, 417, 0xae1cc66a
2	0, 0, 18432, 0xbd7e0ac8	1	0, 0, 18432, 0xbd7e0ac8
		2	1, 0, 417, 0xae1cc66a
3	1, 2351, 418, 0xdc3ec850	3	1, 2351, 418, 0xdc3ec850
4	1, 4702, 418, 0x4e8ed05f	4	1, 4702, 418, 0x4e8ed05f
5	0, 5625, 18432, 0xbd7e0ac8	5	0, 5625, 18432, 0xbd7e0ac8

tests/ref/fate/nuv+1−1

@@ -1,5 +1,5 @@
1	1, 0, 4096, 0x00000000
2	0, 0, 460800, 0x54aedafe	1	0, 0, 460800, 0x54aedafe
		2	1, 0, 4096, 0x00000000
3	1, 2090, 4096, 0x4dfae7a6	3	1, 2090, 4096, 0x4dfae7a6
4	0, 3003, 460800, 0x54aedafe	4	0, 3003, 460800, 0x54aedafe
5	1, 4180, 4096, 0x3fd9f5c6	5	1, 4180, 4096, 0x3fd9f5c6

tests/ref/fate/psx-str+23−23

@@ -1,5 +1,5 @@
1	1, 0, 8064, 0x02260037
2	0, 0, 115200, 0x6b106a56	1	0, 0, 115200, 0x6b106a56
		2	1, 0, 8064, 0x02260037
3	1, 4800, 8064, 0x4ee9f4e9	3	1, 4800, 8064, 0x4ee9f4e9
4	0, 6000, 115200, 0x53c16930	4	0, 6000, 115200, 0x53c16930
5	1, 9600, 8064, 0xf8fd82aa	5	1, 9600, 8064, 0xf8fd82aa
@@ -7,8 +7,8 @@ · 1 unmodified line
7	1, 14400, 8064, 0xc100792b	7	1, 14400, 8064, 0xc100792b
8	0, 18000, 115200, 0xc3c18ba0	8	0, 18000, 115200, 0xc3c18ba0
9	1, 19200, 8064, 0xf11a5316	9	1, 19200, 8064, 0xf11a5316
10	1, 24000, 8064, 0x6937f8c0
11	0, 24000, 115200, 0xe281b655	10	0, 24000, 115200, 0xe281b655
		11	1, 24000, 8064, 0x6937f8c0
12	1, 28800, 8064, 0xed194e42	12	1, 28800, 8064, 0xed194e42
13	0, 30000, 115200, 0x7b1e0536	13	0, 30000, 115200, 0x7b1e0536
14	1, 33600, 8064, 0x619ce54b	14	1, 33600, 8064, 0x619ce54b
@@ -16,8 +16,8 @@ · 1 unmodified line
16	1, 38400, 8064, 0x544999ec	16	1, 38400, 8064, 0x544999ec
17	0, 42000, 115200, 0xfc67bf8e	17	0, 42000, 115200, 0xfc67bf8e
18	1, 43200, 8064, 0x0ea877b4	18	1, 43200, 8064, 0x0ea877b4
19	1, 48000, 8064, 0xb764d1c0
20	0, 48000, 115200, 0xb463151c	19	0, 48000, 115200, 0xb463151c
		20	1, 48000, 8064, 0xb764d1c0
21	1, 52800, 8064, 0x7a2fd211	21	1, 52800, 8064, 0x7a2fd211
22	0, 54000, 115200, 0x6e686846	22	0, 54000, 115200, 0x6e686846
23	1, 57600, 8064, 0xff69f6c5	23	1, 57600, 8064, 0xff69f6c5
@@ -25,8 +25,8 @@ · 1 unmodified line
25	1, 62400, 8064, 0x26c11ec7	25	1, 62400, 8064, 0x26c11ec7
26	0, 66000, 115200, 0x17b91efc	26	0, 66000, 115200, 0x17b91efc
27	1, 67200, 8064, 0xfb4ecc0c	27	1, 67200, 8064, 0xfb4ecc0c
28	1, 72000, 8064, 0x111d799b
29	0, 72000, 115200, 0xc051a49a	28	0, 72000, 115200, 0xc051a49a
		29	1, 72000, 8064, 0x111d799b
30	1, 76800, 8064, 0xc704dc91	30	1, 76800, 8064, 0xc704dc91
31	0, 78000, 115200, 0xc68c227b	31	0, 78000, 115200, 0xc68c227b
32	1, 81600, 8064, 0xa9f372fb	32	1, 81600, 8064, 0xa9f372fb
@@ -34,8 +34,8 @@ · 1 unmodified line
34	1, 86400, 8064, 0xa3f0ad0f	34	1, 86400, 8064, 0xa3f0ad0f
35	0, 90000, 115200, 0x09d56ecc	35	0, 90000, 115200, 0x09d56ecc
36	1, 91200, 8064, 0x958719b9	36	1, 91200, 8064, 0x958719b9
37	1, 96000, 8064, 0x9b011bf7
38	0, 96000, 115200, 0xc20e3485	37	0, 96000, 115200, 0xc20e3485
		38	1, 96000, 8064, 0x9b011bf7
39	1, 100800, 8064, 0x466d96fb	39	1, 100800, 8064, 0x466d96fb
40	0, 102000, 115200, 0xf07e2c48	40	0, 102000, 115200, 0xf07e2c48
41	1, 105600, 8064, 0x6ed4eb29	41	1, 105600, 8064, 0x6ed4eb29
@@ -43,8 +43,8 @@ · 1 unmodified line
43	1, 110400, 8064, 0x066966db	43	1, 110400, 8064, 0x066966db
44	0, 114000, 115200, 0xed65bacd	44	0, 114000, 115200, 0xed65bacd
45	1, 115200, 8064, 0xf60fe0bc	45	1, 115200, 8064, 0xf60fe0bc
46	1, 120000, 8064, 0x2c845167
47	0, 120000, 115200, 0x51a23a3b	46	0, 120000, 115200, 0x51a23a3b
		47	1, 120000, 8064, 0x2c845167
48	1, 124800, 8064, 0x7d63894f	48	1, 124800, 8064, 0x7d63894f
49	0, 126000, 115200, 0x559ddce1	49	0, 126000, 115200, 0x559ddce1
50	1, 129600, 8064, 0x0682ee36	50	1, 129600, 8064, 0x0682ee36
@@ -52,8 +52,8 @@ · 1 unmodified line
52	1, 134400, 8064, 0xcaeb7c70	52	1, 134400, 8064, 0xcaeb7c70
53	0, 138000, 115200, 0x11b2dece	53	0, 138000, 115200, 0x11b2dece
54	1, 139200, 8064, 0x93948697	54	1, 139200, 8064, 0x93948697
55	1, 144000, 8064, 0x5805f0d6
56	0, 144000, 115200, 0x851b877c	55	0, 144000, 115200, 0x851b877c
		56	1, 144000, 8064, 0x5805f0d6
57	1, 148800, 8064, 0xcfb641ff	57	1, 148800, 8064, 0xcfb641ff
58	0, 150000, 115200, 0x5f9a7c99	58	0, 150000, 115200, 0x5f9a7c99
59	1, 153600, 8064, 0xe3499bb1	59	1, 153600, 8064, 0xe3499bb1
@@ -61,8 +61,8 @@ · 1 unmodified line
61	1, 158400, 8064, 0x689fe483	61	1, 158400, 8064, 0x689fe483
62	0, 162000, 115200, 0x950b0de8	62	0, 162000, 115200, 0x950b0de8
63	1, 163200, 8064, 0x1b8f2f2d	63	1, 163200, 8064, 0x1b8f2f2d
64	1, 168000, 8064, 0x23852e71
65	0, 168000, 115200, 0x6ec4c89a	64	0, 168000, 115200, 0x6ec4c89a
		65	1, 168000, 8064, 0x23852e71
66	1, 172800, 8064, 0x15e7b298	66	1, 172800, 8064, 0x15e7b298
67	0, 174000, 115200, 0xa9234812	67	0, 174000, 115200, 0xa9234812
68	1, 177600, 8064, 0x5345a9a3	68	1, 177600, 8064, 0x5345a9a3
@@ -70,8 +70,8 @@ · 1 unmodified line
70	1, 182400, 8064, 0x257b6ecf	70	1, 182400, 8064, 0x257b6ecf
71	0, 186000, 115200, 0x2cc1a2aa	71	0, 186000, 115200, 0x2cc1a2aa
72	1, 187200, 8064, 0xaf62836c	72	1, 187200, 8064, 0xaf62836c
73	1, 192000, 8064, 0xc3a401e3
74	0, 192000, 115200, 0x5df53b71	73	0, 192000, 115200, 0x5df53b71
		74	1, 192000, 8064, 0xc3a401e3
75	1, 196800, 8064, 0x2b98fdf1	75	1, 196800, 8064, 0x2b98fdf1
76	0, 198000, 115200, 0xe1d0cb31	76	0, 198000, 115200, 0xe1d0cb31
77	1, 201600, 8064, 0x37168697	77	1, 201600, 8064, 0x37168697
@@ -79,8 +79,8 @@ · 1 unmodified line
79	1, 206400, 8064, 0x2d876c89	79	1, 206400, 8064, 0x2d876c89
80	0, 210000, 115200, 0x9342d739	80	0, 210000, 115200, 0x9342d739
81	1, 211200, 8064, 0xc40a6ada	81	1, 211200, 8064, 0xc40a6ada
82	1, 216000, 8064, 0xcca6b829
83	0, 216000, 115200, 0x586bc658	82	0, 216000, 115200, 0x586bc658
		83	1, 216000, 8064, 0xcca6b829
84	1, 220800, 8064, 0x6667550a	84	1, 220800, 8064, 0x6667550a
85	0, 222000, 115200, 0x76902834	85	0, 222000, 115200, 0x76902834
86	1, 225600, 8064, 0x99c1b5cb	86	1, 225600, 8064, 0x99c1b5cb
@@ -88,8 +88,8 @@ · 1 unmodified line
88	1, 230400, 8064, 0xc05d3ed3	88	1, 230400, 8064, 0xc05d3ed3
89	0, 234000, 115200, 0xce8c95fb	89	0, 234000, 115200, 0xce8c95fb
90	1, 235200, 8064, 0xdd641781	90	1, 235200, 8064, 0xdd641781
91	1, 240000, 8064, 0xa65d49dc
92	0, 240000, 115200, 0xdf0d3de6	91	0, 240000, 115200, 0xdf0d3de6
		92	1, 240000, 8064, 0xa65d49dc
93	1, 244800, 8064, 0x2a0d5df7	93	1, 244800, 8064, 0x2a0d5df7
94	0, 246000, 115200, 0x120db7ae	94	0, 246000, 115200, 0x120db7ae
95	1, 249600, 8064, 0xa6348438	95	1, 249600, 8064, 0xa6348438
@@ -97,8 +97,8 @@ · 1 unmodified line
97	1, 254400, 8064, 0xf2e1412d	97	1, 254400, 8064, 0xf2e1412d
98	0, 258000, 115200, 0x2498d3b6	98	0, 258000, 115200, 0x2498d3b6
99	1, 259200, 8064, 0xc41c6a7a	99	1, 259200, 8064, 0xc41c6a7a
100	1, 264000, 8064, 0x147edc3d
101	0, 264000, 115200, 0x99975ff8	100	0, 264000, 115200, 0x99975ff8
		101	1, 264000, 8064, 0x147edc3d
102	1, 268800, 8064, 0x17e3cfe7	102	1, 268800, 8064, 0x17e3cfe7
103	0, 270000, 115200, 0xbad65f9f	103	0, 270000, 115200, 0xbad65f9f
104	1, 273600, 8064, 0x01fe3969	104	1, 273600, 8064, 0x01fe3969
@@ -106,8 +106,8 @@ · 1 unmodified line
106	1, 278400, 8064, 0xc437ac11	106	1, 278400, 8064, 0xc437ac11
107	0, 282000, 115200, 0x6f8a61a0	107	0, 282000, 115200, 0x6f8a61a0
108	1, 283200, 8064, 0xbbf747c1	108	1, 283200, 8064, 0xbbf747c1
109	1, 288000, 8064, 0x2a4b88c0
110	0, 288000, 115200, 0x80c96143	109	0, 288000, 115200, 0x80c96143
		110	1, 288000, 8064, 0x2a4b88c0
111	1, 292800, 8064, 0xcd149c80	111	1, 292800, 8064, 0xcd149c80
112	0, 294000, 115200, 0x663c6198	112	0, 294000, 115200, 0x663c6198
113	1, 297600, 8064, 0xcf339dfc	113	1, 297600, 8064, 0xcf339dfc
@@ -115,8 +115,8 @@ · 1 unmodified line
115	1, 302400, 8064, 0xc81ff84b	115	1, 302400, 8064, 0xc81ff84b
116	0, 306000, 115200, 0xfe186346	116	0, 306000, 115200, 0xfe186346
117	1, 307200, 8064, 0x4d978100	117	1, 307200, 8064, 0x4d978100
118	1, 312000, 8064, 0x6da6665b
119	0, 312000, 115200, 0x844962f8	118	0, 312000, 115200, 0x844962f8
		119	1, 312000, 8064, 0x6da6665b
120	1, 316800, 8064, 0x12fa354f	120	1, 316800, 8064, 0x12fa354f
121	0, 318000, 115200, 0x917c672f	121	0, 318000, 115200, 0x917c672f
122	1, 321600, 8064, 0x6baedae6	122	1, 321600, 8064, 0x6baedae6
@@ -124,8 +124,8 @@ · 1 unmodified line
124	1, 326400, 8064, 0xddd77327	124	1, 326400, 8064, 0xddd77327
125	0, 330000, 115200, 0xace06816	125	0, 330000, 115200, 0xace06816
126	1, 331200, 8064, 0x0a31c118	126	1, 331200, 8064, 0x0a31c118
127	1, 336000, 8064, 0x7652ee6e
128	0, 336000, 115200, 0x4ef26aa2	127	0, 336000, 115200, 0x4ef26aa2
		128	1, 336000, 8064, 0x7652ee6e
129	1, 340800, 8064, 0x486a24cc	129	1, 340800, 8064, 0x486a24cc
130	0, 342000, 115200, 0xf2046bb3	130	0, 342000, 115200, 0xf2046bb3
131	1, 345600, 8064, 0xf6cf01ee	131	1, 345600, 8064, 0xf6cf01ee
@@ -133,8 +133,8 @@ · 1 unmodified line
133	1, 350400, 8064, 0x2a19e830	133	1, 350400, 8064, 0x2a19e830
134	0, 354000, 115200, 0x8a17716d	134	0, 354000, 115200, 0x8a17716d
135	1, 355200, 8064, 0xde675a31	135	1, 355200, 8064, 0xde675a31
136	1, 360000, 8064, 0xeefcc9af
137	0, 360000, 115200, 0x36127568	136	0, 360000, 115200, 0x36127568
		137	1, 360000, 8064, 0xeefcc9af
138	1, 364800, 8064, 0xaec4c989	138	1, 364800, 8064, 0xaec4c989
139	0, 366000, 115200, 0x3e877b5c	139	0, 366000, 115200, 0x3e877b5c
140	1, 369600, 8064, 0x16b73de9	140	1, 369600, 8064, 0x16b73de9
@@ -142,8 +142,8 @@ · 1 unmodified line
142	1, 374400, 8064, 0x188a582a	142	1, 374400, 8064, 0x188a582a
143	0, 378000, 115200, 0x41bc8a39	143	0, 378000, 115200, 0x41bc8a39
144	1, 379200, 8064, 0xc092e73d	144	1, 379200, 8064, 0xc092e73d
145	1, 384000, 8064, 0xf7ebca97
146	0, 384000, 115200, 0x6f839446	145	0, 384000, 115200, 0x6f839446
		146	1, 384000, 8064, 0xf7ebca97
147	1, 388800, 8064, 0x170ce07a	147	1, 388800, 8064, 0x170ce07a
148	0, 390000, 115200, 0xef74a005	148	0, 390000, 115200, 0xef74a005
149	1, 393600, 8064, 0xa0705384	149	1, 393600, 8064, 0xa0705384
@@ -151,8 +151,8 @@ · 1 unmodified line
151	1, 398400, 8064, 0xd0154a3c	151	1, 398400, 8064, 0xd0154a3c
152	0, 402000, 115200, 0x4607cf99	152	0, 402000, 115200, 0x4607cf99
153	1, 403200, 8064, 0x57c73c6c	153	1, 403200, 8064, 0x57c73c6c
154	1, 408000, 8064, 0x590c9ddb
155	0, 408000, 115200, 0x4c18e8db	154	0, 408000, 115200, 0x4c18e8db
		155	1, 408000, 8064, 0x590c9ddb
156	1, 412800, 8064, 0x2cbe552f	156	1, 412800, 8064, 0x2cbe552f
157	0, 414000, 115200, 0x04d71efb	157	0, 414000, 115200, 0x04d71efb
158	1, 417600, 8064, 0x0d286932	158	1, 417600, 8064, 0x0d286932
@@ -160,8 +160,8 @@ · 1 unmodified line
160	1, 422400, 8064, 0x5931cea3	160	1, 422400, 8064, 0x5931cea3
161	0, 426000, 115200, 0x4dd48d01	161	0, 426000, 115200, 0x4dd48d01
162	1, 427200, 8064, 0xaf0fb80d	162	1, 427200, 8064, 0xaf0fb80d
163	1, 432000, 8064, 0x7fb61e9b
164	0, 432000, 115200, 0x5fa9627f	163	0, 432000, 115200, 0x5fa9627f
		164	1, 432000, 8064, 0x7fb61e9b
165	1, 436800, 8064, 0xf17134bb	165	1, 436800, 8064, 0xf17134bb
166	0, 438000, 115200, 0x7a413f88	166	0, 438000, 115200, 0x7a413f88
167	1, 441600, 8064, 0xd647859a	167	1, 441600, 8064, 0xd647859a
@@ -169,8 +169,8 @@ · 1 unmodified line
169	1, 446400, 8064, 0x55a60921	169	1, 446400, 8064, 0x55a60921
170	0, 450000, 115200, 0x3d720e05	170	0, 450000, 115200, 0x3d720e05
171	1, 451200, 8064, 0x3811fa58	171	1, 451200, 8064, 0x3811fa58
172	1, 456000, 8064, 0xaceeccea
173	0, 456000, 115200, 0x49243fd8	172	0, 456000, 115200, 0x49243fd8
		173	1, 456000, 8064, 0xaceeccea
174	1, 460800, 8064, 0x5fcedf14	174	1, 460800, 8064, 0x5fcedf14
175	0, 462000, 115200, 0x9834b697	175	0, 462000, 115200, 0x9834b697
176	1, 465600, 8064, 0xd8c64abf	176	1, 465600, 8064, 0xd8c64abf
@@ -178,8 +178,8 @@ · 1 unmodified line
178	1, 470400, 8064, 0x79495e8d	178	1, 470400, 8064, 0x79495e8d
179	0, 474000, 115200, 0x3eaf5504	179	0, 474000, 115200, 0x3eaf5504
180	1, 475200, 8064, 0x4b7db039	180	1, 475200, 8064, 0x4b7db039
181	1, 480000, 8064, 0x7152f86d
182	0, 480000, 115200, 0x057a3701	181	0, 480000, 115200, 0x057a3701
		182	1, 480000, 8064, 0x7152f86d
183	1, 484800, 8064, 0xd92cfc1a	183	1, 484800, 8064, 0xd92cfc1a
184	0, 486000, 115200, 0x6e88f21a	184	0, 486000, 115200, 0x6e88f21a
185	1, 489600, 8064, 0x75c540ef	185	1, 489600, 8064, 0x75c540ef
@@ -187,8 +187,8 @@ · 1 unmodified line
187	1, 494400, 8064, 0x9c03ef5e	187	1, 494400, 8064, 0x9c03ef5e
188	0, 498000, 115200, 0x92212d84	188	0, 498000, 115200, 0x92212d84
189	1, 499200, 8064, 0x7b2911c8	189	1, 499200, 8064, 0x7b2911c8
190	1, 504000, 8064, 0x69d9d553
191	0, 504000, 115200, 0xf6b0a4ff	190	0, 504000, 115200, 0xf6b0a4ff
		191	1, 504000, 8064, 0x69d9d553
192	1, 508800, 8064, 0xcb45d7c5	192	1, 508800, 8064, 0xcb45d7c5
193	0, 510000, 115200, 0xb49e9b4e	193	0, 510000, 115200, 0xb49e9b4e
194	1, 513600, 8064, 0x37ec8b0a	194	1, 513600, 8064, 0x37ec8b0a
@@ -196,5 +196,5 @@ · 1 unmodified line
196	1, 518400, 8064, 0xe4354221	196	1, 518400, 8064, 0xe4354221
197	0, 522000, 115200, 0x65f3339a	197	0, 522000, 115200, 0x65f3339a
198	1, 523200, 8064, 0xc0d91cdb	198	1, 523200, 8064, 0xc0d91cdb
199	1, 528000, 8064, 0xea0be175
200	0, 528000, 115200, 0x38e40a20	199	0, 528000, 115200, 0x38e40a20
		200	1, 528000, 8064, 0xea0be175

tests/ref/fate/sierra-vmd+89−89

@@ -27,184 +27,184 @@ · 26 unmodified lines
27	0, 225000, 230400, 0x76aebdae	27	0, 225000, 230400, 0x76aebdae
28	0, 234000, 230400, 0x81357545	28	0, 234000, 230400, 0x81357545
29	0, 243000, 230400, 0x38baeebd	29	0, 243000, 230400, 0x38baeebd
30	1, 252000, 4410, 0x109d04e0
31	0, 252000, 230400, 0x1c5c44d4	30	0, 252000, 230400, 0x1c5c44d4
32	1, 261000, 4410, 0x224d244f	31	1, 252000, 4410, 0x109d04e0
33	0, 261000, 230400, 0x60e189cc	32	0, 261000, 230400, 0x60e189cc
34	1, 270000, 4410, 0xbb72413d	33	1, 261000, 4410, 0x224d244f
35	0, 270000, 230400, 0xb1f4381c	34	0, 270000, 230400, 0xb1f4381c
36	1, 279000, 4410, 0xaa5f5b86	35	1, 270000, 4410, 0xbb72413d
37	0, 279000, 230400, 0xb5048fed	36	0, 279000, 230400, 0xb5048fed
38	1, 288000, 4410, 0x94e7aea7	37	1, 279000, 4410, 0xaa5f5b86
39	0, 288000, 230400, 0xc947c30e	38	0, 288000, 230400, 0xc947c30e
40	1, 297000, 4410, 0xad497ca0	39	1, 288000, 4410, 0x94e7aea7
41	0, 297000, 230400, 0xe8e31c07	40	0, 297000, 230400, 0xe8e31c07
42	1, 306000, 4410, 0x1de10c9e	41	1, 297000, 4410, 0xad497ca0
43	0, 306000, 230400, 0x6d49dd02	42	0, 306000, 230400, 0x6d49dd02
44	1, 315000, 4410, 0x9f55efa8	43	1, 306000, 4410, 0x1de10c9e
45	0, 315000, 230400, 0x293e15d3	44	0, 315000, 230400, 0x293e15d3
46	1, 324000, 4410, 0x220a072a	45	1, 315000, 4410, 0x9f55efa8
47	0, 324000, 230400, 0x354d792e	46	0, 324000, 230400, 0x354d792e
48	1, 333000, 4410, 0xa7dafb29	47	1, 324000, 4410, 0x220a072a
49	0, 333000, 230400, 0x35468780	48	0, 333000, 230400, 0x35468780
50	1, 342000, 4410, 0xd5e29c7a	49	1, 333000, 4410, 0xa7dafb29
51	0, 342000, 230400, 0x365d3991	50	0, 342000, 230400, 0x365d3991
52	1, 351000, 4410, 0xb8465006	51	1, 342000, 4410, 0xd5e29c7a
53	0, 351000, 230400, 0xc9debef2	52	0, 351000, 230400, 0xc9debef2
54	1, 360000, 4410, 0x518669c7	53	1, 351000, 4410, 0xb8465006
55	0, 360000, 230400, 0x4c4634c2	54	0, 360000, 230400, 0x4c4634c2
56	1, 369000, 4410, 0xb5b5efca	55	1, 360000, 4410, 0x518669c7
57	0, 369000, 230400, 0x347c2dca	56	0, 369000, 230400, 0x347c2dca
58	1, 378000, 4410, 0x8600015d	57	1, 369000, 4410, 0xb5b5efca
59	0, 378000, 230400, 0x1efa0aaa	58	0, 378000, 230400, 0x1efa0aaa
60	1, 387000, 4410, 0xe2f68fe9	59	1, 378000, 4410, 0x8600015d
61	0, 387000, 230400, 0xa79a0b5a	60	0, 387000, 230400, 0xa79a0b5a
62	1, 396000, 4410, 0x8d3458d9	61	1, 387000, 4410, 0xe2f68fe9
63	0, 396000, 230400, 0xfdb2dcdb	62	0, 396000, 230400, 0xfdb2dcdb
64	1, 405000, 4410, 0xf1ff4775	63	1, 396000, 4410, 0x8d3458d9
65	0, 405000, 230400, 0x42dbea33	64	0, 405000, 230400, 0x42dbea33
66	1, 414000, 4410, 0x830f67c9	65	1, 405000, 4410, 0xf1ff4775
67	0, 414000, 230400, 0x2a207e43	66	0, 414000, 230400, 0x2a207e43
68	1, 423000, 4410, 0x110e0bc1	67	1, 414000, 4410, 0x830f67c9
69	0, 423000, 230400, 0x86573783	68	0, 423000, 230400, 0x86573783
70	1, 432000, 4410, 0x71682f47	69	1, 423000, 4410, 0x110e0bc1
71	0, 432000, 230400, 0xc3968473	70	0, 432000, 230400, 0xc3968473
72	1, 441000, 4410, 0x38119095	71	1, 432000, 4410, 0x71682f47
73	0, 441000, 230400, 0x8f62a7b4	72	0, 441000, 230400, 0x8f62a7b4
74	1, 450000, 4410, 0xd2494db6	73	1, 441000, 4410, 0x38119095
75	0, 450000, 230400, 0x5a2e3073	74	0, 450000, 230400, 0x5a2e3073
76	1, 459000, 4410, 0x8b552509	75	1, 450000, 4410, 0xd2494db6
77	0, 459000, 230400, 0xd24f5e2c	76	0, 459000, 230400, 0xd24f5e2c
78	1, 468000, 4410, 0x71e52909	77	1, 459000, 4410, 0x8b552509
79	0, 468000, 230400, 0x1df3c67d	78	0, 468000, 230400, 0x1df3c67d
80	1, 477000, 4410, 0x9f0a6f4d	79	1, 468000, 4410, 0x71e52909
81	0, 477000, 230400, 0xe4fd884d	80	0, 477000, 230400, 0xe4fd884d
82	1, 486000, 4410, 0x901302f2	81	1, 477000, 4410, 0x9f0a6f4d
83	0, 486000, 230400, 0x9a228555	82	0, 486000, 230400, 0x9a228555
84	1, 495000, 4410, 0x855d5222	83	1, 486000, 4410, 0x901302f2
85	0, 495000, 230400, 0x9eba8ed5	84	0, 495000, 230400, 0x9eba8ed5
86	1, 504000, 4410, 0x324bb2fe	85	1, 495000, 4410, 0x855d5222
87	0, 504000, 230400, 0x3d808a3d	86	0, 504000, 230400, 0x3d808a3d
88	1, 513000, 4410, 0xe85f583f	87	1, 504000, 4410, 0x324bb2fe
89	0, 513000, 230400, 0xf57e866d	88	0, 513000, 230400, 0xf57e866d
90	1, 522000, 4410, 0x2cbc67c4	89	1, 513000, 4410, 0xe85f583f
91	0, 522000, 230400, 0x85f594f5	90	0, 522000, 230400, 0x85f594f5
92	1, 531000, 4410, 0xc82e6aa1	91	1, 522000, 4410, 0x2cbc67c4
93	0, 531000, 230400, 0xb09f99dd	92	0, 531000, 230400, 0xb09f99dd
94	1, 540000, 4410, 0xb9fc423c	93	1, 531000, 4410, 0xc82e6aa1
95	0, 540000, 230400, 0x2b368475	94	0, 540000, 230400, 0x2b368475
96	1, 549000, 4410, 0x6b9b4ef9	95	1, 540000, 4410, 0xb9fc423c
97	0, 549000, 230400, 0xa2417afd	96	0, 549000, 230400, 0xa2417afd
98	1, 558000, 4410, 0x39290f10	97	1, 549000, 4410, 0x6b9b4ef9
99	0, 558000, 230400, 0x590b709d	98	0, 558000, 230400, 0x590b709d
100	1, 567000, 4410, 0xad718eb4	99	1, 558000, 4410, 0x39290f10
101	0, 567000, 230400, 0x5d617705	100	0, 567000, 230400, 0x5d617705
102	1, 576000, 4410, 0x82f463ac	101	1, 567000, 4410, 0xad718eb4
103	0, 576000, 230400, 0xabf981ad	102	0, 576000, 230400, 0xabf981ad
104	1, 585000, 4410, 0xfac87cac	103	1, 576000, 4410, 0x82f463ac
105	0, 585000, 230400, 0x5a8590cd	104	0, 585000, 230400, 0x5a8590cd
106	1, 594000, 4410, 0x9e8bcca7	105	1, 585000, 4410, 0xfac87cac
107	0, 594000, 230400, 0x1bff853d	106	0, 594000, 230400, 0x1bff853d
108	1, 603000, 4410, 0x52f79c99	107	1, 594000, 4410, 0x9e8bcca7
109	0, 603000, 230400, 0x71d08055	108	0, 603000, 230400, 0x71d08055
110	1, 612000, 4410, 0xf2d14de2	109	1, 603000, 4410, 0x52f79c99
111	0, 612000, 230400, 0x2ebd817d	110	0, 612000, 230400, 0x2ebd817d
112	1, 621000, 4410, 0x367f95e1	111	1, 612000, 4410, 0xf2d14de2
113	0, 621000, 230400, 0x6e838255	112	0, 621000, 230400, 0x6e838255
114	1, 630000, 4410, 0x8bfac293	113	1, 621000, 4410, 0x367f95e1
115	0, 630000, 230400, 0x043984cd	114	0, 630000, 230400, 0x043984cd
116	1, 639000, 4410, 0x01ea5040	115	1, 630000, 4410, 0x8bfac293
117	0, 639000, 230400, 0x7ff18495	116	0, 639000, 230400, 0x7ff18495
118	1, 648000, 4410, 0x8ff5e212	117	1, 639000, 4410, 0x01ea5040
119	0, 648000, 230400, 0xa43b8385	118	0, 648000, 230400, 0xa43b8385
120	1, 657000, 4410, 0x93f32824	119	1, 648000, 4410, 0x8ff5e212
121	0, 657000, 230400, 0x72b5825d	120	0, 657000, 230400, 0x72b5825d
122	1, 666000, 4410, 0x998f90dc	121	1, 657000, 4410, 0x93f32824
123	0, 666000, 230400, 0x3a178085	122	0, 666000, 230400, 0x3a178085
124	1, 675000, 4410, 0x65231170	123	1, 666000, 4410, 0x998f90dc
125	0, 675000, 230400, 0x67748245	124	0, 675000, 230400, 0x67748245
126	1, 684000, 4410, 0xc79039a1	125	1, 675000, 4410, 0x65231170
127	0, 684000, 230400, 0xeddf81d5	126	0, 684000, 230400, 0xeddf81d5
128	1, 693000, 4410, 0x0b0e58bd	127	1, 684000, 4410, 0xc79039a1
129	0, 693000, 230400, 0x8b088665	128	0, 693000, 230400, 0x8b088665
130	1, 702000, 4410, 0xc24ab4fa	129	1, 693000, 4410, 0x0b0e58bd
131	0, 702000, 230400, 0x6c408e15	130	0, 702000, 230400, 0x6c408e15
132	1, 711000, 4410, 0xd3796a8e	131	1, 702000, 4410, 0xc24ab4fa
133	0, 711000, 230400, 0x81f196dd	132	0, 711000, 230400, 0x81f196dd
134	1, 720000, 4410, 0xa37f8295	133	1, 711000, 4410, 0xd3796a8e
135	0, 720000, 230400, 0xab9f953d	134	0, 720000, 230400, 0xab9f953d
136	1, 729000, 4410, 0xb760fed7	135	1, 720000, 4410, 0xa37f8295
137	0, 729000, 230400, 0xa5f69795	136	0, 729000, 230400, 0xa5f69795
138	1, 738000, 4410, 0x05495a34	137	1, 729000, 4410, 0xb760fed7
139	0, 738000, 230400, 0xa772950d	138	0, 738000, 230400, 0xa772950d
140	1, 747000, 4410, 0x6f203437	139	1, 738000, 4410, 0x05495a34
141	0, 747000, 230400, 0x6a5596d5	140	0, 747000, 230400, 0x6a5596d5
142	1, 756000, 4410, 0x71299402	141	1, 747000, 4410, 0x6f203437
143	0, 756000, 230400, 0x1355958d	142	0, 756000, 230400, 0x1355958d
144	1, 765000, 4410, 0x72e7b346	143	1, 756000, 4410, 0x71299402
145	0, 765000, 230400, 0x4134981d	144	0, 765000, 230400, 0x4134981d
146	1, 774000, 4410, 0x879b0dae	145	1, 765000, 4410, 0x72e7b346
147	0, 774000, 230400, 0x8b929515	146	0, 774000, 230400, 0x8b929515
148	1, 783000, 4410, 0x041aa1bd	147	1, 774000, 4410, 0x879b0dae
149	0, 783000, 230400, 0x482f95c5	148	0, 783000, 230400, 0x482f95c5
150	1, 792000, 4410, 0x18a962e6	149	1, 783000, 4410, 0x041aa1bd
151	0, 792000, 230400, 0x7a9795d5	150	0, 792000, 230400, 0x7a9795d5
152	1, 801000, 4410, 0x21d20539	151	1, 792000, 4410, 0x18a962e6
153	0, 801000, 230400, 0x21c29abd	152	0, 801000, 230400, 0x21c29abd
154	1, 810000, 4410, 0x8f449267	153	1, 801000, 4410, 0x21d20539
155	0, 810000, 230400, 0x9ae6a475	154	0, 810000, 230400, 0x9ae6a475
156	1, 819000, 4410, 0xecdc01d6	155	1, 810000, 4410, 0x8f449267
157	0, 819000, 230400, 0x3734aee5	156	0, 819000, 230400, 0x3734aee5
158	1, 828000, 4410, 0x458abd5a	157	1, 819000, 4410, 0xecdc01d6
159	0, 828000, 230400, 0xa0a1b365	158	0, 828000, 230400, 0xa0a1b365
160	1, 837000, 4410, 0xa070ea63	159	1, 828000, 4410, 0x458abd5a
161	0, 837000, 230400, 0x2dcab1c5	160	0, 837000, 230400, 0x2dcab1c5
162	1, 846000, 4410, 0xc25b26ce	161	1, 837000, 4410, 0xa070ea63
163	0, 846000, 230400, 0x9c8b6c44	162	0, 846000, 230400, 0x9c8b6c44
164	1, 855000, 4410, 0x4d9237ca	163	1, 846000, 4410, 0xc25b26ce
165	0, 855000, 230400, 0x5da75feb	164	0, 855000, 230400, 0x5da75feb
166	1, 864000, 4410, 0x748e1801	165	1, 855000, 4410, 0x4d9237ca
167	0, 864000, 230400, 0x4d02f8e3	166	0, 864000, 230400, 0x4d02f8e3
168	1, 873000, 4410, 0xc96b69e6	167	1, 864000, 4410, 0x748e1801
169	0, 873000, 230400, 0x66824f3a	168	0, 873000, 230400, 0x66824f3a
170	1, 882000, 4410, 0x6663186c	169	1, 873000, 4410, 0xc96b69e6
171	0, 882000, 230400, 0x0c9257e2	170	0, 882000, 230400, 0x0c9257e2
172	1, 891000, 4410, 0x7f6d3081	171	1, 882000, 4410, 0x6663186c
173	0, 891000, 230400, 0xb2927092	172	0, 891000, 230400, 0xb2927092
174	1, 900000, 4410, 0x1a0343b5	173	1, 891000, 4410, 0x7f6d3081
175	0, 900000, 230400, 0xb5dc6e9a	174	0, 900000, 230400, 0xb5dc6e9a
176	1, 909000, 4410, 0xc48e338c	175	1, 900000, 4410, 0x1a0343b5
177	0, 909000, 230400, 0x6e567bc6	176	0, 909000, 230400, 0x6e567bc6
178	1, 918000, 4410, 0x26fc03c8	177	1, 909000, 4410, 0xc48e338c
179	0, 918000, 230400, 0xbf9e0f7a	178	0, 918000, 230400, 0xbf9e0f7a
180	1, 927000, 4410, 0x69be7e2d	179	1, 918000, 4410, 0x26fc03c8
181	0, 927000, 230400, 0xb16f684a	180	0, 927000, 230400, 0xb16f684a
182	1, 936000, 4410, 0x69a74da1	181	1, 927000, 4410, 0x69be7e2d
183	0, 936000, 230400, 0xf9e55e81	182	0, 936000, 230400, 0xf9e55e81
184	1, 945000, 4410, 0x85bd2ab3	183	1, 936000, 4410, 0x69a74da1
185	0, 945000, 230400, 0xd8d0bcba	184	0, 945000, 230400, 0xd8d0bcba
186	1, 954000, 4410, 0xeff05426	185	1, 945000, 4410, 0x85bd2ab3
187	0, 954000, 230400, 0x44720ac0	186	0, 954000, 230400, 0x44720ac0
188	1, 963000, 4410, 0x292829e0	187	1, 954000, 4410, 0xeff05426
189	0, 963000, 230400, 0x7d4c2058	188	0, 963000, 230400, 0x7d4c2058
190	1, 972000, 4410, 0x8f741798	189	1, 963000, 4410, 0x292829e0
191	0, 972000, 230400, 0xb0973eb9	190	0, 972000, 230400, 0xb0973eb9
192	1, 981000, 4410, 0x6b9337e9	191	1, 972000, 4410, 0x8f741798
193	0, 981000, 230400, 0x405a13ce	192	0, 981000, 230400, 0x405a13ce
194	1, 990000, 4410, 0xe4e1703f	193	1, 981000, 4410, 0x6b9337e9
195	0, 990000, 230400, 0x6422f00a	194	0, 990000, 230400, 0x6422f00a
196	1, 999000, 4410, 0x043d6c35	195	1, 990000, 4410, 0xe4e1703f
197	0, 999000, 230400, 0x924b6c1e	196	0, 999000, 230400, 0x924b6c1e
198	1, 1008000, 4410, 0x3a8988e7	197	1, 999000, 4410, 0x043d6c35
199	0, 1008000, 230400, 0xcf7809c0	198	0, 1008000, 230400, 0xcf7809c0
200	1, 1017000, 4410, 0x1fa7d2a9	199	1, 1008000, 4410, 0x3a8988e7
201	0, 1017000, 230400, 0x883a3863	200	0, 1017000, 230400, 0x883a3863
202	1, 1026000, 4410, 0xe28799e3	201	1, 1017000, 4410, 0x1fa7d2a9
203	0, 1026000, 230400, 0x6adc9e03	202	0, 1026000, 230400, 0x6adc9e03
204	1, 1035000, 4410, 0xc2df4470	203	1, 1026000, 4410, 0xe28799e3
205	0, 1035000, 230400, 0x4f5ab7a8	204	0, 1035000, 230400, 0x4f5ab7a8
206	1, 1044000, 4410, 0x694d0cf5	205	1, 1035000, 4410, 0xc2df4470
207	0, 1044000, 230400, 0xdc0aab94	206	0, 1044000, 230400, 0xdc0aab94
		207	1, 1044000, 4410, 0x694d0cf5
208	1, 1053000, 4410, 0x5aac2dcf	208	1, 1053000, 4410, 0x5aac2dcf
209	1, 1062000, 4410, 0x259fa2db	209	1, 1062000, 4410, 0x259fa2db
210	1, 1071000, 4410, 0xd16d6803	210	1, 1071000, 4410, 0xd16d6803

tests/ref/fate/siff+3−3

@@ -1,5 +1,5 @@
1	1, 0, 44100, 0xd0a49e09
2	0, 0, 230400, 0x3bd1d731	1	0, 0, 230400, 0x3bd1d731
		2	1, 0, 44100, 0xd0a49e09
3	0, 7500, 230400, 0x9d0774c3	3	0, 7500, 230400, 0x9d0774c3
4	0, 15000, 230400, 0xa0faafe2	4	0, 15000, 230400, 0xa0faafe2
5	0, 22500, 230400, 0x38325309	5	0, 22500, 230400, 0x38325309
@@ -11,8 +11,8 @@ · 5 unmodified lines
11	0, 67500, 230400, 0x07178dd9	11	0, 67500, 230400, 0x07178dd9
12	0, 75000, 230400, 0xf52b8db4	12	0, 75000, 230400, 0xf52b8db4
13	0, 82500, 230400, 0x2b70c1dc	13	0, 82500, 230400, 0x2b70c1dc
14	1, 90000, 44100, 0xf151af4d
15	0, 90000, 230400, 0x8157a6e9	14	0, 90000, 230400, 0x8157a6e9
		15	1, 90000, 44100, 0xf151af4d
16	0, 97500, 230400, 0xd4a3c357	16	0, 97500, 230400, 0xd4a3c357
17	0, 105000, 230400, 0x703861bb	17	0, 105000, 230400, 0x703861bb
18	0, 112500, 230400, 0xa13cf75e	18	0, 112500, 230400, 0xa13cf75e
@@ -24,8 +24,8 @@ · 5 unmodified lines
24	0, 157500, 230400, 0x22050962	24	0, 157500, 230400, 0x22050962
25	0, 165000, 230400, 0x0f5c8a0d	25	0, 165000, 230400, 0x0f5c8a0d
26	0, 172500, 230400, 0x3475df44	26	0, 172500, 230400, 0x3475df44
27	1, 180000, 44100, 0xecd3cd08
28	0, 180000, 230400, 0x65354e06	27	0, 180000, 230400, 0x65354e06
		28	1, 180000, 44100, 0xecd3cd08
29	0, 187500, 230400, 0xb9a01978	29	0, 187500, 230400, 0xb9a01978
30	0, 195000, 230400, 0x15207ee1	30	0, 195000, 230400, 0x15207ee1
31	0, 202500, 230400, 0x3b214f0b	31	0, 202500, 230400, 0x3b214f0b

tests/ref/fate/tiertex-seq+72−72

@@ -1,147 +1,147 @@
1	1, 0, 1764, 0x00000000
2	0, 0, 98304, 0x2e5db4a4	1	0, 0, 98304, 0x2e5db4a4
3	1, 3600, 1764, 0x80a253d9	2	1, 0, 1764, 0x00000000
4	0, 3600, 98304, 0xb20c19d0	3	0, 3600, 98304, 0xb20c19d0
5	1, 7200, 1764, 0x95a16721	4	1, 3600, 1764, 0x80a253d9
6	0, 7200, 98304, 0xb20c19d0	5	0, 7200, 98304, 0xb20c19d0
7	1, 10800, 1764, 0x0f0d4cb6	6	1, 7200, 1764, 0x95a16721
8	0, 10800, 98304, 0xb20c19d0	7	0, 10800, 98304, 0xb20c19d0
9	1, 14400, 1764, 0x75026779	8	1, 10800, 1764, 0x0f0d4cb6
10	0, 14400, 98304, 0x6b8538c0	9	0, 14400, 98304, 0x6b8538c0
11	1, 18000, 1764, 0xb4356e37	10	1, 14400, 1764, 0x75026779
12	0, 18000, 98304, 0x6b8538c0	11	0, 18000, 98304, 0x6b8538c0
13	1, 21600, 1764, 0xfafa64cb	12	1, 18000, 1764, 0xb4356e37
14	0, 21600, 98304, 0x6b8538c0	13	0, 21600, 98304, 0x6b8538c0
15	1, 25200, 1764, 0xe8fd7970	14	1, 21600, 1764, 0xfafa64cb
16	0, 25200, 98304, 0x172207e3	15	0, 25200, 98304, 0x172207e3
17	1, 28800, 1764, 0x666879b7	16	1, 25200, 1764, 0xe8fd7970
18	0, 28800, 98304, 0x172207e3	17	0, 28800, 98304, 0x172207e3
19	1, 32400, 1764, 0xf2cd7770	18	1, 28800, 1764, 0x666879b7
20	0, 32400, 98304, 0x172207e3	19	0, 32400, 98304, 0x172207e3
21	1, 36000, 1764, 0x54317a1c	20	1, 32400, 1764, 0xf2cd7770
22	0, 36000, 98304, 0x172207e3	21	0, 36000, 98304, 0x172207e3
23	1, 39600, 1764, 0x9c396930	22	1, 36000, 1764, 0x54317a1c
24	0, 39600, 98304, 0x63fb7dc1	23	0, 39600, 98304, 0x63fb7dc1
25	1, 43200, 1764, 0x87115ec4	24	1, 39600, 1764, 0x9c396930
26	0, 43200, 98304, 0x63fb7dc1	25	0, 43200, 98304, 0x63fb7dc1
27	1, 46800, 1764, 0x0c9b69b6	26	1, 43200, 1764, 0x87115ec4
28	0, 46800, 98304, 0x63fb7dc1	27	0, 46800, 98304, 0x63fb7dc1
29	1, 50400, 1764, 0x8c3a758a	28	1, 46800, 1764, 0x0c9b69b6
30	0, 50400, 98304, 0x37cf1601	29	0, 50400, 98304, 0x37cf1601
31	1, 54000, 1764, 0x605d776a	30	1, 50400, 1764, 0x8c3a758a
32	0, 54000, 98304, 0x37cf1601	31	0, 54000, 98304, 0x37cf1601
33	1, 57600, 1764, 0x0556852d	32	1, 54000, 1764, 0x605d776a
34	0, 57600, 98304, 0x37cf1601	33	0, 57600, 98304, 0x37cf1601
35	1, 61200, 1764, 0x7d4363f8	34	1, 57600, 1764, 0x0556852d
36	0, 61200, 98304, 0x37cf1601	35	0, 61200, 98304, 0x37cf1601
37	1, 64800, 1764, 0xc5cd75d0	36	1, 61200, 1764, 0x7d4363f8
38	0, 64800, 98304, 0x82941990	37	0, 64800, 98304, 0x82941990
39	1, 68400, 1764, 0x3ff3646d	38	1, 64800, 1764, 0xc5cd75d0
40	0, 68400, 98304, 0x82941990	39	0, 68400, 98304, 0x82941990
41	1, 72000, 1764, 0x10136d25	40	1, 68400, 1764, 0x3ff3646d
42	0, 72000, 98304, 0x82941990	41	0, 72000, 98304, 0x82941990
43	1, 75600, 1764, 0xeb1a6cd0	42	1, 72000, 1764, 0x10136d25
44	0, 75600, 98304, 0x82941990	43	0, 75600, 98304, 0x82941990
45	1, 79200, 1764, 0xef937ed1	44	1, 75600, 1764, 0xeb1a6cd0
46	0, 79200, 98304, 0xe0a5309e	45	0, 79200, 98304, 0xe0a5309e
47	1, 82800, 1764, 0x2d2b6f79	46	1, 79200, 1764, 0xef937ed1
48	0, 82800, 98304, 0xe0a5309e	47	0, 82800, 98304, 0xe0a5309e
49	1, 86400, 1764, 0x6f457231	48	1, 82800, 1764, 0x2d2b6f79
50	0, 86400, 98304, 0xe0a5309e	49	0, 86400, 98304, 0xe0a5309e
51	1, 90000, 1764, 0x56267c9d	50	1, 86400, 1764, 0x6f457231
52	0, 90000, 98304, 0x164cb67d	51	0, 90000, 98304, 0x164cb67d
53	1, 93600, 1764, 0xd49e79c8	52	1, 90000, 1764, 0x56267c9d
54	0, 93600, 98304, 0x164cb67d	53	0, 93600, 98304, 0x164cb67d
55	1, 97200, 1764, 0xc726703d	54	1, 93600, 1764, 0xd49e79c8
56	0, 97200, 98304, 0x164cb67d	55	0, 97200, 98304, 0x164cb67d
57	1, 100800, 1764, 0x2abf8074	56	1, 97200, 1764, 0xc726703d
58	0, 100800, 98304, 0x164cb67d	57	0, 100800, 98304, 0x164cb67d
59	1, 104400, 1764, 0xb50c556d	58	1, 100800, 1764, 0x2abf8074
60	0, 104400, 98304, 0xed2189f8	59	0, 104400, 98304, 0xed2189f8
61	1, 108000, 1764, 0xc1f2523c	60	1, 104400, 1764, 0xb50c556d
62	0, 108000, 98304, 0xed2189f8	61	0, 108000, 98304, 0xed2189f8
63	1, 111600, 1764, 0x850a6f93	62	1, 108000, 1764, 0xc1f2523c
64	0, 111600, 98304, 0xed2189f8	63	0, 111600, 98304, 0xed2189f8
65	1, 115200, 1764, 0x8da76c31	64	1, 111600, 1764, 0x850a6f93
66	0, 115200, 98304, 0x7215e529	65	0, 115200, 98304, 0x7215e529
67	1, 118800, 1764, 0xfcccdf13	66	1, 115200, 1764, 0x8da76c31
68	0, 118800, 98304, 0x7215e529	67	0, 118800, 98304, 0x7215e529
69	1, 122400, 1764, 0x00000000	68	1, 118800, 1764, 0xfcccdf13
70	0, 122400, 98304, 0x7215e529	69	0, 122400, 98304, 0x7215e529
71	1, 126000, 1764, 0x00000000	70	1, 122400, 1764, 0x00000000
72	0, 126000, 98304, 0x7215e529	71	0, 126000, 98304, 0x7215e529
73	1, 129600, 1764, 0x00000000	72	1, 126000, 1764, 0x00000000
74	0, 129600, 98304, 0x170c783b	73	0, 129600, 98304, 0x170c783b
75	1, 133200, 1764, 0x00000000	74	1, 129600, 1764, 0x00000000
76	0, 133200, 98304, 0x170c783b	75	0, 133200, 98304, 0x170c783b
77	1, 136800, 1764, 0x00000000	76	1, 133200, 1764, 0x00000000
78	0, 136800, 98304, 0x170c783b	77	0, 136800, 98304, 0x170c783b
79	1, 140400, 1764, 0x00000000	78	1, 136800, 1764, 0x00000000
80	0, 140400, 98304, 0xf6bd74c7	79	0, 140400, 98304, 0xf6bd74c7
81	1, 144000, 1764, 0x00000000	80	1, 140400, 1764, 0x00000000
82	0, 144000, 98304, 0xf6bd74c7	81	0, 144000, 98304, 0xf6bd74c7
83	1, 147600, 1764, 0x00000000	82	1, 144000, 1764, 0x00000000
84	0, 147600, 98304, 0xf6bd74c7	83	0, 147600, 98304, 0xf6bd74c7
85	1, 151200, 1764, 0x00000000	84	1, 147600, 1764, 0x00000000
86	0, 151200, 98304, 0xf6bd74c7	85	0, 151200, 98304, 0xf6bd74c7
87	1, 154800, 1764, 0x00000000	86	1, 151200, 1764, 0x00000000
88	0, 154800, 98304, 0x1efd38c4	87	0, 154800, 98304, 0x1efd38c4
89	1, 158400, 1764, 0x00000000	88	1, 154800, 1764, 0x00000000
90	0, 158400, 98304, 0x1efd38c4	89	0, 158400, 98304, 0x1efd38c4
91	1, 162000, 1764, 0x00000000	90	1, 158400, 1764, 0x00000000
92	0, 162000, 98304, 0x1efd38c4	91	0, 162000, 98304, 0x1efd38c4
93	1, 165600, 1764, 0x00000000	92	1, 162000, 1764, 0x00000000
94	0, 165600, 98304, 0x1efd38c4	93	0, 165600, 98304, 0x1efd38c4
95	1, 169200, 1764, 0x00000000	94	1, 165600, 1764, 0x00000000
96	0, 169200, 98304, 0x29c26bba	95	0, 169200, 98304, 0x29c26bba
97	1, 172800, 1764, 0x00000000	96	1, 169200, 1764, 0x00000000
98	0, 172800, 98304, 0x29c26bba	97	0, 172800, 98304, 0x29c26bba
99	1, 176400, 1764, 0x00000000	98	1, 172800, 1764, 0x00000000
100	0, 176400, 98304, 0x29c26bba	99	0, 176400, 98304, 0x29c26bba
101	1, 180000, 1764, 0x00000000	100	1, 176400, 1764, 0x00000000
102	0, 180000, 98304, 0x880a6313	101	0, 180000, 98304, 0x880a6313
103	1, 183600, 1764, 0x00000000	102	1, 180000, 1764, 0x00000000
104	0, 183600, 98304, 0x880a6313	103	0, 183600, 98304, 0x880a6313
105	1, 187200, 1764, 0x00000000	104	1, 183600, 1764, 0x00000000
106	0, 187200, 98304, 0x880a6313	105	0, 187200, 98304, 0x880a6313
107	1, 190800, 1764, 0x00000000	106	1, 187200, 1764, 0x00000000
108	0, 190800, 98304, 0x880a6313	107	0, 190800, 98304, 0x880a6313
109	1, 194400, 1764, 0x00000000	108	1, 190800, 1764, 0x00000000
110	0, 194400, 98304, 0x73f5bb00	109	0, 194400, 98304, 0x73f5bb00
111	1, 198000, 1764, 0x00000000	110	1, 194400, 1764, 0x00000000
112	0, 198000, 98304, 0x73f5bb00	111	0, 198000, 98304, 0x73f5bb00
113	1, 201600, 1764, 0x00000000	112	1, 198000, 1764, 0x00000000
114	0, 201600, 98304, 0x73f5bb00	113	0, 201600, 98304, 0x73f5bb00
115	1, 205200, 1764, 0x00000000	114	1, 201600, 1764, 0x00000000
116	0, 205200, 98304, 0xc85b19ec	115	0, 205200, 98304, 0xc85b19ec
117	1, 208800, 1764, 0x00000000	116	1, 205200, 1764, 0x00000000
118	0, 208800, 98304, 0xc85b19ec	117	0, 208800, 98304, 0xc85b19ec
119	1, 212400, 1764, 0x00000000	118	1, 208800, 1764, 0x00000000
120	0, 212400, 98304, 0xc85b19ec	119	0, 212400, 98304, 0xc85b19ec
121	1, 216000, 1764, 0x00000000	120	1, 212400, 1764, 0x00000000
122	0, 216000, 98304, 0xc85b19ec	121	0, 216000, 98304, 0xc85b19ec
123	1, 219600, 1764, 0x00000000	122	1, 216000, 1764, 0x00000000
124	0, 219600, 98304, 0x00000000	123	0, 219600, 98304, 0x00000000
125	1, 223200, 1764, 0x00000000	124	1, 219600, 1764, 0x00000000
126	0, 223200, 98304, 0x00000000	125	0, 223200, 98304, 0x00000000
127	1, 226800, 1764, 0x00000000	126	1, 223200, 1764, 0x00000000
128	0, 226800, 98304, 0x00000000	127	0, 226800, 98304, 0x00000000
129	1, 230400, 1764, 0x00000000	128	1, 226800, 1764, 0x00000000
130	0, 230400, 98304, 0x00000000	129	0, 230400, 98304, 0x00000000
131	1, 234000, 1764, 0x00000000	130	1, 230400, 1764, 0x00000000
132	0, 234000, 98304, 0x00000000	131	0, 234000, 98304, 0x00000000
133	1, 237600, 1764, 0x00000000	132	1, 234000, 1764, 0x00000000
134	0, 237600, 98304, 0x00000000	133	0, 237600, 98304, 0x00000000
135	1, 241200, 1764, 0x00000000	134	1, 237600, 1764, 0x00000000
136	0, 241200, 98304, 0x00000000	135	0, 241200, 98304, 0x00000000
137	1, 244800, 1764, 0x00000000	136	1, 241200, 1764, 0x00000000
138	0, 244800, 98304, 0x00000000	137	0, 244800, 98304, 0x00000000
139	1, 248400, 1764, 0x00000000	138	1, 244800, 1764, 0x00000000
140	0, 248400, 98304, 0x00000000	139	0, 248400, 98304, 0x00000000
141	1, 252000, 1764, 0x00000000	140	1, 248400, 1764, 0x00000000
142	0, 252000, 98304, 0x00000000	141	0, 252000, 98304, 0x00000000
143	1, 255600, 1764, 0x00000000	142	1, 252000, 1764, 0x00000000
144	0, 255600, 98304, 0x00000000	143	0, 255600, 98304, 0x00000000
		144	1, 255600, 1764, 0x00000000
145	1, 259200, 1764, 0x00000000	145	1, 259200, 1764, 0x00000000
146	1, 262800, 1764, 0x00000000	146	1, 262800, 1764, 0x00000000
147	1, 266400, 1764, 0x00000000	147	1, 266400, 1764, 0x00000000

tests/ref/fate/truemotion1-15+1−1

@@ -1,5 +1,5 @@
1	1, 0, 10832, 0xe1a811fa
2	0, 0, 161280, 0x7041748d	1	0, 0, 161280, 0x7041748d
		2	1, 0, 10832, 0xe1a811fa
3	1, 5527, 10832, 0xb47841f9	3	1, 5527, 10832, 0xb47841f9
4	0, 6000, 161280, 0x3cc4dfb5	4	0, 6000, 161280, 0x3cc4dfb5
5	1, 11053, 10832, 0x839eedf1	5	1, 11053, 10832, 0x839eedf1

tests/ref/fate/truemotion1-24+1−1

@@ -1,5 +1,5 @@
1	1, 0, 10832, 0x1597b4c8
2	0, 0, 69120, 0x68beb30f	1	0, 0, 69120, 0x68beb30f
		2	1, 0, 10832, 0x1597b4c8
3	1, 5527, 10832, 0xf9479f8b	3	1, 5527, 10832, 0xf9479f8b
4	0, 6000, 69120, 0x3976f5cf	4	0, 6000, 69120, 0x3976f5cf
5	1, 11053, 10832, 0x8db50e74	5	1, 11053, 10832, 0x8db50e74

tests/ref/fate/tscc-15bit+15−15

@@ -1,5 +1,5 @@
1	1, 0, 22050, 0x1740aaec
2	0, 0, 657600, 0xaf456809	1	0, 0, 657600, 0xaf456809
		2	1, 0, 22050, 0x1740aaec
3	0, 6000, 657600, 0xaf456809	3	0, 6000, 657600, 0xaf456809
4	0, 12000, 657600, 0xaf456809	4	0, 12000, 657600, 0xaf456809
5	0, 18000, 657600, 0x2dbe6889	5	0, 18000, 657600, 0x2dbe6889
@@ -14,8 +14,8 @@ · 8 unmodified lines
14	0, 72000, 657600, 0x2dbe6889	14	0, 72000, 657600, 0x2dbe6889
15	0, 78000, 657600, 0x2dbe6889	15	0, 78000, 657600, 0x2dbe6889
16	0, 84000, 657600, 0x2dbe6889	16	0, 84000, 657600, 0x2dbe6889
17	1, 90000, 22050, 0x75ed6086
18	0, 90000, 657600, 0x2dbe6889	17	0, 90000, 657600, 0x2dbe6889
		18	1, 90000, 22050, 0x75ed6086
19	0, 96000, 657600, 0x2dbe6889	19	0, 96000, 657600, 0x2dbe6889
20	0, 102000, 657600, 0x2dbe6889	20	0, 102000, 657600, 0x2dbe6889
21	0, 108000, 657600, 0x2dbe6889	21	0, 108000, 657600, 0x2dbe6889
@@ -30,8 +30,8 @@ · 8 unmodified lines
30	0, 162000, 657600, 0x64cb6889	30	0, 162000, 657600, 0x64cb6889
31	0, 168000, 657600, 0x64cb6889	31	0, 168000, 657600, 0x64cb6889
32	0, 174000, 657600, 0x64cb6889	32	0, 174000, 657600, 0x64cb6889
33	1, 180000, 22050, 0xca52a4e9
34	0, 180000, 657600, 0x42036b71	33	0, 180000, 657600, 0x42036b71
		34	1, 180000, 22050, 0xca52a4e9
35	0, 186000, 657600, 0x42036b71	35	0, 186000, 657600, 0x42036b71
36	0, 192000, 657600, 0x42036b71	36	0, 192000, 657600, 0x42036b71
37	0, 198000, 657600, 0xc40a6889	37	0, 198000, 657600, 0xc40a6889
@@ -46,8 +46,8 @@ · 8 unmodified lines
46	0, 252000, 657600, 0x22d10de0	46	0, 252000, 657600, 0x22d10de0
47	0, 258000, 657600, 0xa75f0d60	47	0, 258000, 657600, 0xa75f0d60
48	0, 264000, 657600, 0x7a440be0	48	0, 264000, 657600, 0x7a440be0
49	1, 270000, 22050, 0xb306d419
50	0, 270000, 657600, 0x40095d50	49	0, 270000, 657600, 0x40095d50
		50	1, 270000, 22050, 0xb306d419
51	0, 276000, 657600, 0x40095d50	51	0, 276000, 657600, 0x40095d50
52	0, 282000, 657600, 0x64766320	52	0, 282000, 657600, 0x64766320
53	0, 288000, 657600, 0x64766320	53	0, 288000, 657600, 0x64766320
@@ -62,8 +62,8 @@ · 8 unmodified lines
62	0, 342000, 657600, 0xf51adc49	62	0, 342000, 657600, 0xf51adc49
63	0, 348000, 657600, 0xf51adc49	63	0, 348000, 657600, 0xf51adc49
64	0, 354000, 657600, 0xf51adc49	64	0, 354000, 657600, 0xf51adc49
65	1, 360000, 22050, 0x8cbb9625
66	0, 360000, 657600, 0xdd47af59	65	0, 360000, 657600, 0xdd47af59
		66	1, 360000, 22050, 0x8cbb9625
67	0, 366000, 657600, 0xdd47af59	67	0, 366000, 657600, 0xdd47af59
68	0, 372000, 657600, 0xffa8acf1	68	0, 372000, 657600, 0xffa8acf1
69	0, 378000, 657600, 0x5994b059	69	0, 378000, 657600, 0x5994b059
@@ -78,8 +78,8 @@ · 8 unmodified lines
78	0, 432000, 657600, 0xbe37b549	78	0, 432000, 657600, 0xbe37b549
79	0, 438000, 657600, 0xbe37b549	79	0, 438000, 657600, 0xbe37b549
80	0, 444000, 657600, 0x1d395bf9	80	0, 444000, 657600, 0x1d395bf9
81	1, 450000, 22050, 0x34a11f66
82	0, 450000, 657600, 0x1d395bf9	81	0, 450000, 657600, 0x1d395bf9
		82	1, 450000, 22050, 0x34a11f66
83	0, 456000, 657600, 0x1d395bf9	83	0, 456000, 657600, 0x1d395bf9
84	0, 462000, 657600, 0x1d395bf9	84	0, 462000, 657600, 0x1d395bf9
85	0, 468000, 657600, 0x2ec36f37	85	0, 468000, 657600, 0x2ec36f37
@@ -94,8 +94,8 @@ · 8 unmodified lines
94	0, 522000, 657600, 0x70064801	94	0, 522000, 657600, 0x70064801
95	0, 528000, 657600, 0x80d54519	95	0, 528000, 657600, 0x80d54519
96	0, 534000, 657600, 0xe8c942b1	96	0, 534000, 657600, 0xe8c942b1
97	1, 540000, 22050, 0x1ae81230
98	0, 540000, 657600, 0x830d8c24	97	0, 540000, 657600, 0x830d8c24
		98	1, 540000, 22050, 0x1ae81230
99	0, 546000, 657600, 0x830d8c24	99	0, 546000, 657600, 0x830d8c24
100	0, 552000, 657600, 0x830d8c24	100	0, 552000, 657600, 0x830d8c24
101	0, 558000, 657600, 0xf3c4707c	101	0, 558000, 657600, 0xf3c4707c
@@ -110,8 +110,8 @@ · 8 unmodified lines
110	0, 612000, 657600, 0x221ceecf	110	0, 612000, 657600, 0x221ceecf
111	0, 618000, 657600, 0x221ceecf	111	0, 618000, 657600, 0x221ceecf
112	0, 624000, 657600, 0x221ceecf	112	0, 624000, 657600, 0x221ceecf
113	1, 630000, 22050, 0x1217eeba
114	0, 630000, 657600, 0x221ceecf	113	0, 630000, 657600, 0x221ceecf
		114	1, 630000, 22050, 0x1217eeba
115	0, 636000, 657600, 0x221ceecf	115	0, 636000, 657600, 0x221ceecf
116	0, 642000, 657600, 0x221ceecf	116	0, 642000, 657600, 0x221ceecf
117	0, 648000, 657600, 0x3bf6f39f	117	0, 648000, 657600, 0x3bf6f39f
@@ -126,8 +126,8 @@ · 8 unmodified lines
126	0, 702000, 657600, 0x41f6218d	126	0, 702000, 657600, 0x41f6218d
127	0, 708000, 657600, 0x41f6218d	127	0, 708000, 657600, 0x41f6218d
128	0, 714000, 657600, 0x41f6218d	128	0, 714000, 657600, 0x41f6218d
129	1, 720000, 22050, 0x50e70baa
130	0, 720000, 657600, 0xff43ec36	129	0, 720000, 657600, 0xff43ec36
		130	1, 720000, 22050, 0x50e70baa
131	0, 726000, 657600, 0x0b10eb16	131	0, 726000, 657600, 0x0b10eb16
132	0, 732000, 657600, 0x0b10eb16	132	0, 732000, 657600, 0x0b10eb16
133	0, 738000, 657600, 0xbdf41aa5	133	0, 738000, 657600, 0xbdf41aa5
@@ -142,8 +142,8 @@ · 8 unmodified lines
142	0, 792000, 657600, 0x3d4ccf06	142	0, 792000, 657600, 0x3d4ccf06
143	0, 798000, 657600, 0x0897d1de	143	0, 798000, 657600, 0x0897d1de
144	0, 804000, 657600, 0x0897d1de	144	0, 804000, 657600, 0x0897d1de
145	1, 810000, 22050, 0xb19e89c0
146	0, 810000, 657600, 0x3e27e01e	145	0, 810000, 657600, 0x3e27e01e
		146	1, 810000, 22050, 0xb19e89c0
147	0, 816000, 657600, 0x3e27e01e	147	0, 816000, 657600, 0x3e27e01e
148	0, 822000, 657600, 0x3e27e01e	148	0, 822000, 657600, 0x3e27e01e
149	0, 828000, 657600, 0x3e27e01e	149	0, 828000, 657600, 0x3e27e01e
@@ -158,8 +158,8 @@ · 8 unmodified lines
158	0, 882000, 657600, 0xe9967a40	158	0, 882000, 657600, 0xe9967a40
159	0, 888000, 657600, 0xe9967a40	159	0, 888000, 657600, 0xe9967a40
160	0, 894000, 657600, 0xe9967a40	160	0, 894000, 657600, 0xe9967a40
161	1, 900000, 22050, 0x78526696
162	0, 900000, 657600, 0x726cb6b8	161	0, 900000, 657600, 0x726cb6b8
		162	1, 900000, 22050, 0x78526696
163	0, 906000, 657600, 0x2960b6e8	163	0, 906000, 657600, 0x2960b6e8
164	0, 912000, 657600, 0x2960b6e8	164	0, 912000, 657600, 0x2960b6e8
165	0, 918000, 657600, 0x1637d6c8	165	0, 918000, 657600, 0x1637d6c8
@@ -174,8 +174,8 @@ · 8 unmodified lines
174	0, 972000, 657600, 0xdfa0d6c8	174	0, 972000, 657600, 0xdfa0d6c8
175	0, 978000, 657600, 0xdfa0d6c8	175	0, 978000, 657600, 0xdfa0d6c8
176	0, 984000, 657600, 0xdfa0d6c8	176	0, 984000, 657600, 0xdfa0d6c8
177	1, 990000, 22050, 0x48e3bb21
178	0, 990000, 657600, 0xdfa0d6c8	177	0, 990000, 657600, 0xdfa0d6c8
		178	1, 990000, 22050, 0x48e3bb21
179	0, 996000, 657600, 0xdfa0d6c8	179	0, 996000, 657600, 0xdfa0d6c8
180	0, 1002000, 657600, 0xdfa0d6c8	180	0, 1002000, 657600, 0xdfa0d6c8
181	0, 1008000, 657600, 0xdfa0d6c8	181	0, 1008000, 657600, 0xdfa0d6c8
@@ -190,8 +190,8 @@ · 8 unmodified lines
190	0, 1062000, 657600, 0x85e87a68	190	0, 1062000, 657600, 0x85e87a68
191	0, 1068000, 657600, 0x85e87a68	191	0, 1068000, 657600, 0x85e87a68
192	0, 1074000, 657600, 0x85e87a68	192	0, 1074000, 657600, 0x85e87a68
193	1, 1080000, 22050, 0xbc32204a
194	0, 1080000, 657600, 0xb0a141a8	193	0, 1080000, 657600, 0xb0a141a8
		194	1, 1080000, 22050, 0xbc32204a
195	0, 1086000, 657600, 0xb0a141a8	195	0, 1086000, 657600, 0xb0a141a8
196	0, 1092000, 657600, 0xf3333bd8	196	0, 1092000, 657600, 0xf3333bd8
197	0, 1098000, 657600, 0xea090688	197	0, 1098000, 657600, 0xea090688
@@ -206,8 +206,8 @@ · 8 unmodified lines
206	0, 1152000, 657600, 0xf1d2874a	206	0, 1152000, 657600, 0xf1d2874a
207	0, 1158000, 657600, 0xf1d2874a	207	0, 1158000, 657600, 0xf1d2874a
208	0, 1164000, 657600, 0xf1d2874a	208	0, 1164000, 657600, 0xf1d2874a
209	1, 1170000, 22050, 0xdf6f1e46
210	0, 1170000, 657600, 0xa58d6742	209	0, 1170000, 657600, 0xa58d6742
		210	1, 1170000, 22050, 0xdf6f1e46
211	0, 1176000, 657600, 0xa58d6742	211	0, 1176000, 657600, 0xa58d6742
212	0, 1182000, 657600, 0xa58d6742	212	0, 1182000, 657600, 0xa58d6742
213	0, 1188000, 657600, 0xb0cd11bb	213	0, 1188000, 657600, 0xb0cd11bb
@@ -222,8 +222,8 @@ · 8 unmodified lines
222	0, 1242000, 657600, 0x97ac10bb	222	0, 1242000, 657600, 0x97ac10bb
223	0, 1248000, 657600, 0x97ac10bb	223	0, 1248000, 657600, 0x97ac10bb
224	0, 1254000, 657600, 0xe8b30dd3	224	0, 1254000, 657600, 0xe8b30dd3
225	1, 1260000, 22050, 0x4c91da9d
226	0, 1260000, 657600, 0x3d0c10bb	225	0, 1260000, 657600, 0x3d0c10bb
		226	1, 1260000, 22050, 0x4c91da9d
227	0, 1266000, 657600, 0x8d2b0dd3	227	0, 1266000, 657600, 0x8d2b0dd3
228	0, 1272000, 657600, 0x8d2b0dd3	228	0, 1272000, 657600, 0x8d2b0dd3
229	0, 1278000, 657600, 0xa5760dd3	229	0, 1278000, 657600, 0xa5760dd3

tests/ref/fate/vqa-cc+1−1

@@ -1,5 +1,5 @@
1	1, 0, 22048, 0x0665d7f4
2	0, 0, 192000, 0x00000000	1	0, 0, 192000, 0x00000000
		2	1, 0, 22048, 0x0665d7f4
3	0, 6000, 192000, 0x00000000	3	0, 6000, 192000, 0x00000000
4	0, 12000, 192000, 0x00000000	4	0, 12000, 192000, 0x00000000
5	0, 18000, 192000, 0x00000000	5	0, 18000, 192000, 0x00000000

tests/ref/fate/wmv8-drm-nodec+1−1

@@ -1,5 +1,5 @@
1	1, 0, 1088, 0x5cd379bb
2	0, 0, 282, 0x000d949a	1	0, 0, 282, 0x000d949a
		2	1, 0, 1088, 0x5cd379bb
3	1, 39150, 1088, 0x8dfa1368	3	1, 39150, 1088, 0x8dfa1368
4	1, 66600, 1088, 0xc0d211be	4	1, 66600, 1088, 0xc0d211be
5	1, 92070, 1088, 0x8238113a	5	1, 92070, 1088, 0x8238113a

tests/ref/lavf/gxf+1−1

@@ -1,3 +1,3 @@
1	346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf	1	346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf
2	796392 ./tests/data/lavf/lavf.gxf	2	796392 ./tests/data/lavf/lavf.gxf
3	./tests/data/lavf/lavf.gxf CRC=0xad9e86eb	3	./tests/data/lavf/lavf.gxf CRC=0x345f86eb

tests/ref/lavf/mpg+1−1

@@ -1,3 +1,3 @@
1	dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg	1	dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg
2	372736 ./tests/data/lavf/lavf.mpg	2	372736 ./tests/data/lavf/lavf.mpg
3	./tests/data/lavf/lavf.mpg CRC=0x2b39ed74	3	./tests/data/lavf/lavf.mpg CRC=0xf361ed74

tests/ref/lavf/mxf+1−1

@@ -1,6 +1,6 @@
1	785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf	1	785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf
2	525881 ./tests/data/lavf/lavf.mxf	2	525881 ./tests/data/lavf/lavf.mxf
3	./tests/data/lavf/lavf.mxf CRC=0xb6aa0849	3	./tests/data/lavf/lavf.mxf CRC=0x4ace0849
4	b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10	4	b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10
5	5330989 ./tests/data/lavf/lavf.mxf_d10	5	5330989 ./tests/data/lavf/lavf.mxf_d10
6	./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e	6	./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e

Merge remote branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code