Merge remote-tracking branch 'qatar/master'

* qatar/master: avcodec: add a cook parser to get subpacket duration FATE: allow lavf tests to alter input parameters FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test FATE: replace the acodec-g726 test with 4 new encode/decode tests FATE: replace current g722 encoding tests with an encode/decode test FATE: add a pattern rule for generating asynth wav files FATE: optionally write a WAVE header in audiogen avutil: add audio fifo buffer Conflicts: doc/APIchanges libavcodec/version.h libavutil/avutil.h tests/Makefile tests/codec-regression.sh tests/fate/voice.mak tests/lavf-regression.sh tests/ref/acodec/g722 tests/ref/acodec/g726 tests/ref/acodec/pcm_s24daud tests/ref/lavf/dv_fmt tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/seek/lavf_dv

Michael Niedermayer committed 14 years ago

Commit 3194ab72 parents 9b1f776 b0e9edc32 files · +536 −146Browse files

Unified · Split

32 files

doc/APIchanges +12 −0
libavcodec/Makefile +1 −0
libavcodec/allcodecs.c +1 −0
libavcodec/cook_parser.c +59 −0
libavcodec/version.h +2 −2
libavformat/daud.c +1 −1
libavformat/rmdec.c +1 −0
libavutil/Makefile +2 −0
libavutil/audio_fifo.c +193 −0
libavutil/audio_fifo.h +146 −0
libavutil/avutil.h +1 −1
tests/Makefile +4 −1
tests/audiogen.c +48 −8
tests/codec-regression.sh +0 −13
tests/fate/pcm.mak +5 −0
tests/fate/voice.mak +31 −4
tests/lavf-regression.sh +17 −17
tests/ref/acodec/g722 +0 −4
tests/ref/acodec/g726 +0 −4
tests/ref/acodec/pcm_s24daud +0 −4
tests/ref/fate/dcinema-encode +1 −0
tests/ref/fate/g722-encode +1 −0
tests/ref/fate/g722enc +0 −1
tests/ref/fate/g726-encode-2bit +1 −0
tests/ref/fate/g726-encode-3bit +1 −0
tests/ref/fate/g726-encode-4bit +1 −0
tests/ref/fate/g726-encode-5bit +1 −0
tests/ref/lavf/dv_fmt +2 −2
tests/ref/lavf/gxf +2 −2
tests/ref/lavf/mxf_d10 +2 −2
tests/ref/seek/g726_wav +0 −53
tests/ref/seek/pcm_s24daud_302 +0 −27

doc/APIchanges+12−0

@@ -22,6 +22,18 @@ API changes, most recent first: · 21 unmodified lines
22	22	2012-03-26 - a67d9cf - lavfi 2.66.100
23	23	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
24	24
	25	+2012-xx-xx - xxxxxxx - lavu 51.28.0 - audio_fifo.h
	26	+ Add audio FIFO functions:
	27	+ av_audio_fifo_free()
	28	+ av_audio_fifo_alloc()
	29	+ av_audio_fifo_realloc()
	30	+ av_audio_fifo_write()
	31	+ av_audio_fifo_read()
	32	+ av_audio_fifo_drain()
	33	+ av_audio_fifo_reset()
	34	+ av_audio_fifo_size()
	35	+ av_audio_fifo_space()
	36	+
25	37	2012-xx-xx - xxxxxxx - lavfi 2.16.0 - avfiltergraph.h
26	38	Add avfilter_graph_parse2()
27	39

libavcodec/Makefile+1−0

@@ -679,6 +679,7 @@ OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o \ · 678 unmodified lines
679	679	aac_ac3_parser.o
680	680	OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o
681	681	OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o
	682	+OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o
682	683	OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o
683	684	OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o
684	685	OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o

libavcodec/allcodecs.c+1−0

@@ -437,6 +437,7 @@ void avcodec_register_all(void) · 436 unmodified lines
437	437	REGISTER_PARSER (AC3, ac3);
438	438	REGISTER_PARSER (ADX, adx);
439	439	REGISTER_PARSER (CAVSVIDEO, cavsvideo);
	440	+ REGISTER_PARSER (COOK, cook);
440	441	REGISTER_PARSER (DCA, dca);
441	442	REGISTER_PARSER (DIRAC, dirac);
442	443	REGISTER_PARSER (DNXHD, dnxhd);

libavcodec/cook_parser.c+59−0

@@ -0,0 +1,59 @@
	1	+/*
	2	+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
	3	+ *
	4	+ * This file is part of Libav.
	5	+ *
	6	+ * Libav is free software; you can redistribute it and/or
	7	+ * modify it under the terms of the GNU Lesser General Public
	8	+ * License as published by the Free Software Foundation; either
	9	+ * version 2.1 of the License, or (at your option) any later version.
	10	+ *
	11	+ * Libav is distributed in the hope that it will be useful,
	12	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	+ * Lesser General Public License for more details.
	15	+ *
	16	+ * You should have received a copy of the GNU Lesser General Public
	17	+ * License along with Libav; if not, write to the Free Software
	18	+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	19	+ */
	20	+
	21	+/**
	22	+ * @file
	23	+ * Cook audio parser
	24	+ *
	25	+ * Determines subpacket duration from extradata.
	26	+ */
	27	+
	28	+#include <stdint.h>
	29	+
	30	+#include "libavutil/intreadwrite.h"
	31	+#include "parser.h"
	32	+
	33	+typedef struct CookParseContext {
	34	+ int duration;
	35	+} CookParseContext;
	36	+
	37	+static int cook_parse(AVCodecParserContext s1, AVCodecContext avctx,
	38	+ const uint8_t *poutbuf, int poutbuf_size,
	39	+ const uint8_t *buf, int buf_size)
	40	+{
	41	+ CookParseContext *s = s1->priv_data;
	42	+
	43	+ if (s->duration)
	44	+ s1->duration = s->duration;
	45	+ else if (avctx->extradata && avctx->extradata_size >= 8 && avctx->channels)
	46	+ s->duration = AV_RB16(avctx->extradata + 4) / avctx->channels;
	47	+
	48	+ /* always return the full packet. this parser isn't doing any splitting or
	49	+ combining, only setting packet duration */
	50	+ *poutbuf = buf;
	51	+ *poutbuf_size = buf_size;
	52	+ return buf_size;
	53	+}
	54	+
	55	+AVCodecParser ff_cook_parser = {
	56	+ .codec_ids = { CODEC_ID_COOK },
	57	+ .priv_data_size = sizeof(CookParseContext),
	58	+ .parser_parse = cook_parse,
	59	+};

