Commit c4ca21fc authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Moves opus_compare to the same base64 tar.gz as the rest of the code

parent 48069bf9
......@@ -26,7 +26,7 @@ pkginclude_HEADERS = src/opus.h src/opus_multistream.h celt/opus_types.h celt/op
noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD)
noinst_PROGRAMS = test_opus test_repacketizer
noinst_PROGRAMS = test_opus test_repacketizer opus_compare
test_opus_SOURCES = src/test_opus.c
......@@ -36,6 +36,9 @@ test_repacketizer_SOURCES = src/test_repacketizer.c
test_repacketizer_LDADD = libopus.la -lm
opus_compare_SOURCES = src/opus_compare.c
opus_compare_LDADD = -lm
if CUSTOM_MODES
pkginclude_HEADERS += celt/opus_custom.h
noinst_PROGRAMS += test_opus_custom
......
......@@ -97,6 +97,9 @@ OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(SRCS_C))
TESTOPUS_SRCS_C = src/test_opus.c
TESTOPUS_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUS_SRCS_C))
OPUSCOMPARE_SRCS_C = src/opus_compare.c
OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C))
LIBS = m
LDLIBDIRS = ./
......@@ -104,7 +107,7 @@ LDLIBDIRS = ./
# Rules
default: all
all: $(TARGET) lib test_opus
all: $(TARGET) lib test_opus opus_compare
lib: $(TARGET)
......@@ -114,5 +117,8 @@ $(TARGET): $(OBJS)
test_opus$(EXESUFFIX): $(TESTOPUS_OBJS) $(TARGET)
$(LINK.o.cmdline)
opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS)
$(LINK.o.cmdline)
clean:
rm -f test_opus$(EXESUFFIX) $(TARGET) $(OBJS) $(TESTOPUS_OBJS)
rm -f test_opus$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(TESTOPUS_OBJS)
......@@ -23,6 +23,7 @@ for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
cp -a "${toplevel}/${f}" "${destdir}/${f}"
done
cp -a "${toplevel}"/src/test_opus.c "${destdir}"/src/
cp -a "${toplevel}"/src/opus_compare.c "${destdir}"/src/
cp -a "${toplevel}"/celt/test_opus_custom.c "${destdir}"/celt/
cp -a "${toplevel}"/celt/opus_custom.h "${destdir}"/celt/
cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile
......@@ -36,13 +37,13 @@ tar czf opus_source.tar.gz "${destdir}"
echo building base64 version
cat opus_source.tar.gz| base64 -w 66 | sed 's/^/###/' > opus_source.base64
echo '<figure>' > opus_compare_escaped.c
echo '<artwork>' >> opus_compare_escaped.c
echo '<![CDATA[' >> opus_compare_escaped.c
cat opus_compare.c >> opus_compare_escaped.c
echo ']]>' >> opus_compare_escaped.c
echo '</artwork>' >> opus_compare_escaped.c
echo '</figure>' >> opus_compare_escaped.c
#echo '<figure>' > opus_compare_escaped.c
#echo '<artwork>' >> opus_compare_escaped.c
#echo '<![CDATA[' >> opus_compare_escaped.c
#cat opus_compare.c >> opus_compare_escaped.c
#echo ']]>' >> opus_compare_escaped.c
#echo '</artwork>' >> opus_compare_escaped.c
#echo '</figure>' >> opus_compare_escaped.c
echo running xml2rfc
xml2rfc draft-ietf-codec-opus.xml draft-ietf-codec-opus.html &
......
......@@ -5297,8 +5297,10 @@ the latter shall take precedence.
<t>
Compliance with this specification means that a decoder's output MUST be
within the thresholds specified by the opus_compare.c tool in
<xref target="opus-compare"/> compared to the reference implementation.
within the thresholds specified by the opus_compare.c tool (included
with the code) when compared to the reference implementation. Either the floating-point
implementation or the fixed-point implementation can be used as a reference and being
within the threshold for one of the two is sufficient.
</t>
<t>
......@@ -5591,12 +5593,14 @@ Development snapshots are provided at
</section>
<!--
<section anchor="opus-compare" title="opus_compare.c">
<t>
<?rfc include="opus_compare_escaped.c"?>
</t>
</section>
-->
<section anchor="self-delimiting-framing" title="Self-Delimiting Framing">
<t>
To use the internal framing described in <xref target="modes"/>, the decoder
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment