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	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	47	2011-04-10 - lavu 50.40.0 - pixfmt.h
16	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	2966	const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
2967	2967	const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
2968	2968	uint8_t max_lowres; ///< maximum value for lowres supported by the decoder
2969		−
2970		− AVClass *priv_class; ///< AVClass for the private context
2971		−
	2969	+ const AVClass *priv_class; ///< AVClass for the private context
2972	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	22	#include "avcodec.h"
	23	+#include "libavutil/avstring.h"
	24	+#include "libavutil/opt.h"
23	25
24	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	42	#include <opencore-amrnb/interf_dec.h>
41	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	45	/* Common code for fixed and float version*/
47	46	typedef struct AMR_bitrates {
48	47	int rate;
@@ -50,41 +49,61 @@ typedef struct AMR_bitrates { · 1 unmodified line
50	49	} AMR_bitrates;
51	50
52	51	/* Match desired bitrate */
53		−static int getBitrateMode(int bitrate)
	52	+static int get_bitrate_mode(int bitrate, void *log_ctx)
54	53	{
55	54	/* make the correspondance between bitrate and mode */
56		− AMR_bitrates rates[] = { { 4750, MR475},
57		− { 5150, MR515},
58		− { 5900, MR59},
59		− { 6700, MR67},
60		− { 7400, MR74},
61		− { 7950, MR795},
62		− {10200, MR102},
63		− {12200, MR122}, };
64		− int i;
65		−
66		− for (i = 0; i < 8; i++)
	55	+ static const AMR_bitrates rates[] = {
	56	+ { 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 },
	57	+ { 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 }
	58	+ };
	59	+ int i, best = -1, min_diff = 0;
	60	+ char log_buf[200];
	61	+
	62	+ for (i = 0; i < 8; i++) {
67	63	if (rates[i].rate == bitrate)
68	64	return rates[i].mode;
69		− /* no bitrate matching, return an error */
70		− return -1;
	65	+ if (best < 0 \|\| abs(rates[i].rate - bitrate) < min_diff) {
	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	80	typedef struct AMRContext {
74		− int frameCount;
75		− void *decState;
76		− int *enstate;
	81	+ AVClass *av_class;
	82	+ int frame_count;
	83	+ void *dec_state;
	84	+ void *enc_state;
77	85	int enc_bitrate;
	86	+ int enc_mode;
	87	+ int enc_dtx;
78	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	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;
85		− s->decState = Decoder_Interface_init();
86		− if (!s->decState) {
87		− av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");
	103	+ s->frame_count = 0;
	104	+ s->dec_state = Decoder_Interface_init();
	105	+ if (!s->dec_state) {
	106	+ av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n");
88	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	112	if (avctx->channels > 1) {
94	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	117	return 0;
@@ -102,7 +121,7 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx) · 3 unmodified lines
102	121	{
103	122	AMRContext *s = avctx->priv_data;
104	123
105		− Decoder_Interface_exit(s->decState);
	124	+ Decoder_Interface_exit(s->dec_state);
106	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	131	const uint8_t *buf = avpkt->data;
113	132	int buf_size = avpkt->size;
114		− AMRContext *s = avctx->priv_data;
115		− const uint8_t *amrData = buf;
	133	+ AMRContext *s = avctx->priv_data;
116	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	135	enum Mode dec_mode;
118	136	int packet_size;
119	137
120		− /* av_log(NULL, AV_LOG_DEBUG, "amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",
121		− buf, buf_size, s->frameCount); */
	138	+ av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",
	139	+ buf, buf_size, s->frame_count);
122	140
123		− dec_mode = (buf[0] >> 3) & 0x000F;
	141	+ dec_mode = (buf[0] >> 3) & 0x000F;
124	142	packet_size = block_size[dec_mode] + 1;
125	143
126	144	if (packet_size > buf_size) {
127	145	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
128	146	buf_size, packet_size);
129		− return -1;
	147	+ return AVERROR_INVALIDDATA;
130	148	}
131	149
132		− s->frameCount++;
133		− /* av_log(NULL, AV_LOG_DEBUG, "packet_size=%d amrData= 0x%X %X %X %X\n",
134		− packet_size, amrData[0], amrData[1], amrData[2], amrData[3]); */
	150	+ s->frame_count++;
	151	+ av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n",
	152	+ packet_size, buf[0], buf[1], buf[2], buf[3]);
135	153	/* call decoder */
136		− Decoder_Interface_Decode(s->decState, amrData, data, 0);
	154	+ Decoder_Interface_Decode(s->dec_state, buf, data, 0);
137	155	data_size = 160 2;
138	156
139	157	return packet_size;
@@ -155,31 +173,29 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) · 15 unmodified lines
155	173	{
156	174	AMRContext *s = avctx->priv_data;
157	175
158		− s->frameCount = 0;
	176	+ s->frame_count = 0;
159	177
160	178	if (avctx->sample_rate != 8000) {
161	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	183	if (avctx->channels != 1) {
166	184	av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
167		− return -1;
	185	+ return AVERROR(ENOSYS);
168	186	}
169	187
170	188	avctx->frame_size = 160;
171	189	avctx->coded_frame = avcodec_alloc_frame();
172	190
173		− s->enstate=Encoder_Interface_init(0);
174		− if (!s->enstate) {
	191	+ s->enc_state = Encoder_Interface_init(s->enc_dtx);
	192	+ if (!s->enc_state) {
175	193	av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
176	194	return -1;
177	195	}
178	196
179		− if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
180		− av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
181		− return -1;
182		− }
	197	+ s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
	198	+ s->enc_bitrate = avctx->bit_rate;
183	199
184	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	205	AMRContext *s = avctx->priv_data;
190	206
191		− Encoder_Interface_exit(s->enstate);
	207	+ Encoder_Interface_exit(s->enc_state);
192	208	av_freep(&avctx->coded_frame);
193	209	return 0;
194	210	}
@@ -200,15 +216,15 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, · 5 unmodified lines
200	216	AMRContext *s = avctx->priv_data;
201	217	int written;
202	218
203		− if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
204		− av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
205		− return -1;
	219	+ if (s->enc_bitrate != avctx->bit_rate) {
	220	+ s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
	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	225	frame, 0);
210		− /* av_log(NULL, AV_LOG_DEBUG, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
211		− written, s->enc_bitrate, frame[0] ); */
	226	+ av_dlog(avctx, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
	227	+ written, s->enc_mode, frame[0]);
212	228
213	229	return written;
214	230	}
@@ -224,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = { · 9 unmodified lines
224	240	NULL,
225	241	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
226	242	.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
	243	+ .priv_class = &class,
227	244	};
228	245
229	246	#endif
@@ -231,42 +248,24 @@ AVCodec ff_libopencore_amrnb_encoder = { · 1 unmodified line
231	248	/* -----------AMR wideband ------------*/
232	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	251	#include <opencore-amrwb/dec_if.h>
240	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	254	typedef struct AMRWBContext {
252		− int frameCount;
253	255	void *state;
254		− int mode;
255		− Word16 allow_dtx;
256	256	} AMRWBContext;
257	257
258	258	static av_cold int amr_wb_decode_init(AVCodecContext *avctx)
259	259	{
260	260	AMRWBContext *s = avctx->priv_data;
261	261
262		− s->frameCount = 0;
263		− s->state = D_IF_init();
	262	+ s->state = D_IF_init();
264	263
265	264	amr_decode_fix_avctx(avctx);
266	265
267	266	if (avctx->channels > 1) {
268	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	271	return 0;
@@ -277,8 +276,7 @@ static int amr_wb_decode_frame(AVCodecContext avctx, void data, · 4 unmodified lines
277	276	{
278	277	const uint8_t *buf = avpkt->data;
279	278	int buf_size = avpkt->size;
280		− AMRWBContext *s = avctx->priv_data;
281		− const uint8_t *amrData = buf;
	279	+ AMRWBContext *s = avctx->priv_data;
282	280	int mode;
283	281	int packet_size;
284	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	285	/* nothing to do */
288	286	return 0;
289	287
290		− mode = (amrData[0] >> 3) & 0x000F;
	288	+ mode = (buf[0] >> 3) & 0x000F;
291	289	packet_size = block_size[mode];
292	290
293	291	if (packet_size > buf_size) {
294	292	av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
295	293	buf_size, packet_size + 1);
296		− return -1;
	294	+ return AVERROR_INVALIDDATA;
297	295	}
298	296
299		− s->frameCount++;
300		− D_IF_decode(s->state, amrData, data, _good_frame);
	297	+ D_IF_decode(s->state, buf, data, _good_frame);
301	298	data_size = 320 2;
302	299	return packet_size;
303	300	}

libavcodec/libvo-aacenc.c+11−9

@@ -62,12 +62,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) · 61 unmodified lines
62	62	return AVERROR_UNKNOWN;
63	63	}
64	64
65		− avctx->extradata_size = 2;
66		− avctx->extradata = av_mallocz(avctx->extradata_size +
67		− FF_INPUT_BUFFER_PADDING_SIZE);
68		− if (!avctx->extradata)
69		− return AVERROR(ENOMEM);
70		−
71	65	for (index = 0; index < 16; index++)
72	66	if (avctx->sample_rate == ff_mpeg4audio_sample_rates[index])
73	67	break;
@@ -76,8 +70,16 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) · 2 unmodified lines
76	70	avctx->sample_rate);
77	71	return AVERROR_NOTSUPP;
78	72	}
79		− avctx->extradata[0] = 0x02 << 3 \| index >> 1;
80		− avctx->extradata[1] = (index & 0x01) << 7 \| avctx->channels << 3;
	73	+ if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
	74	+ avctx->extradata_size = 2;
	75	+ avctx->extradata = av_mallocz(avctx->extradata_size +
	76	+ FF_INPUT_BUFFER_PADDING_SIZE);
	77	+ if (!avctx->extradata)
	78	+ return AVERROR(ENOMEM);
	79	+
	80	+ avctx->extradata[0] = 0x02 << 3 \| index >> 1;
	81	+ avctx->extradata[1] = (index & 0x01) << 7 \| avctx->channels << 3;
	82	+ }
81	83	return 0;
82	84	}
83	85
@@ -123,6 +125,6 @@ AVCodec ff_libvo_aacenc_encoder = { · 39 unmodified lines
123	125	aac_encode_close,
124	126	NULL,
125	127	.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
126		− .long_name = NULL_IF_CONFIG_SMALL("VisualOn libvo-aacenc AAC"),
	128	+ .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),