libavcodec/version.h+2−2

@@ -27,8 +27,8 @@ · 26 unmodified lines
27	27	*/
28	28
29	29	#define LIBAVCODEC_VERSION_MAJOR 54
30		−#define LIBAVCODEC_VERSION_MINOR 14
31		−#define LIBAVCODEC_VERSION_MICRO 101
	30	+#define LIBAVCODEC_VERSION_MINOR 15
	31	+#define LIBAVCODEC_VERSION_MICRO 100
32	32
33	33	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
34	34	LIBAVCODEC_VERSION_MINOR, \

libavformat/daud.c+1−1

@@ -75,7 +75,7 @@ AVInputFormat ff_daud_demuxer = { · 74 unmodified lines
75	75	.long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
76	76	.read_header = daud_header,
77	77	.read_packet = daud_packet,
78		− .extensions = "302",
	78	+ .extensions = "302,daud",
79	79	};
80	80	#endif
81	81

libavformat/rmdec.c+1−0

@@ -205,6 +205,7 @@ static int rm_read_audio_stream_info(AVFormatContext s, AVIOContext pb, · 204 unmodified lines
205	205	st->codec->block_align = coded_framesize;
206	206	break;
207	207	case CODEC_ID_COOK:
	208	+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
208	209	case CODEC_ID_ATRAC3:
209	210	case CODEC_ID_SIPR:
210	211	avio_rb16(pb); avio_r8(pb);

libavutil/Makefile+2−0

@@ -5,6 +5,7 @@ NAME = avutil · 4 unmodified lines
5	5	HEADERS = adler32.h \
6	6	aes.h \
7	7	attributes.h \
	8	+ audio_fifo.h \
8	9	audioconvert.h \
9	10	avassert.h \
10	11	avstring.h \
@@ -45,6 +46,7 @@ BUILT_HEADERS = avconfig.h · 34 unmodified lines
45	46
46	47	OBJS = adler32.o \
47	48	aes.o \
	49	+ audio_fifo.o \
48	50	audioconvert.o \
49	51	avstring.o \
50	52	base64.o \

libavutil/audio_fifo.c+193−0

@@ -0,0 +1,193 @@
	1	+/*
	2	+ * Audio FIFO
	3	+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
	4	+ *
	5	+ * This file is part of Libav.
	6	+ *
	7	+ * Libav is free software; you can redistribute it and/or
	8	+ * modify it under the terms of the GNU Lesser General Public
	9	+ * License as published by the Free Software Foundation; either
	10	+ * version 2.1 of the License, or (at your option) any later version.
	11	+ *
	12	+ * Libav is distributed in the hope that it will be useful,
	13	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	14	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	15	+ * Lesser General Public License for more details.
	16	+ *
	17	+ * You should have received a copy of the GNU Lesser General Public
	18	+ * License along with Libav; if not, write to the Free Software
	19	+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ */
	21	+
	22	+/**
	23	+ * @file
	24	+ * Audio FIFO
	25	+ */
	26	+
	27	+#include "avutil.h"
	28	+#include "audio_fifo.h"
	29	+#include "fifo.h"
	30	+#include "mem.h"
	31	+#include "samplefmt.h"
	32	+
	33	+struct AVAudioFifo {
	34	+ AVFifoBuffer buf; /< single buffer for interleaved, per-channel buffers for planar */
	35	+ int nb_buffers; /*< number of buffers /
	36	+ int nb_samples; /*< number of samples currently in the FIFO /
	37	+ int allocated_samples; /*< current allocated size, in samples /
	38	+
	39	+ int channels; /*< number of channels /
	40	+ enum AVSampleFormat sample_fmt; /*< sample format /
	41	+ int sample_size; /*< size, in bytes, of one sample in a buffer /
	42	+};
	43	+
	44	+void av_audio_fifo_free(AVAudioFifo *af)
	45	+{
	46	+ if (af) {
	47	+ if (af->buf) {
	48	+ int i;
	49	+ for (i = 0; i < af->nb_buffers; i++) {
	50	+ if (af->buf[i])
	51	+ av_fifo_free(af->buf[i]);
	52	+ }
	53	+ av_free(af->buf);
	54	+ }
	55	+ av_free(af);
	56	+ }
	57	+}
	58	+
	59	+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
	60	+ int nb_samples)
	61	+{
	62	+ AVAudioFifo *af;
	63	+ int buf_size, i;
	64	+
	65	+ /* get channel buffer size (also validates parameters) */
	66	+ if (av_samples_get_buffer_size(&buf_size, channels, nb_samples, sample_fmt, 1) < 0)
	67	+ return NULL;
	68	+
	69	+ af = av_mallocz(sizeof(*af));
	70	+ if (!af)
	71	+ return NULL;
	72	+
	73	+ af->channels = channels;
	74	+ af->sample_fmt = sample_fmt;
	75	+ af->sample_size = buf_size / nb_samples;
	76	+ af->nb_buffers = av_sample_fmt_is_planar(sample_fmt) ? channels : 1;
	77	+
	78	+ af->buf = av_mallocz(af->nb_buffers * sizeof(*af->buf));
	79	+ if (!af->buf)
	80	+ goto error;
	81	+
	82	+ for (i = 0; i < af->nb_buffers; i++) {
	83	+ af->buf[i] = av_fifo_alloc(buf_size);
	84	+ if (!af->buf[i])
	85	+ goto error;
	86	+ }
	87	+ af->allocated_samples = nb_samples;
	88	+
	89	+ return af;
	90	+
	91	+error:
	92	+ av_audio_fifo_free(af);
	93	+ return NULL;
	94	+}
	95	+
	96	+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples)
	97	+{
	98	+ int i, ret, buf_size;
	99	+
	100	+ if ((ret = av_samples_get_buffer_size(&buf_size, af->channels, nb_samples,
	101	+ af->sample_fmt, 1)) < 0)
	102	+ return ret;
	103	+
	104	+ for (i = 0; i < af->nb_buffers; i++) {
	105	+ if ((ret = av_fifo_realloc2(af->buf[i], buf_size)) < 0)
	106	+ return ret;
	107	+ }
	108	+ af->allocated_samples = nb_samples;
	109	+ return 0;
	110	+}
	111	+
	112	+int av_audio_fifo_write(AVAudioFifo af, void *data, int nb_samples)
	113	+{
	114	+ int i, ret, size;
	115	+
	116	+ /* automatically reallocate buffers if needed */
	117	+ if (av_audio_fifo_space(af) < nb_samples) {
	118	+ int current_size = av_audio_fifo_size(af);
	119	+ /* check for integer overflow in new size calculation */
	120	+ if (INT_MAX / 2 - current_size < nb_samples)
	121	+ return AVERROR(EINVAL);
	122	+ /* reallocate buffers */
	123	+ if ((ret = av_audio_fifo_realloc(af, 2 * (current_size + nb_samples))) < 0)
	124	+ return ret;
	125	+ }
	126	+
	127	+ size = nb_samples * af->sample_size;
	128	+ for (i = 0; i < af->nb_buffers; i++) {
	129	+ ret = av_fifo_generic_write(af->buf[i], data[i], size, NULL);
	130	+ if (ret != size)
	131	+ return AVERROR_BUG;
	132	+ }
	133	+ af->nb_samples += nb_samples;
	134	+
	135	+ return nb_samples;
	136	+}
	137	+
	138	+int av_audio_fifo_read(AVAudioFifo af, void *data, int nb_samples)
	139	+{
	140	+ int i, ret, size;
	141	+
	142	+ if (nb_samples < 0)
	143	+ return AVERROR(EINVAL);
	144	+ nb_samples = FFMIN(nb_samples, af->nb_samples);
	145	+ if (!nb_samples)
	146	+ return 0;
	147	+
	148	+ size = nb_samples * af->sample_size;
	149	+ for (i = 0; i < af->nb_buffers; i++) {
	150	+ if ((ret = av_fifo_generic_read(af->buf[i], data[i], size, NULL)) < 0)
	151	+ return AVERROR_BUG;
	152	+ }
	153	+ af->nb_samples -= nb_samples;
	154	+
	155	+ return nb_samples;
	156	+}
	157	+
	158	+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples)
	159	+{
	160	+ int i, size;
	161	+
	162	+ if (nb_samples < 0)
	163	+ return AVERROR(EINVAL);
	164	+ nb_samples = FFMIN(nb_samples, af->nb_samples);
	165	+
	166	+ if (nb_samples) {
	167	+ size = nb_samples * af->sample_size;
	168	+ for (i = 0; i < af->nb_buffers; i++)
	169	+ av_fifo_drain(af->buf[i], size);
	170	+ af->nb_samples -= nb_samples;
	171	+ }
	172	+ return 0;
	173	+}
	174	+
	175	+void av_audio_fifo_reset(AVAudioFifo *af)
	176	+{
	177	+ int i;
	178	+
	179	+ for (i = 0; i < af->nb_buffers; i++)
	180	+ av_fifo_reset(af->buf[i]);
	181	+
	182	+ af->nb_samples = 0;
	183	+}
	184	+
	185	+int av_audio_fifo_size(AVAudioFifo *af)
	186	+{
	187	+ return af->nb_samples;
	188	+}
	189	+
	190	+int av_audio_fifo_space(AVAudioFifo *af)
	191	+{
	192	+ return af->allocated_samples - af->nb_samples;
	193	+}

libavutil/audio_fifo.h+146−0

@@ -0,0 +1,146 @@
	1	+/*
	2	+ * Audio FIFO
	3	+ * Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
	4	+ *
	5	+ * This file is part of Libav.
	6	+ *
	7	+ * Libav is free software; you can redistribute it and/or
	8	+ * modify it under the terms of the GNU Lesser General Public
	9	+ * License as published by the Free Software Foundation; either
	10	+ * version 2.1 of the License, or (at your option) any later version.
	11	+ *
	12	+ * Libav is distributed in the hope that it will be useful,
	13	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	14	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	15	+ * Lesser General Public License for more details.
	16	+ *
	17	+ * You should have received a copy of the GNU Lesser General Public
	18	+ * License along with Libav; if not, write to the Free Software
	19	+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ */
	21	+
	22	+/**
	23	+ * @file
	24	+ * Audio FIFO Buffer
	25	+ */
	26	+
	27	+#ifndef AVUTIL_AUDIO_FIFO_H
	28	+#define AVUTIL_AUDIO_FIFO_H
	29	+
	30	+#include "avutil.h"
	31	+#include "fifo.h"
	32	+#include "samplefmt.h"
	33	+
	34	+/**
	35	+ * @addtogroup lavu_audio
	36	+ * @{
	37	+ */
	38	+
	39	+/**
	40	+ * Context for an Audio FIFO Buffer.
	41	+ *
	42	+ * - Operates at the sample level rather than the byte level.
	43	+ * - Supports multiple channels with either planar or packed sample format.
	44	+ * - Automatic reallocation when writing to a full buffer.
	45	+ */
	46	+typedef struct AVAudioFifo AVAudioFifo;
	47	+
	48	+/**
	49	+ * Free an AVAudioFifo.
	50	+ *
	51	+ * @param af AVAudioFifo to free
	52	+ */
	53	+void av_audio_fifo_free(AVAudioFifo *af);
	54	+
	55	+/**
	56	+ * Allocate an AVAudioFifo.
	57	+ *
	58	+ * @param sample_fmt sample format
	59	+ * @param channels number of channels
	60	+ * @param nb_samples initial allocation size, in samples
	61	+ * @return newly allocated AVAudioFifo, or NULL on error
	62	+ */
	63	+AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels,
	64	+ int nb_samples);
	65	+
	66	+/**
	67	+ * Reallocate an AVAudioFifo.
	68	+ *
	69	+ * @param af AVAudioFifo to reallocate
	70	+ * @param nb_samples new allocation size, in samples
	71	+ * @return 0 if OK, or negative AVERROR code on failure
	72	+ */
	73	+int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples);
	74	+
	75	+/**
	76	+ * Write data to an AVAudioFifo.
	77	+ *
	78	+ * The AVAudioFifo will be reallocated automatically if the available space
	79	+ * is less than nb_samples.
	80	+ *
	81	+ * @see enum AVSampleFormat
	82	+ * The documentation for AVSampleFormat describes the data layout.
	83	+ *
	84	+ * @param af AVAudioFifo to write to
	85	+ * @param data audio data plane pointers
	86	+ * @param nb_samples number of samples to write
	87	+ * @return number of samples actually written, or negative AVERROR
	88	+ * code on failure.
	89	+ */
	90	+int av_audio_fifo_write(AVAudioFifo af, void *data, int nb_samples);
	91	+
	92	+/**
	93	+ * Read data from an AVAudioFifo.
	94	+ *
	95	+ * @see enum AVSampleFormat
	96	+ * The documentation for AVSampleFormat describes the data layout.
	97	+ *
	98	+ * @param af AVAudioFifo to read from
	99	+ * @param data audio data plane pointers
	100	+ * @param nb_samples number of samples to read
	101	+ * @return number of samples actually read, or negative AVERROR code
	102	+ * on failure.
	103	+ */
	104	+int av_audio_fifo_read(AVAudioFifo af, void *data, int nb_samples);
	105	+
	106	+/**
	107	+ * Drain data from an AVAudioFifo.
	108	+ *
	109	+ * Removes the data without reading it.
	110	+ *
	111	+ * @param af AVAudioFifo to drain
	112	+ * @param nb_samples number of samples to drain
	113	+ * @return 0 if OK, or negative AVERROR code on failure
	114	+ */
	115	+int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples);
	116	+
	117	+/**
	118	+ * Reset the AVAudioFifo buffer.
	119	+ *
	120	+ * This empties all data in the buffer.
	121	+ *
	122	+ * @param af AVAudioFifo to reset
	123	+ */
	124	+void av_audio_fifo_reset(AVAudioFifo *af);
	125	+
	126	+/**
	127	+ * Get the current number of samples in the AVAudioFifo available for reading.
	128	+ *
	129	+ * @param af the AVAudioFifo to query
	130	+ * @return number of samples available for reading
	131	+ */
	132	+int av_audio_fifo_size(AVAudioFifo *af);
	133	+
	134	+/**
	135	+ * Get the current number of samples in the AVAudioFifo available for writing.
	136	+ *
	137	+ * @param af the AVAudioFifo to query
	138	+ * @return number of samples available for writing
	139	+ */
	140	+int av_audio_fifo_space(AVAudioFifo *af);
	141	+
	142	+/**
	143	+ * @}
	144	+ */
	145	+
	146	+#endif /* AVUTIL_AUDIO_FIFO_H */