127	129	};
128	130

libavcodec/libvo-amrwbenc.c+43−36

@@ -22,41 +22,50 @@ · 21 unmodified lines
22	22	#include <vo-amrwbenc/enc_if.h>
23	23
24	24	#include "avcodec.h"
25		−
26		−static const char wb_bitrate_unsupported[] =
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;
	25	+#include "libavutil/avstring.h"
	26	+#include "libavutil/opt.h"
34	27
35	28	typedef struct AMRWBContext {
	29	+ AVClass *av_class;
36	30	void *state;
37	31	int mode;
	32	+ int last_bitrate;
38	33	int allow_dtx;
39	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	47	/* make the correspondance between bitrate and mode */
44		− AMRWB_bitrates rates[] = { { 6600, 0},
45		− { 8850, 1},
46		− {12650, 2},
47		− {14250, 3},
48		− {15850, 4},
49		− {18250, 5},
50		− {19850, 6},
51		− {23050, 7},
52		− {23850, 8}, };
53		− int i;
54		−
	48	+ static const int rates[] = { 6600, 8850, 12650, 14250, 15850, 18250,
	49	+ 19850, 23050, 23850 };
	50	+ int i, best = -1, min_diff = 0;
	51	+ char log_buf[200];
	52	+
	53	+ for (i = 0; i < 9; i++) {
	54	+ if (rates[i] == bitrate)
	55	+ return i;
	56	+ if (best < 0 \|\| abs(rates[i] - bitrate) < min_diff) {
	57	+ best = i;
	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	63	for (i = 0; i < 9; i++)
56		− if (rates[i].rate == bitrate)
57		− return rates[i].mode;
58		− /* no bitrate matching, return an error */
59		− return -1;
	64	+ av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i] / 1000.f);
	65	+ av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best] / 1000.f);
	66	+ av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf);
	67	+
	68	+ return best;
60	69	}
61	70
62	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	75	if (avctx->sample_rate != 16000) {
67	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	80	if (avctx->channels != 1) {
72	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) {
77		− av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);
78		− return -1;
79		− }
	85	+ s->mode = get_wb_bitrate_mode(avctx->bit_rate, avctx);
	86	+ s->last_bitrate = avctx->bit_rate;