libavutil/avutil.h+1−1

@@ -153,7 +153,7 @@ · 152 unmodified lines
153	153	*/
154	154
155	155	#define LIBAVUTIL_VERSION_MAJOR 51
156		−#define LIBAVUTIL_VERSION_MINOR 46
	156	+#define LIBAVUTIL_VERSION_MINOR 47
157	157	#define LIBAVUTIL_VERSION_MICRO 100
158	158
159	159	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

tests/Makefile+4−1

@@ -29,6 +29,9 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) \| tests/data · 28 unmodified lines
29	29	tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) \| tests/data
30	30	$(M)./$< $@ 16000 1
31	31
	32	+tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) \| tests/data
	33	+ $(M)./$< $@ $(subst -, ,$*)
	34	+
32	35	tests/data/mapchan-6ch.sw: tests/audiogen$(HOSTEXESUF)
33	36	@mkdir -p tests/data
34	37	$(M)./$< $@ 22050 6
@@ -37,7 +40,7 @@ tests/data/mapchan-mono.sw: tests/audiogen$(HOSTEXESUF) · 2 unmodified lines
37	40	@mkdir -p tests/data
38	41	$(M)./$< $@ 22050 1
39	42
40		−tests/data/%.sw tests/vsynth%/00.pgm: TAG = GEN
	43	+tests/data/%.sw tests/data/asynth% tests/vsynth%/00.pgm: TAG = GEN
41	44
42	45	include $(SRC_PATH)/tests/fate/aac.mak
43	46	include $(SRC_PATH)/tests/fate/ac3.mak

tests/audiogen.c+48−8

@@ -22,7 +22,9 @@ · 21 unmodified lines
22	22	*/
23	23
24	24	#include <stdlib.h>
	25	+#include <stdint.h>
25	26	#include <stdio.h>
	27	+#include <string.h>
26	28
27	29	#define MAX_CHANNELS 8
28	30
@@ -93,12 +95,45 @@ static int int_cos(int a) · 64 unmodified lines
93	95
94	96	FILE *outfile;
95	97
96		−static void put_sample(int v)
	98	+static void put16(int16_t v)
97	99	{
98		− fputc(v & 0xff, outfile);
	100	+ fputc( v & 0xff, outfile);
99	101	fputc((v >> 8) & 0xff, outfile);
100	102	}
101	103
	104	+static void put32(uint32_t v)
	105	+{
	106	+ fputc( v & 0xff, outfile);
	107	+ fputc((v >> 8) & 0xff, outfile);
	108	+ fputc((v >> 16) & 0xff, outfile);
	109	+ fputc((v >> 24) & 0xff, outfile);
	110	+}
	111	+
	112	+#define HEADER_SIZE 46
	113	+#define FMT_SIZE 18
	114	+#define SAMPLE_SIZE 2
	115	+#define WFORMAT_PCM 0x0001
	116	+
	117	+static void put_wav_header(int sample_rate, int channels, int nb_samples)
	118	+{
	119	+ int block_align = SAMPLE_SIZE * channels;
	120	+ int data_size = block_align * nb_samples;
	121	+
	122	+ fputs("RIFF", outfile);
	123	+ put32(HEADER_SIZE + data_size);
	124	+ fputs("WAVEfmt ", outfile);
	125	+ put32(FMT_SIZE);
	126	+ put16(WFORMAT_PCM);
	127	+ put16(channels);
	128	+ put32(sample_rate);
	129	+ put32(block_align * sample_rate);
	130	+ put16(block_align);
	131	+ put16(SAMPLE_SIZE * 8);
	132	+ put16(0);
	133	+ fputs("data", outfile);
	134	+ put32(data_size);
	135	+}
	136	+
102	137	int main(int argc, char **argv)
103	138	{
104	139	int i, a, v, j, f, amp, ampa;
@@ -107,10 +142,12 @@ int main(int argc, char **argv) · 2 unmodified lines
107	142	int taba[MAX_CHANNELS];
108	143	int sample_rate = 44100;
109	144	int nb_channels = 2;
	145	+ char *ext;
110	146
111	147	if (argc < 2 \|\| argc > 4) {
112	148	printf("usage: %s file [<sample rate> [<channels>]]\n"
113	149	"generate a test raw 16 bit audio stream\n"
	150	+ "If the file extension is .wav a WAVE header will be added.\n"
114	151	"default: 44100 Hz stereo\n", argv[0]);
115	152	exit(1);
116	153	}
@@ -137,12 +174,15 @@ int main(int argc, char **argv) · 20 unmodified lines
137	174	return 1;
138	175	}
139	176
	177	+ if ((ext = strrchr(argv[1], '.')) != NULL && !strcmp(ext, ".wav"))
	178	+ put_wav_header(sample_rate, nb_channels, 6 * sample_rate);
	179	+
140	180	/* 1 second of single freq sinus at 1000 Hz */
141	181	a = 0;
142	182	for (i = 0; i < 1 * sample_rate; i++) {
143	183	v = (int_cos(a) * 10000) >> FRAC_BITS;
144	184	for (j = 0; j < nb_channels; j++)
145		− put_sample(v);
	185	+ put16(v);
146	186	a += (1000 * FRAC_ONE) / sample_rate;
147	187	}
148	188
@@ -151,7 +191,7 @@ int main(int argc, char **argv) · 2 unmodified lines
151	191	for (i = 0; i < 1 * sample_rate; i++) {
152	192	v = (int_cos(a) * 10000) >> FRAC_BITS;
153	193	for (j = 0; j < nb_channels; j++)
154		− put_sample(v);
	194	+ put16(v);
155	195	f = 100 + (((10000 - 100) * i) / sample_rate);
156	196	a += (f * FRAC_ONE) / sample_rate;
157	197	}
@@ -160,14 +200,14 @@ int main(int argc, char **argv) · 2 unmodified lines
160	200	for (i = 0; i < sample_rate / 2; i++) {
161	201	v = myrnd(&seed, 20000) - 10000;
162	202	for (j = 0; j < nb_channels; j++)
163		− put_sample(v);
	203	+ put16(v);
164	204	}
165	205
166	206	/* 0.5 second of high amplitude white noise */
167	207	for (i = 0; i < sample_rate / 2; i++) {
168	208	v = myrnd(&seed, 65535) - 32768;
169	209	for (j = 0; j < nb_channels; j++)
170		− put_sample(v);
	210	+ put16(v);
171	211	}
172	212
173	213	/* 1 second of unrelated ramps for each channel */
@@ -179,7 +219,7 @@ int main(int argc, char **argv) · 5 unmodified lines
179	219	for (i = 0; i < 1 * sample_rate; i++) {
180	220	for (j = 0; j < nb_channels; j++) {
181	221	v = (int_cos(taba[j]) * 10000) >> FRAC_BITS;
182		− put_sample(v);
	222	+ put16(v);
183	223	f = tabf1[j] + (((tabf2[j] - tabf1[j]) * i) / sample_rate);
184	224	taba[j] += (f * FRAC_ONE) / sample_rate;
185	225	}
@@ -194,7 +234,7 @@ int main(int argc, char **argv) · 8 unmodified lines
194	234	if (j & 1)
195	235	amp = 10000 - amp;
196	236	v = (int_cos(a) * amp) >> FRAC_BITS;
197		− put_sample(v);
	237	+ put16(v);
198	238	a += (500 * FRAC_ONE) / sample_rate;
199	239	ampa += (2 * FRAC_ONE) / sample_rate;
200	240	}

tests/codec-regression.sh+0−13

@@ -395,16 +395,6 @@ do_audio_encoding g723_1.tco "-b:a 6.3k -ac 1 -ar 8000 -acodec g723_1" · 394 unmodified lines
395	395	do_audio_decoding
396	396	fi
397	397
398		−if [ -n "$do_g722" ] ; then
399		−do_audio_encoding g722.wav "-b 64k -ac 1 -ar 16000 -acodec g722"
400		−do_audio_decoding
401		−fi
402		−
403		−if [ -n "$do_g726" ] ; then
404		−do_audio_encoding g726.wav "-b:a 32k -ac 1 -ar 8000 -acodec g726"
405		−do_audio_decoding
406		−fi
407		−
408	398	if [ -n "$do_adpcm_adx" ] ; then
409	399	do_audio_encoding adpcm_adx.adx "-acodec adpcm_adx"
410	400	do_audio_decoding
@@ -534,6 +524,3 @@ fi · 123 unmodified lines
534	524	if [ -n "$do_pcm_f64le" ] ; then
535	525	do_audio_enc_dec wav dbl pcm_f64le
536	526	fi
537		−if [ -n "$do_pcm_s24daud" ] ; then
538		−do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000"
539		−fi