80	87
81	88	avctx->frame_size = 320;
82	89	avctx->coded_frame = avcodec_alloc_frame();
83	90
84	91	s->state = E_IF_init();
85		− s->allow_dtx = 0;
86	92
87	93	return 0;
88	94	}
@@ -103,9 +109,9 @@ static int amr_wb_encode_frame(AVCodecContext *avctx, · 14 unmodified lines
103	109	AMRWBContext *s = avctx->priv_data;
104	110	int size;
105	111
106		− if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {
107		− av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);
108		− return -1;
	112	+ if (s->last_bitrate != avctx->bit_rate) {
	113	+ s->mode = get_wb_bitrate_mode(avctx->bit_rate, avctx);
	114	+ s->last_bitrate = avctx->bit_rate;
109	115	}
110	116	size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);
111	117	return size;
@@ -121,7 +127,8 @@ AVCodec ff_libvo_amrwbenc_encoder = { · 9 unmodified lines
121	127	amr_wb_encode_close,
122	128	NULL,
123	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	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	1279	int i;
1280	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	1285	common_init(s);
1285	1286

libavcodec/version.h+3−3

@@ -66,10 +66,10 @@ · 65 unmodified lines
66	66	#define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53)
67	67	#endif
68	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	70	#endif
71	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	73	#endif
74	74	#ifndef FF_API_HURRY_UP
75	75	#define FF_API_HURRY_UP (LIBAVCODEC_VERSION_MAJOR < 53)
@@ -84,7 +84,7 @@ · 8 unmodified lines
84	84	#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)
85	85	#endif
86	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	88	#endif
89	89
90	90	#endif /* AVCODEC_VERSION_H */

libavformat/applehttp.c+7−4

@@ -309,10 +309,13 @@ reload: · 308 unmodified lines
309	309	c->end_of_segment = 1;
310	310	c->cur_seq_no = v->cur_seq_no;
311	311
312		− v->needed = 0;
313		− for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams; i++) {
314		− if (v->parent->streams[i]->discard < AVDISCARD_ALL)
315		− v->needed = 1;
	312	+ if (v->ctx) {
	313	+ v->needed = 0;
	314	+ for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;
	315	+ i++) {
	316	+ if (v->parent->streams[i]->discard < AVDISCARD_ALL)
	317	+ v->needed = 1;
	318	+ }
316	319	}
317	320	if (!v->needed) {
318	321	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	318	enum CodecID subtitle_codec; /*< default subtitle codec /
319	319
320		−#if FF_API_OLD_METADATA
	320	+#if FF_API_OLD_METADATA2
321	321	const AVMetadataConv *metadata_conv;
322	322	#endif
323	323
@@ -437,7 +437,7 @@ typedef struct AVInputFormat { · 113 unmodified lines
437	437	*/
438	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	441	const AVMetadataConv *metadata_conv;
442	442	#endif
443	443

libavformat/avio.c+21−0

@@ -363,6 +363,7 @@ int ffurl_close(URLContext *h) · 362 unmodified lines
363	363	return ret;
364	364	}
365	365
	366	+#if FF_API_OLD_AVIO
366	367	int url_exist(const char *filename)
367	368	{
368	369	URLContext *h;
@@ -371,6 +372,26 @@ int url_exist(const char *filename) · 2 unmodified lines
371	372	ffurl_close(h);
372	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	396	int64_t ffurl_size(URLContext *h)
376	397	{

libavformat/avio.h+31−2

@@ -134,6 +134,7 @@ typedef struct URLProtocol { · 133 unmodified lines
134	134	int priv_data_size;
135	135	const AVClass *priv_data_class;
136	136	int flags;
	137	+ int (url_check)(URLContext h, int mask);
137	138	} URLProtocol;
138	139
139	140	typedef struct URLPollEntry {
@@ -335,13 +336,31 @@ attribute_deprecated int url_open_buf(AVIOContext *s, uint8_t buf, int buf_siz · 195 unmodified lines
335	336
336	337	/** return the written or read size */
337	338	attribute_deprecated int url_close_buf(AVIOContext *s);
338		−#endif // FF_API_OLD_AVIO
339	339
340	340	/**
341	341	* Return a non-zero value if the resource indicated by url
342	342	* exists, 0 otherwise.
	343	+ * @deprecated Use avio_check instead.
343	344	*/
344		−int url_exist(const char *url);
	345	+attribute_deprecated int url_exist(const char *url);
	346	+#endif // FF_API_OLD_AVIO
	347	+
	348	+/**
	349	+ * Return AVIO_* access flags corresponding to the access permissions
	350	+ * of the resource in url, or a negative value corresponding to an
	351	+ * AVERROR code in case of failure. The returned access flags are
	352	+ * masked by the value in flags.
	353	+ *
	354	+ * @note This function is intrinsically unsafe, in the sense that the
	355	+ * checked resource may change its existence or permission status from
	356	+ * one call to another. Thus you should not trust the returned value,
	357	+ * unless you are sure that no other processes are accessing the
	358	+ * checked resource.
	359	+ *
	360	+ * @note This function is slightly broken until next major bump
	361	+ * because of AVIO_RDONLY == 0. Don't use it until then.
	362	+ */
	363	+int avio_check(const char *url, int flags);
345	364
346	365	/**
347	366	* The callback is called in blocking functions to test regulary if
@@ -537,9 +556,15 @@ int url_resetbuf(AVIOContext *s, int flags); · 189 unmodified lines
537	556	* constants, optionally ORed with other flags.
538	557	* @{
539	558	*/
	559	+#if LIBAVFORMAT_VERSION_MAJOR < 53
540	560	#define AVIO_RDONLY 0 /*< read-only /
541	561	#define AVIO_WRONLY 1 /*< write-only /
542	562	#define AVIO_RDWR 2 /*< read-write /
	563	+#else
	564	+#define AVIO_RDONLY 1 /*< read-only /
	565	+#define AVIO_WRONLY 2 /*< write-only /
	566	+#define AVIO_RDWR 4 /*< read-write /
	567	+#endif
543	568	/**
544	569	* @}
545	570	*/
@@ -556,7 +581,11 @@ int url_resetbuf(AVIOContext *s, int flags); · 10 unmodified lines
556	581	* Warning: non-blocking protocols is work-in-progress; this flag may be
557	582	* silently ignored.
558	583	*/
	584	+#if LIBAVFORMAT_VERSION_MAJOR < 53
559	585	#define AVIO_FLAG_NONBLOCK 4
	586	+#else
	587	+#define AVIO_FLAG_NONBLOCK 8
	588	+#endif
560	589
561	590	/**
562	591	* Create and initialize a AVIOContext for accessing the

libavformat/file.c+16−0

@@ -95,6 +95,20 @@ static int file_close(URLContext *h) · 94 unmodified lines
95	95	return close(fd);
96	96	}
97	97
	98	+static int file_check(URLContext *h, int mask)
	99	+{
	100	+ struct stat st;
	101	+ int ret = stat(h->filename, &st);
	102	+ if (ret < 0)
	103	+ return AVERROR(errno);
	104	+
	105	+ ret \|= st.st_mode&S_IRUSR ? mask&AVIO_RDONLY : 0;
	106	+ ret \|= st.st_mode&S_IWUSR ? mask&AVIO_WRONLY : 0;
	107	+ ret \|= st.st_mode&S_IWUSR && st.st_mode&S_IRUSR ? mask&AVIO_RDWR : 0;
	108	+
	109	+ return ret;
	110	+}
	111	+
98	112	URLProtocol ff_file_protocol = {
99	113	.name = "file",
100	114	.url_open = file_open,
@@ -103,6 +117,7 @@ URLProtocol ff_file_protocol = { · 2 unmodified lines
103	117	.url_seek = file_seek,
104	118	.url_close = file_close,
105	119	.url_get_file_handle = file_get_handle,
	120	+ .url_check = file_check,
106	121	};
107	122
108	123	#endif /* CONFIG_FILE_PROTOCOL */
@@ -137,6 +152,7 @@ URLProtocol ff_pipe_protocol = { · 28 unmodified lines
137	152	.url_read = file_read,
138	153	.url_write = file_write,
139	154	.url_get_file_handle = file_get_handle,
	155	+ .url_check = file_check,
140	156	};
141	157
142	158	#endif /* CONFIG_PIPE_PROTOCOL */

libavformat/url.h+1−0

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

libavformat/utils.c+4−1

@@ -3086,7 +3086,10 @@ static int ff_interleave_compare_dts(AVFormatContext s, AVPacket next, AVPacke · 3085 unmodified lines
3086	3086	AVStream *st2= s->streams[ next->stream_index];
3087	3087	int64_t a= st2->time_base.num * (int64_t)st ->time_base.den;
3088	3088	int64_t b= st ->time_base.num * (int64_t)st2->time_base.den;
3089		− return av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN) < next->dts;
	3089	+ int64_t dts1 = av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN);
	3090	+ if (dts1==next->dts && dts1==av_rescale_rnd(pkt->dts, b, a, AV_ROUND_UP))
	3091	+ return pkt->stream_index < next->stream_index;
	3092	+ return dts1 < next->dts;
3090	3093	}
3091	3094
3092	3095	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	24	#include "libavutil/avutil.h"
25	25
26	26	#define LIBAVFORMAT_VERSION_MAJOR 52
27		−#define LIBAVFORMAT_VERSION_MINOR 106
	27	+#define LIBAVFORMAT_VERSION_MINOR 107
28	28	#define LIBAVFORMAT_VERSION_MICRO 0
29	29
30	30	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

libswscale/rgb2rgb.c+0−2

@@ -30,8 +30,6 @@ · 29 unmodified lines
30	30	#include "swscale.h"
31	31	#include "swscale_internal.h"
32	32
33		−#define FAST_BGR2YV12 // use 7-bit instead of 15-bit coefficients
34		−
35	33	void (rgb24tobgr32)(const uint8_t src, uint8_t *dst, long src_size);
36	34	void (rgb24tobgr16)(const uint8_t src, uint8_t *dst, long src_size);
37	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	77	//#undef ARCH_X86
78	78	#define DITHER1XBPP
79	79
80		−#define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit
81		−
82	80	#define isPacked(x) ( \
83	81	(x)==PIX_FMT_PAL8 \
84	82	\|\| (x)==PIX_FMT_YUYV422 \

libswscale/swscale_internal.h+2−0

@@ -31,6 +31,8 @@ · 30 unmodified lines
31	31
32	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	36	#define MAX_FILTER_SIZE 256
35	37
36	38	#if ARCH_X86

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

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

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

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

tests/ref/fate/bfi+1−1

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

tests/ref/fate/corepng+1−1

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/ref/fate/mtv+1−1

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

tests/ref/fate/nuv+1−1

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

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

@@ -1,5 +1,5 @@
1		−1, 0, 8064, 0x02260037
2	1	0, 0, 115200, 0x6b106a56
	2	+1, 0, 8064, 0x02260037
3	3	1, 4800, 8064, 0x4ee9f4e9
4	4	0, 6000, 115200, 0x53c16930
5	5	1, 9600, 8064, 0xf8fd82aa
@@ -7,8 +7,8 @@ · 1 unmodified line
7	7	1, 14400, 8064, 0xc100792b
8	8	0, 18000, 115200, 0xc3c18ba0
9	9	1, 19200, 8064, 0xf11a5316
10		−1, 24000, 8064, 0x6937f8c0
11	10	0, 24000, 115200, 0xe281b655
	11	+1, 24000, 8064, 0x6937f8c0
12	12	1, 28800, 8064, 0xed194e42
13	13	0, 30000, 115200, 0x7b1e0536
14	14	1, 33600, 8064, 0x619ce54b
@@ -16,8 +16,8 @@ · 1 unmodified line
16	16	1, 38400, 8064, 0x544999ec
17	17	0, 42000, 115200, 0xfc67bf8e
18	18	1, 43200, 8064, 0x0ea877b4
19		−1, 48000, 8064, 0xb764d1c0
20	19	0, 48000, 115200, 0xb463151c
	20	+1, 48000, 8064, 0xb764d1c0
21	21	1, 52800, 8064, 0x7a2fd211
22	22	0, 54000, 115200, 0x6e686846
23	23	1, 57600, 8064, 0xff69f6c5
@@ -25,8 +25,8 @@ · 1 unmodified line
25	25	1, 62400, 8064, 0x26c11ec7
26	26	0, 66000, 115200, 0x17b91efc
27	27	1, 67200, 8064, 0xfb4ecc0c
28		−1, 72000, 8064, 0x111d799b
29	28	0, 72000, 115200, 0xc051a49a
	29	+1, 72000, 8064, 0x111d799b
30	30	1, 76800, 8064, 0xc704dc91
31	31	0, 78000, 115200, 0xc68c227b
32	32	1, 81600, 8064, 0xa9f372fb
@@ -34,8 +34,8 @@ · 1 unmodified line
34	34	1, 86400, 8064, 0xa3f0ad0f
35	35	0, 90000, 115200, 0x09d56ecc
36	36	1, 91200, 8064, 0x958719b9
37		−1, 96000, 8064, 0x9b011bf7
38	37	0, 96000, 115200, 0xc20e3485
	38	+1, 96000, 8064, 0x9b011bf7
39	39	1, 100800, 8064, 0x466d96fb
40	40	0, 102000, 115200, 0xf07e2c48
41	41	1, 105600, 8064, 0x6ed4eb29
@@ -43,8 +43,8 @@ · 1 unmodified line
43	43	1, 110400, 8064, 0x066966db
44	44	0, 114000, 115200, 0xed65bacd
45	45	1, 115200, 8064, 0xf60fe0bc
46		−1, 120000, 8064, 0x2c845167
47	46	0, 120000, 115200, 0x51a23a3b
	47	+1, 120000, 8064, 0x2c845167
48	48	1, 124800, 8064, 0x7d63894f
49	49	0, 126000, 115200, 0x559ddce1
50	50	1, 129600, 8064, 0x0682ee36
@@ -52,8 +52,8 @@ · 1 unmodified line
52	52	1, 134400, 8064, 0xcaeb7c70
53	53	0, 138000, 115200, 0x11b2dece
54	54	1, 139200, 8064, 0x93948697
55		−1, 144000, 8064, 0x5805f0d6
56	55	0, 144000, 115200, 0x851b877c
	56	+1, 144000, 8064, 0x5805f0d6
57	57	1, 148800, 8064, 0xcfb641ff
58	58	0, 150000, 115200, 0x5f9a7c99
59	59	1, 153600, 8064, 0xe3499bb1
@@ -61,8 +61,8 @@ · 1 unmodified line
61	61	1, 158400, 8064, 0x689fe483
62	62	0, 162000, 115200, 0x950b0de8
63	63	1, 163200, 8064, 0x1b8f2f2d
64		−1, 168000, 8064, 0x23852e71
65	64	0, 168000, 115200, 0x6ec4c89a
	65	+1, 168000, 8064, 0x23852e71
66	66	1, 172800, 8064, 0x15e7b298
67	67	0, 174000, 115200, 0xa9234812
68	68	1, 177600, 8064, 0x5345a9a3
@@ -70,8 +70,8 @@ · 1 unmodified line
70	70	1, 182400, 8064, 0x257b6ecf
71	71	0, 186000, 115200, 0x2cc1a2aa
72	72	1, 187200, 8064, 0xaf62836c
73		−1, 192000, 8064, 0xc3a401e3
74	73	0, 192000, 115200, 0x5df53b71
	74	+1, 192000, 8064, 0xc3a401e3
75	75	1, 196800, 8064, 0x2b98fdf1
76	76	0, 198000, 115200, 0xe1d0cb31
77	77	1, 201600, 8064, 0x37168697
@@ -79,8 +79,8 @@ · 1 unmodified line
79	79	1, 206400, 8064, 0x2d876c89
80	80	0, 210000, 115200, 0x9342d739
81	81	1, 211200, 8064, 0xc40a6ada
82		−1, 216000, 8064, 0xcca6b829
83	82	0, 216000, 115200, 0x586bc658
	83	+1, 216000, 8064, 0xcca6b829
84	84	1, 220800, 8064, 0x6667550a
85	85	0, 222000, 115200, 0x76902834
86	86	1, 225600, 8064, 0x99c1b5cb
@@ -88,8 +88,8 @@ · 1 unmodified line
88	88	1, 230400, 8064, 0xc05d3ed3
89	89	0, 234000, 115200, 0xce8c95fb
90	90	1, 235200, 8064, 0xdd641781
91		−1, 240000, 8064, 0xa65d49dc
92	91	0, 240000, 115200, 0xdf0d3de6
	92	+1, 240000, 8064, 0xa65d49dc
93	93	1, 244800, 8064, 0x2a0d5df7
94	94	0, 246000, 115200, 0x120db7ae
95	95	1, 249600, 8064, 0xa6348438
@@ -97,8 +97,8 @@ · 1 unmodified line
97	97	1, 254400, 8064, 0xf2e1412d
98	98	0, 258000, 115200, 0x2498d3b6
99	99	1, 259200, 8064, 0xc41c6a7a
100		−1, 264000, 8064, 0x147edc3d
101	100	0, 264000, 115200, 0x99975ff8
	101	+1, 264000, 8064, 0x147edc3d
102	102	1, 268800, 8064, 0x17e3cfe7
103	103	0, 270000, 115200, 0xbad65f9f
104	104	1, 273600, 8064, 0x01fe3969
@@ -106,8 +106,8 @@ · 1 unmodified line
106	106	1, 278400, 8064, 0xc437ac11
107	107	0, 282000, 115200, 0x6f8a61a0
108	108	1, 283200, 8064, 0xbbf747c1
109		−1, 288000, 8064, 0x2a4b88c0
110	109	0, 288000, 115200, 0x80c96143
	110	+1, 288000, 8064, 0x2a4b88c0
111	111	1, 292800, 8064, 0xcd149c80
112	112	0, 294000, 115200, 0x663c6198
113	113	1, 297600, 8064, 0xcf339dfc
@@ -115,8 +115,8 @@ · 1 unmodified line
115	115	1, 302400, 8064, 0xc81ff84b
116	116	0, 306000, 115200, 0xfe186346
117	117	1, 307200, 8064, 0x4d978100
118		−1, 312000, 8064, 0x6da6665b
119	118	0, 312000, 115200, 0x844962f8
	119	+1, 312000, 8064, 0x6da6665b
120	120	1, 316800, 8064, 0x12fa354f
121	121	0, 318000, 115200, 0x917c672f
122	122	1, 321600, 8064, 0x6baedae6
@@ -124,8 +124,8 @@ · 1 unmodified line
124	124	1, 326400, 8064, 0xddd77327
125	125	0, 330000, 115200, 0xace06816
126	126	1, 331200, 8064, 0x0a31c118
127		−1, 336000, 8064, 0x7652ee6e
128	127	0, 336000, 115200, 0x4ef26aa2
	128	+1, 336000, 8064, 0x7652ee6e
129	129	1, 340800, 8064, 0x486a24cc
130	130	0, 342000, 115200, 0xf2046bb3
131	131	1, 345600, 8064, 0xf6cf01ee
@@ -133,8 +133,8 @@ · 1 unmodified line
133	133	1, 350400, 8064, 0x2a19e830
134	134	0, 354000, 115200, 0x8a17716d
135	135	1, 355200, 8064, 0xde675a31
136		−1, 360000, 8064, 0xeefcc9af
137	136	0, 360000, 115200, 0x36127568
	137	+1, 360000, 8064, 0xeefcc9af
138	138	1, 364800, 8064, 0xaec4c989
139	139	0, 366000, 115200, 0x3e877b5c
140	140	1, 369600, 8064, 0x16b73de9
@@ -142,8 +142,8 @@ · 1 unmodified line
142	142	1, 374400, 8064, 0x188a582a
143	143	0, 378000, 115200, 0x41bc8a39
144	144	1, 379200, 8064, 0xc092e73d
145		−1, 384000, 8064, 0xf7ebca97
146	145	0, 384000, 115200, 0x6f839446
	146	+1, 384000, 8064, 0xf7ebca97
147	147	1, 388800, 8064, 0x170ce07a
148	148	0, 390000, 115200, 0xef74a005
149	149	1, 393600, 8064, 0xa0705384
@@ -151,8 +151,8 @@ · 1 unmodified line
151	151	1, 398400, 8064, 0xd0154a3c
152	152	0, 402000, 115200, 0x4607cf99
153	153	1, 403200, 8064, 0x57c73c6c
154		−1, 408000, 8064, 0x590c9ddb
155	154	0, 408000, 115200, 0x4c18e8db
	155	+1, 408000, 8064, 0x590c9ddb
156	156	1, 412800, 8064, 0x2cbe552f
157	157	0, 414000, 115200, 0x04d71efb
158	158	1, 417600, 8064, 0x0d286932
@@ -160,8 +160,8 @@ · 1 unmodified line
160	160	1, 422400, 8064, 0x5931cea3
161	161	0, 426000, 115200, 0x4dd48d01
162	162	1, 427200, 8064, 0xaf0fb80d
163		−1, 432000, 8064, 0x7fb61e9b
164	163	0, 432000, 115200, 0x5fa9627f
	164	+1, 432000, 8064, 0x7fb61e9b
165	165	1, 436800, 8064, 0xf17134bb
166	166	0, 438000, 115200, 0x7a413f88
167	167	1, 441600, 8064, 0xd647859a
@@ -169,8 +169,8 @@ · 1 unmodified line
169	169	1, 446400, 8064, 0x55a60921
170	170	0, 450000, 115200, 0x3d720e05
171	171	1, 451200, 8064, 0x3811fa58
172		−1, 456000, 8064, 0xaceeccea
173	172	0, 456000, 115200, 0x49243fd8
	173	+1, 456000, 8064, 0xaceeccea
174	174	1, 460800, 8064, 0x5fcedf14
175	175	0, 462000, 115200, 0x9834b697
176	176	1, 465600, 8064, 0xd8c64abf
@@ -178,8 +178,8 @@ · 1 unmodified line
178	178	1, 470400, 8064, 0x79495e8d
179	179	0, 474000, 115200, 0x3eaf5504
180	180	1, 475200, 8064, 0x4b7db039
181		−1, 480000, 8064, 0x7152f86d
182	181	0, 480000, 115200, 0x057a3701
	182	+1, 480000, 8064, 0x7152f86d
183	183	1, 484800, 8064, 0xd92cfc1a
184	184	0, 486000, 115200, 0x6e88f21a
185	185	1, 489600, 8064, 0x75c540ef
@@ -187,8 +187,8 @@ · 1 unmodified line
187	187	1, 494400, 8064, 0x9c03ef5e
188	188	0, 498000, 115200, 0x92212d84
189	189	1, 499200, 8064, 0x7b2911c8
190		−1, 504000, 8064, 0x69d9d553
191	190	0, 504000, 115200, 0xf6b0a4ff
	191	+1, 504000, 8064, 0x69d9d553
192	192	1, 508800, 8064, 0xcb45d7c5
193	193	0, 510000, 115200, 0xb49e9b4e
194	194	1, 513600, 8064, 0x37ec8b0a
@@ -196,5 +196,5 @@ · 1 unmodified line
196	196	1, 518400, 8064, 0xe4354221
197	197	0, 522000, 115200, 0x65f3339a
198	198	1, 523200, 8064, 0xc0d91cdb
199		−1, 528000, 8064, 0xea0be175
200	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	27	0, 225000, 230400, 0x76aebdae
28	28	0, 234000, 230400, 0x81357545
29	29	0, 243000, 230400, 0x38baeebd
30		−1, 252000, 4410, 0x109d04e0
31	30	0, 252000, 230400, 0x1c5c44d4
32		−1, 261000, 4410, 0x224d244f
	31	+1, 252000, 4410, 0x109d04e0
33	32	0, 261000, 230400, 0x60e189cc
34		−1, 270000, 4410, 0xbb72413d
	33	+1, 261000, 4410, 0x224d244f
35	34	0, 270000, 230400, 0xb1f4381c
36		−1, 279000, 4410, 0xaa5f5b86
	35	+1, 270000, 4410, 0xbb72413d
37	36	0, 279000, 230400, 0xb5048fed
38		−1, 288000, 4410, 0x94e7aea7
	37	+1, 279000, 4410, 0xaa5f5b86
39	38	0, 288000, 230400, 0xc947c30e
40		−1, 297000, 4410, 0xad497ca0
	39	+1, 288000, 4410, 0x94e7aea7
41	40	0, 297000, 230400, 0xe8e31c07
42		−1, 306000, 4410, 0x1de10c9e
	41	+1, 297000, 4410, 0xad497ca0
43	42	0, 306000, 230400, 0x6d49dd02
44		−1, 315000, 4410, 0x9f55efa8
	43	+1, 306000, 4410, 0x1de10c9e
45	44	0, 315000, 230400, 0x293e15d3
46		−1, 324000, 4410, 0x220a072a
	45	+1, 315000, 4410, 0x9f55efa8
47	46	0, 324000, 230400, 0x354d792e
48		−1, 333000, 4410, 0xa7dafb29
	47	+1, 324000, 4410, 0x220a072a
49	48	0, 333000, 230400, 0x35468780
50		−1, 342000, 4410, 0xd5e29c7a
	49	+1, 333000, 4410, 0xa7dafb29
51	50	0, 342000, 230400, 0x365d3991
52		−1, 351000, 4410, 0xb8465006
	51	+1, 342000, 4410, 0xd5e29c7a
53	52	0, 351000, 230400, 0xc9debef2
54		−1, 360000, 4410, 0x518669c7
	53	+1, 351000, 4410, 0xb8465006
55	54	0, 360000, 230400, 0x4c4634c2
56		−1, 369000, 4410, 0xb5b5efca
	55	+1, 360000, 4410, 0x518669c7
57	56	0, 369000, 230400, 0x347c2dca
58		−1, 378000, 4410, 0x8600015d
	57	+1, 369000, 4410, 0xb5b5efca
59	58	0, 378000, 230400, 0x1efa0aaa
60		−1, 387000, 4410, 0xe2f68fe9
	59	+1, 378000, 4410, 0x8600015d
61	60	0, 387000, 230400, 0xa79a0b5a
62		−1, 396000, 4410, 0x8d3458d9
	61	+1, 387000, 4410, 0xe2f68fe9
63	62	0, 396000, 230400, 0xfdb2dcdb
64		−1, 405000, 4410, 0xf1ff4775
	63	+1, 396000, 4410, 0x8d3458d9
65	64	0, 405000, 230400, 0x42dbea33
66		−1, 414000, 4410, 0x830f67c9
	65	+1, 405000, 4410, 0xf1ff4775
67	66	0, 414000, 230400, 0x2a207e43
68		−1, 423000, 4410, 0x110e0bc1
	67	+1, 414000, 4410, 0x830f67c9
69	68	0, 423000, 230400, 0x86573783
70		−1, 432000, 4410, 0x71682f47
	69	+1, 423000, 4410, 0x110e0bc1
71	70	0, 432000, 230400, 0xc3968473
72		−1, 441000, 4410, 0x38119095
	71	+1, 432000, 4410, 0x71682f47
73	72	0, 441000, 230400, 0x8f62a7b4
74		−1, 450000, 4410, 0xd2494db6
	73	+1, 441000, 4410, 0x38119095
75	74	0, 450000, 230400, 0x5a2e3073
76		−1, 459000, 4410, 0x8b552509
	75	+1, 450000, 4410, 0xd2494db6
77	76	0, 459000, 230400, 0xd24f5e2c
78		−1, 468000, 4410, 0x71e52909
	77	+1, 459000, 4410, 0x8b552509
79	78	0, 468000, 230400, 0x1df3c67d
80		−1, 477000, 4410, 0x9f0a6f4d
	79	+1, 468000, 4410, 0x71e52909
81	80	0, 477000, 230400, 0xe4fd884d
82		−1, 486000, 4410, 0x901302f2
	81	+1, 477000, 4410, 0x9f0a6f4d
83	82	0, 486000, 230400, 0x9a228555
84		−1, 495000, 4410, 0x855d5222
	83	+1, 486000, 4410, 0x901302f2
85	84	0, 495000, 230400, 0x9eba8ed5
86		−1, 504000, 4410, 0x324bb2fe
	85	+1, 495000, 4410, 0x855d5222
87	86	0, 504000, 230400, 0x3d808a3d
88		−1, 513000, 4410, 0xe85f583f
	87	+1, 504000, 4410, 0x324bb2fe
89	88	0, 513000, 230400, 0xf57e866d
90		−1, 522000, 4410, 0x2cbc67c4
	89	+1, 513000, 4410, 0xe85f583f
91	90	0, 522000, 230400, 0x85f594f5
92		−1, 531000, 4410, 0xc82e6aa1
	91	+1, 522000, 4410, 0x2cbc67c4
93	92	0, 531000, 230400, 0xb09f99dd
94		−1, 540000, 4410, 0xb9fc423c
	93	+1, 531000, 4410, 0xc82e6aa1
95	94	0, 540000, 230400, 0x2b368475
96		−1, 549000, 4410, 0x6b9b4ef9
	95	+1, 540000, 4410, 0xb9fc423c
97	96	0, 549000, 230400, 0xa2417afd
98		−1, 558000, 4410, 0x39290f10
	97	+1, 549000, 4410, 0x6b9b4ef9
99	98	0, 558000, 230400, 0x590b709d
100		−1, 567000, 4410, 0xad718eb4
	99	+1, 558000, 4410, 0x39290f10
101	100	0, 567000, 230400, 0x5d617705
102		−1, 576000, 4410, 0x82f463ac
	101	+1, 567000, 4410, 0xad718eb4
103	102	0, 576000, 230400, 0xabf981ad
104		−1, 585000, 4410, 0xfac87cac
	103	+1, 576000, 4410, 0x82f463ac
105	104	0, 585000, 230400, 0x5a8590cd
106		−1, 594000, 4410, 0x9e8bcca7
	105	+1, 585000, 4410, 0xfac87cac
107	106	0, 594000, 230400, 0x1bff853d
108		−1, 603000, 4410, 0x52f79c99
	107	+1, 594000, 4410, 0x9e8bcca7
109	108	0, 603000, 230400, 0x71d08055
110		−1, 612000, 4410, 0xf2d14de2
	109	+1, 603000, 4410, 0x52f79c99
111	110	0, 612000, 230400, 0x2ebd817d
112		−1, 621000, 4410, 0x367f95e1
	111	+1, 612000, 4410, 0xf2d14de2
113	112	0, 621000, 230400, 0x6e838255
114		−1, 630000, 4410, 0x8bfac293
	113	+1, 621000, 4410, 0x367f95e1
115	114	0, 630000, 230400, 0x043984cd
116		−1, 639000, 4410, 0x01ea5040
	115	+1, 630000, 4410, 0x8bfac293
117	116	0, 639000, 230400, 0x7ff18495
118		−1, 648000, 4410, 0x8ff5e212
	117	+1, 639000, 4410, 0x01ea5040
119	118	0, 648000, 230400, 0xa43b8385
120		−1, 657000, 4410, 0x93f32824
	119	+1, 648000, 4410, 0x8ff5e212
121	120	0, 657000, 230400, 0x72b5825d
122		−1, 666000, 4410, 0x998f90dc
	121	+1, 657000, 4410, 0x93f32824
123	122	0, 666000, 230400, 0x3a178085
124		−1, 675000, 4410, 0x65231170
	123	+1, 666000, 4410, 0x998f90dc
125	124	0, 675000, 230400, 0x67748245
126		−1, 684000, 4410, 0xc79039a1
	125	+1, 675000, 4410, 0x65231170
127	126	0, 684000, 230400, 0xeddf81d5
128		−1, 693000, 4410, 0x0b0e58bd
	127	+1, 684000, 4410, 0xc79039a1
129	128	0, 693000, 230400, 0x8b088665
130		−1, 702000, 4410, 0xc24ab4fa
	129	+1, 693000, 4410, 0x0b0e58bd
131	130	0, 702000, 230400, 0x6c408e15
132		−1, 711000, 4410, 0xd3796a8e
	131	+1, 702000, 4410, 0xc24ab4fa
133	132	0, 711000, 230400, 0x81f196dd
134		−1, 720000, 4410, 0xa37f8295
	133	+1, 711000, 4410, 0xd3796a8e
135	134	0, 720000, 230400, 0xab9f953d
136		−1, 729000, 4410, 0xb760fed7
	135	+1, 720000, 4410, 0xa37f8295
137	136	0, 729000, 230400, 0xa5f69795
138		−1, 738000, 4410, 0x05495a34
	137	+1, 729000, 4410, 0xb760fed7
139	138	0, 738000, 230400, 0xa772950d
140		−1, 747000, 4410, 0x6f203437
	139	+1, 738000, 4410, 0x05495a34
141	140	0, 747000, 230400, 0x6a5596d5
142		−1, 756000, 4410, 0x71299402
	141	+1, 747000, 4410, 0x6f203437
143	142	0, 756000, 230400, 0x1355958d
144		−1, 765000, 4410, 0x72e7b346
	143	+1, 756000, 4410, 0x71299402
145	144	0, 765000, 230400, 0x4134981d
146		−1, 774000, 4410, 0x879b0dae
	145	+1, 765000, 4410, 0x72e7b346
147	146	0, 774000, 230400, 0x8b929515
148		−1, 783000, 4410, 0x041aa1bd
	147	+1, 774000, 4410, 0x879b0dae
149	148	0, 783000, 230400, 0x482f95c5
150		−1, 792000, 4410, 0x18a962e6
	149	+1, 783000, 4410, 0x041aa1bd
151	150	0, 792000, 230400, 0x7a9795d5
152		−1, 801000, 4410, 0x21d20539
	151	+1, 792000, 4410, 0x18a962e6
153	152	0, 801000, 230400, 0x21c29abd
154		−1, 810000, 4410, 0x8f449267
	153	+1, 801000, 4410, 0x21d20539
155	154	0, 810000, 230400, 0x9ae6a475
156		−1, 819000, 4410, 0xecdc01d6
	155	+1, 810000, 4410, 0x8f449267
157	156	0, 819000, 230400, 0x3734aee5
158		−1, 828000, 4410, 0x458abd5a
	157	+1, 819000, 4410, 0xecdc01d6
159	158	0, 828000, 230400, 0xa0a1b365
160		−1, 837000, 4410, 0xa070ea63
	159	+1, 828000, 4410, 0x458abd5a
161	160	0, 837000, 230400, 0x2dcab1c5
162		−1, 846000, 4410, 0xc25b26ce
	161	+1, 837000, 4410, 0xa070ea63
163	162	0, 846000, 230400, 0x9c8b6c44
164		−1, 855000, 4410, 0x4d9237ca
	163	+1, 846000, 4410, 0xc25b26ce
165	164	0, 855000, 230400, 0x5da75feb
166		−1, 864000, 4410, 0x748e1801
	165	+1, 855000, 4410, 0x4d9237ca
167	166	0, 864000, 230400, 0x4d02f8e3
168		−1, 873000, 4410, 0xc96b69e6
	167	+1, 864000, 4410, 0x748e1801
169	168	0, 873000, 230400, 0x66824f3a
170		−1, 882000, 4410, 0x6663186c
	169	+1, 873000, 4410, 0xc96b69e6
171	170	0, 882000, 230400, 0x0c9257e2
172		−1, 891000, 4410, 0x7f6d3081
	171	+1, 882000, 4410, 0x6663186c
173	172	0, 891000, 230400, 0xb2927092
174		−1, 900000, 4410, 0x1a0343b5
	173	+1, 891000, 4410, 0x7f6d3081
175	174	0, 900000, 230400, 0xb5dc6e9a
176		−1, 909000, 4410, 0xc48e338c
	175	+1, 900000, 4410, 0x1a0343b5
177	176	0, 909000, 230400, 0x6e567bc6
178		−1, 918000, 4410, 0x26fc03c8
	177	+1, 909000, 4410, 0xc48e338c
179	178	0, 918000, 230400, 0xbf9e0f7a
180		−1, 927000, 4410, 0x69be7e2d
	179	+1, 918000, 4410, 0x26fc03c8
181	180	0, 927000, 230400, 0xb16f684a
182		−1, 936000, 4410, 0x69a74da1
	181	+1, 927000, 4410, 0x69be7e2d
183	182	0, 936000, 230400, 0xf9e55e81
184		−1, 945000, 4410, 0x85bd2ab3
	183	+1, 936000, 4410, 0x69a74da1
185	184	0, 945000, 230400, 0xd8d0bcba
186		−1, 954000, 4410, 0xeff05426
	185	+1, 945000, 4410, 0x85bd2ab3
187	186	0, 954000, 230400, 0x44720ac0
188		−1, 963000, 4410, 0x292829e0
	187	+1, 954000, 4410, 0xeff05426
189	188	0, 963000, 230400, 0x7d4c2058
190		−1, 972000, 4410, 0x8f741798
	189	+1, 963000, 4410, 0x292829e0
191	190	0, 972000, 230400, 0xb0973eb9
192		−1, 981000, 4410, 0x6b9337e9
	191	+1, 972000, 4410, 0x8f741798
193	192	0, 981000, 230400, 0x405a13ce
194		−1, 990000, 4410, 0xe4e1703f
	193	+1, 981000, 4410, 0x6b9337e9
195	194	0, 990000, 230400, 0x6422f00a
196		−1, 999000, 4410, 0x043d6c35
	195	+1, 990000, 4410, 0xe4e1703f
197	196	0, 999000, 230400, 0x924b6c1e
198		−1, 1008000, 4410, 0x3a8988e7
	197	+1, 999000, 4410, 0x043d6c35
199	198	0, 1008000, 230400, 0xcf7809c0
200		−1, 1017000, 4410, 0x1fa7d2a9
	199	+1, 1008000, 4410, 0x3a8988e7
201	200	0, 1017000, 230400, 0x883a3863
202		−1, 1026000, 4410, 0xe28799e3
	201	+1, 1017000, 4410, 0x1fa7d2a9
203	202	0, 1026000, 230400, 0x6adc9e03
204		−1, 1035000, 4410, 0xc2df4470
	203	+1, 1026000, 4410, 0xe28799e3
205	204	0, 1035000, 230400, 0x4f5ab7a8
206		−1, 1044000, 4410, 0x694d0cf5
	205	+1, 1035000, 4410, 0xc2df4470
207	206	0, 1044000, 230400, 0xdc0aab94
	207	+1, 1044000, 4410, 0x694d0cf5
208	208	1, 1053000, 4410, 0x5aac2dcf
209	209	1, 1062000, 4410, 0x259fa2db
210	210	1, 1071000, 4410, 0xd16d6803

tests/ref/fate/siff+3−3

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/ref/lavf/gxf+1−1

@@ -1,3 +1,3 @@
1	1	346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf
2	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	1	dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg
2	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	1	785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf
2	2	525881 ./tests/data/lavf/lavf.mxf
3		−./tests/data/lavf/lavf.mxf CRC=0xb6aa0849
	3	+./tests/data/lavf/lavf.mxf CRC=0x4ace0849
4	4	b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10
5	5	5330989 ./tests/data/lavf/lavf.mxf_d10
6	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