tests/fate/pcm.mak+5−0

@@ -25,5 +25,10 @@ fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f · 24 unmodified lines
25	25	FATE_PCM += fate-w64
26	26	fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
27	27
	28	+FATE_PCM += fate-dcinema-encode
	29	+fate-dcinema-encode: tests/data/asynth-96000-6.wav
	30	+fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
	31	+fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud
	32	+
28	33	FATE_TESTS += $(FATE_PCM)
29	34	fate-pcm: $(FATE_PCM)

tests/fate/voice.mak+31−4

@@ -1,9 +1,36 @@
1		−FATE_VOICE += fate-g722dec-1
	1	+FATE_G722 += fate-g722dec-1
2	2	fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
3	3
4		−FATE_VOICE += fate-g722enc
5		−fate-g722enc: tests/data/asynth-16000-1.sw
6		−fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
	4	+FATE_G722 += fate-g722-encode
	5	+fate-g722-encode: tests/data/asynth-16000-1.wav
	6	+fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
	7	+fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
	8	+
	9	+FATE_VOICE += $(FATE_G722)
	10	+fate-g722: $(FATE_G722)
	11	+
	12	+FATE_G726 += fate-g726-encode-2bit
	13	+fate-g726-encode-2bit: tests/data/asynth-8000-1.wav
	14	+fate-g726-encode-2bit: SRC = tests/data/asynth-8000-1.wav
	15	+fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
	16	+
	17	+FATE_G726 += fate-g726-encode-3bit
	18	+fate-g726-encode-3bit: tests/data/asynth-8000-1.wav
	19	+fate-g726-encode-3bit: SRC = tests/data/asynth-8000-1.wav
	20	+fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k
	21	+
	22	+FATE_G726 += fate-g726-encode-4bit
	23	+fate-g726-encode-4bit: tests/data/asynth-8000-1.wav
	24	+fate-g726-encode-4bit: SRC = tests/data/asynth-8000-1.wav
	25	+fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k
	26	+
	27	+FATE_G726 += fate-g726-encode-5bit
	28	+fate-g726-encode-5bit: tests/data/asynth-8000-1.wav
	29	+fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav
	30	+fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
	31	+
	32	+FATE_VOICE += $(FATE_G726)
	33	+fate-g726: $(FATE_G726)
7	34
8	35	FATE_GSM += fate-gsm-ms
9	36	fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav

tests/lavf-regression.sh+17−17

@@ -24,18 +24,18 @@ do_lavf_fate() · 23 unmodified lines
24	24	do_lavf()
25	25	{
26	26	file=${outfile}lavf.$1
27		− do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $2
28		− do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
	27	+ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
	28	+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
29	29	}
30	30
31		−do_lavf_timecode_nodrop() { do_lavf $1 "$2 -timecode 02:56:14:13"; }
32		−do_lavf_timecode_drop() { do_lavf $1 "$2 -timecode 02:56:14.13 -r 30000/1001"; }
	31	+do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
	32	+do_lavf_timecode_drop() { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
33	33
34	34	do_lavf_timecode()
35	35	{
36	36	do_lavf_timecode_nodrop "$@"
37	37	do_lavf_timecode_drop "$@"
38		− do_lavf "$@"
	38	+ do_lavf $1 "" "$2"
39	39	}
40	40
41	41	do_streamed_images()
@@ -64,11 +64,11 @@ do_audio_only() · 22 unmodified lines
64	64	}
65	65
66	66	if [ -n "$do_avi" ] ; then
67		−do_lavf avi "-acodec mp2 -ab 64k"
	67	+do_lavf avi "" "-acodec mp2 -ab 64k"
68	68	fi
69	69
70	70	if [ -n "$do_asf" ] ; then
71		−do_lavf asf "-acodec mp2 -ab 64k" "-r 25"
	71	+do_lavf asf "" "-acodec mp2 -ab 64k" "-r 25"
72	72	fi
73	73
74	74	if [ -n "$do_rm" ] ; then
@@ -87,15 +87,15 @@ do_lavf_timecode mxf "-ar 48000 -bf 2" · 12 unmodified lines
87	87	fi
88	88
89	89	if [ -n "$do_mxf_d10" ]; then
90		−do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
	90	+do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
91	91	fi
92	92
93	93	if [ -n "$do_ts" ] ; then
94		−do_lavf ts "-ab 64k -mpegts_transport_stream_id 42"
	94	+do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42"
95	95	fi
96	96
97	97	if [ -n "$do_swf" ] ; then
98		−do_lavf swf -an
	98	+do_lavf swf "" "-an"
99	99	fi
100	100
101	101	if [ -n "$do_ffm" ] ; then
@@ -103,11 +103,11 @@ do_lavf ffm "-ab 64k" · 1 unmodified line
103	103	fi
104	104
105	105	if [ -n "$do_flv_fmt" ] ; then
106		−do_lavf flv -an
	106	+do_lavf flv "" "-an"
107	107	fi
108	108
109	109	if [ -n "$do_mov" ] ; then
110		−do_lavf mov "-movflags +rtphint -acodec pcm_alaw -vcodec mpeg4"
	110	+do_lavf mov "" "-movflags +rtphint -acodec pcm_alaw -vcodec mpeg4"
111	111	do_lavf_timecode mov "-acodec pcm_alaw -vcodec mpeg4"
112	112	fi
113	113
@@ -118,21 +118,21 @@ fi · 4 unmodified lines
118	118	if [ -n "$do_dv_fmt" ] ; then
119	119	do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2"
120	120	do_lavf_timecode_drop dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2"
121		−do_lavf dv "-ar 48000 -r 25 -s pal -ac 2"
	121	+do_lavf dv "-ar 48000" "-r 25 -s pal -ac 2"
122	122	fi
123	123
124	124	if [ -n "$do_gxf" ] ; then
125	125	do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1"
126	126	do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1"
127		−do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1"
	127	+do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
128	128	fi
129	129
130	130	if [ -n "$do_nut" ] ; then
131		−do_lavf nut "-acodec mp2 -ab 64k"
	131	+do_lavf nut "" "-acodec mp2 -ab 64k"
132	132	fi
133	133
134	134	if [ -n "$do_mkv" ] ; then
135		−do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4"
	135	+do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4"
136	136	fi
137	137
138	138	if [ -n "$do_mp3" ] ; then
@@ -150,7 +150,7 @@ do_lavf_fate ogg "vp3/coeff_level64.mkv" · 11 unmodified lines
150	150	fi
151	151
152	152	if [ -n "$do_wtv" ] ; then
153		−do_lavf wtv "-acodec mp2"
	153	+do_lavf wtv "" "-acodec mp2"
154	154	fi
155	155
156	156

tests/ref/acodec/g722+0−4

@@ -1,4 +0,0 @@
1		−e4d5ae038f29659c03fcf68818f7be6c *./tests/data/acodec/g722.wav
2		−48053 ./tests/data/acodec/g722.wav
3		−8dafe5b74ccd5f08fed2fb2a69c5475f *./tests/data/g722.acodec.out.wav
4		−stddev: 8939.47 PSNR: 17.30 MAXDIFF:40370 bytes: 191980/ 1058400

tests/ref/acodec/g726+0−4

@@ -1,4 +0,0 @@
1		−331fcf91f4483b508059d0933af97987 *./tests/data/acodec/g726.wav
2		−24054 ./tests/data/acodec/g726.wav
3		−fac563ba7947d8fc42b4af048707c145 *./tests/data/g726.acodec.out.wav
4		−stddev: 8553.69 PSNR: 17.69 MAXDIFF:29353 bytes: 95984/ 1058400

tests/ref/acodec/pcm_s24daud+0−4

@@ -1,4 +0,0 @@
1		−1b75d5198ae789ab3c48f7024e08f4a9 *./tests/data/acodec/pcm_s24daud.302
2		−10368730 ./tests/data/acodec/pcm_s24daud.302
3		−70ec0ba6bc151ddc7509c09804d95d3b *./tests/data/pcm_s24daud.acodec.out.wav
4		−stddev: 8967.92 PSNR: 17.28 MAXDIFF:42548 bytes: 6911796/ 1058400

tests/ref/fate/dcinema-encode+1−0

@@ -0,0 +1 @@
	1	+MD5=2d7c6897c315493647db159f4bfd6edc

tests/ref/fate/g722-encode+1−0

@@ -0,0 +1 @@
	1	+MD5=7106189574186051c0497b287e2e5f19

tests/ref/fate/g722enc+0−1

@@ -1 +0,0 @@
1		−94e2f200d6e05b47cec4aa3e94571cf3

tests/ref/fate/g726-encode-2bit+1−0

@@ -0,0 +1 @@
	1	+MD5=215eaef5778a16e2bf4f3725a557f355

tests/ref/fate/g726-encode-3bit+1−0

@@ -0,0 +1 @@
	1	+MD5=0bebd949dfd5ac0ae3f2c3ceb2e3fac1

tests/ref/fate/g726-encode-4bit+1−0

@@ -0,0 +1 @@
	1	+MD5=a21cfea116ab2179eabe5d84b6bfc09a

tests/ref/fate/g726-encode-5bit+1−0

@@ -0,0 +1 @@
	1	+MD5=9cad98cf5205bf76d6e9d1241e56141a

tests/ref/lavf/dv_fmt+2−2

@@ -4,6 +4,6 @@ · 3 unmodified lines
4	4	cc33ae4f9e6828914dea0f09d1241b7e *./tests/data/lavf/lavf.dv
5	5	3480000 ./tests/data/lavf/lavf.dv
6	6	./tests/data/lavf/lavf.dv CRC=0x8d5e9e8f
7		−3a6a9163a67b729b4a6b5d972ccceb97 *./tests/data/lavf/lavf.dv
	7	+b36c83cd0ba0ebe719f09f885c4bbcd3 *./tests/data/lavf/lavf.dv
8	8	3600000 ./tests/data/lavf/lavf.dv
9		−./tests/data/lavf/lavf.dv CRC=0x5ce4e5e4
	9	+./tests/data/lavf/lavf.dv CRC=0x2bc2ae3a

tests/ref/lavf/gxf+2−2

@@ -4,6 +4,6 @@ befc1a39c37a4ecd9264942a3e34b3f6 *./tests/data/lavf/lavf.gxf · 3 unmodified lines
4	4	267d2b2b6e357209d76c366302cf35c3 *./tests/data/lavf/lavf.gxf
5	5	794572 ./tests/data/lavf/lavf.gxf
6	6	./tests/data/lavf/lavf.gxf CRC=0xab47d02d
7		−1c1693cf2358025f1e37ac76e1da925a *./tests/data/lavf/lavf.gxf
	7	+0a1a37fa79b62435545271b4e8e882f5 *./tests/data/lavf/lavf.gxf
8	8	796392 ./tests/data/lavf/lavf.gxf
9		−./tests/data/lavf/lavf.gxf CRC=0x102918fd
	9	+./tests/data/lavf/lavf.gxf CRC=0x3b1a8e91

tests/ref/lavf/mxf_d10+2−2

@@ -1,3 +1,3 @@
1		−23177c8a72f34e243e9ffc4f6c70d3c7 *./tests/data/lavf/lavf.mxf_d10
	1	+0d72247067569901a2e351586ddc0b82 *./tests/data/lavf/lavf.mxf_d10
2	2	5330989 ./tests/data/lavf/lavf.mxf_d10
3		−./tests/data/lavf/lavf.mxf_d10 CRC=0x81602ff1
	3	+./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480

tests/ref/seek/g726_wav+0−53

@@ -1,53 +0,0 @@
1		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
2		−ret: 0 st:-1 flags:0 ts:-1.000000
3		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
4		−ret: 0 st:-1 flags:1 ts: 1.894167
5		−ret: 0 st: 0 flags:1 dts: 1.894000 pts: 1.894000 pos: 7634 size: 4096
6		−ret: 0 st: 0 flags:0 ts: 0.788375
7		−ret: 0 st: 0 flags:1 dts: 0.788500 pts: 0.788500 pos: 3212 size: 4096
8		−ret: 0 st: 0 flags:1 ts:-0.317500
9		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
10		−ret: 0 st:-1 flags:0 ts: 2.576668
11		−ret: 0 st: 0 flags:1 dts: 2.576750 pts: 2.576750 pos: 10365 size: 4096
12		−ret: 0 st:-1 flags:1 ts: 1.470835
13		−ret: 0 st: 0 flags:1 dts: 1.470750 pts: 1.470750 pos: 5941 size: 4096
14		−ret: 0 st: 0 flags:0 ts: 0.365000
15		−ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 1518 size: 4096
16		−ret: 0 st: 0 flags:1 ts:-0.740875
17		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
18		−ret: 0 st:-1 flags:0 ts: 2.153336
19		−ret: 0 st: 0 flags:1 dts: 2.153500 pts: 2.153500 pos: 8672 size: 4096
20		−ret: 0 st:-1 flags:1 ts: 1.047503
21		−ret: 0 st: 0 flags:1 dts: 1.047500 pts: 1.047500 pos: 4248 size: 4096
22		−ret: 0 st: 0 flags:0 ts:-0.058375
23		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
24		−ret: 0 st: 0 flags:1 ts: 2.835875
25		−ret: 0 st: 0 flags:1 dts: 2.835750 pts: 2.835750 pos: 11401 size: 4096
26		−ret: 0 st:-1 flags:0 ts: 1.730004
27		−ret: 0 st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 6978 size: 4096
28		−ret: 0 st:-1 flags:1 ts: 0.624171
29		−ret: 0 st: 0 flags:1 dts: 0.624000 pts: 0.624000 pos: 2554 size: 4096
30		−ret: 0 st: 0 flags:0 ts:-0.481625
31		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
32		−ret: 0 st: 0 flags:1 ts: 2.412500
33		−ret: 0 st: 0 flags:1 dts: 2.412500 pts: 2.412500 pos: 9708 size: 4096
34		−ret: 0 st:-1 flags:0 ts: 1.306672
35		−ret: 0 st: 0 flags:1 dts: 1.306750 pts: 1.306750 pos: 5285 size: 4096
36		−ret: 0 st:-1 flags:1 ts: 0.200839
37		−ret: 0 st: 0 flags:1 dts: 0.200750 pts: 0.200750 pos: 861 size: 4096
38		−ret: 0 st: 0 flags:0 ts:-0.905000
39		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
40		−ret: 0 st: 0 flags:1 ts: 1.989125
41		−ret: 0 st: 0 flags:1 dts: 1.989000 pts: 1.989000 pos: 8014 size: 4096
42		−ret: 0 st:-1 flags:0 ts: 0.883340
43		−ret: 0 st: 0 flags:1 dts: 0.883500 pts: 0.883500 pos: 3592 size: 4096
44		−ret: 0 st:-1 flags:1 ts:-0.222493
45		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096
46		−ret: 0 st: 0 flags:0 ts: 2.671625
47		−ret: 0 st: 0 flags:1 dts: 2.671750 pts: 2.671750 pos: 10745 size: 4096
48		−ret: 0 st: 0 flags:1 ts: 1.565875
49		−ret: 0 st: 0 flags:1 dts: 1.565750 pts: 1.565750 pos: 6321 size: 4096
50		−ret: 0 st:-1 flags:0 ts: 0.460008
51		−ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 1898 size: 4096
52		−ret: 0 st:-1 flags:1 ts:-0.645825
53		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 58 size: 4096

tests/ref/seek/pcm_s24daud_302+0−27

@@ -1,27 +0,0 @@
1		−ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4 size: 39816
2		−ret:-1 st:-1 flags:0 ts:-1.000000
3		−ret:-1 st:-1 flags:1 ts: 1.894167
4		−ret:-1 st: 0 flags:0 ts: 0.788333
5		−ret:-1 st: 0 flags:1 ts:-0.317500
6		−ret:-1 st:-1 flags:0 ts: 2.576668
7		−ret:-1 st:-1 flags:1 ts: 1.470835
8		−ret:-1 st: 0 flags:0 ts: 0.365000
9		−ret:-1 st: 0 flags:1 ts:-0.740833
10		−ret:-1 st:-1 flags:0 ts: 2.153336
11		−ret:-1 st:-1 flags:1 ts: 1.047503
12		−ret:-1 st: 0 flags:0 ts:-0.058333
13		−ret:-1 st: 0 flags:1 ts: 2.835833
14		−ret:-1 st:-1 flags:0 ts: 1.730004
15		−ret:-1 st:-1 flags:1 ts: 0.624171
16		−ret:-1 st: 0 flags:0 ts:-0.481667
17		−ret:-1 st: 0 flags:1 ts: 2.412500
18		−ret:-1 st:-1 flags:0 ts: 1.306672
19		−ret:-1 st:-1 flags:1 ts: 0.200839
20		−ret:-1 st: 0 flags:0 ts:-0.904989
21		−ret:-1 st: 0 flags:1 ts: 1.989178
22		−ret:-1 st:-1 flags:0 ts: 0.883340
23		−ret:-1 st:-1 flags:1 ts:-0.222493
24		−ret:-1 st: 0 flags:0 ts: 2.671678
25		−ret:-1 st: 0 flags:1 ts: 1.565844
26		−ret:-1 st:-1 flags:0 ts: 0.460008
27		−ret:-1 st:-1 flags:1 ts:-0.645825

Merge remote-tracking branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code