release v0.21.20

Fixes strange C++11 compatibility problems during GTest installation:

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:1: error: unknown type name 'constexpr'
 constexpr bool TypedTestCaseIsDeprecated() { return true; }

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:11: error: expected unqualified-id
 constexpr bool TypedTestCaseIsDeprecated() { return true; }

 /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1254:1: error: unknown type name 'constexpr'
 constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; }

.travis.yml

@@ -17,9 +17,9 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
@@ -39,9 +39,9 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
@@ -61,9 +61,9 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
@@ -86,9 +86,9 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
         - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
@@ -112,9 +112,9 @@ matrix:
             - ninja-build
       before_install:
         - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
+        - /usr/bin/python3.6 get-pip.py --user --no-cache-dir
       install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir
       env:
         # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068
         - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH"
@@ -148,7 +148,7 @@ install:
   # belonging to nss. You can unlink it" during gtest install
   - test "$TRAVIS_OS_NAME" != "osx" || brew unlink nss
 
-  - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb
 
 before_script:
   - ccache -s

NEWS

@@ -1,3 +1,10 @@
+ver 0.21.20 (2020/02/16)
+* decoder
+  - audiofile, ffmpeg, sndfile: handle MIME type "audio/wav"
+  - ffmpeg: fix playback of AIFF and TTA
+  - vorbis, opus: fix seeking in small files
+* fix backwards seeking on ARM (and other non-x86 CPUs)
+
 ver 0.21.19 (2020/01/17)
 * configuration
   - allow overriding top-level settings in includes

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="42"
-          android:versionName="0.21.19">
+          android:versionCode="43"
+          android:versionName="0.21.20">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
 

doc/conf.py

@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21.19'
+version = '0.21.20'
 # The full version, including alpha/beta/rc tags.
 release = version
 

meson.build

@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.19',
+  version: '0.21.20',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',

src/decoder/plugins/AudiofileDecoderPlugin.cxx

@@ -269,6 +269,8 @@ static const char *const audiofile_suffixes[] = {
 };
 
 static const char *const audiofile_mime_types[] = {
+	"audio/wav",
+	"audio/aiff",
 	"audio/x-wav",
 	"audio/x-aiff",
 	nullptr

src/decoder/plugins/FfmpegDecoderPlugin.cxx

@@ -762,7 +762,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/aac",
 	"audio/aacp",
 	"audio/ac3",
-	"audio/aiff"
+	"audio/aiff",
 	"audio/amr",
 	"audio/basic",
 	"audio/flac",
@@ -775,12 +775,13 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/qcelp",
 	"audio/vorbis",
 	"audio/vorbis+ogg",
+	"audio/wav",
 	"audio/x-8svx",
 	"audio/x-16sv",
 	"audio/x-aac",
 	"audio/x-ac3",
 	"audio/x-adx",
-	"audio/x-aiff"
+	"audio/x-aiff",
 	"audio/x-alaw",
 	"audio/x-au",
 	"audio/x-dca",
@@ -800,7 +801,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/x-pn-realaudio",
 	"audio/x-pn-multirate-realaudio",
 	"audio/x-speex",
-	"audio/x-tta"
+	"audio/x-tta",
 	"audio/x-voc",
 	"audio/x-wav",
 	"audio/x-wma",

src/decoder/plugins/MadDecoderPlugin.cxx

@@ -793,7 +793,7 @@ MadDecoder::DecodeFirstFrame(Tag *tag) noexcept
 
 	if (max_frames > 8 * 1024 * 1024) {
 		FormatWarning(mad_domain,
-			      "mp3 file header indicates too many frames: %lu",
+			      "mp3 file header indicates too many frames: %zu",
 			      max_frames);
 		return false;
 	}

src/decoder/plugins/OggDecoder.cxx

@@ -47,8 +47,12 @@ OggDecoder::LoadEndPacket(ogg_packet &packet) const
 		DecoderReader reader(client, input_stream);
 		OggSyncState sync2(reader);
 		OggStreamState stream2(GetSerialNo());
+
+		/* passing synced=false because we're inside an
+		   OggVisitor callback, and our InputStream may be in
+		   the middle of an Ogg packet */
 		result = OggSeekFindEOS(sync2, stream2, packet,
-					input_stream);
+					input_stream, false);
 	}
 
 	/* restore the previous file position */

src/decoder/plugins/SndfileDecoderPlugin.cxx

@@ -322,6 +322,8 @@ static const char *const sndfile_suffixes[] = {
 };
 
 static const char *const sndfile_mime_types[] = {
+	"audio/wav",
+	"audio/aiff",
 	"audio/x-wav",
 	"audio/x-aiff",
 

src/lib/xiph/OggFind.cxx

@@ -57,13 +57,14 @@ OggSeekPageAtOffset(OggSyncState &oy, ogg_stream_state &os, InputStream &is,
 
 bool
 OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
-	       InputStream &is)
+	       InputStream &is, bool synced)
 {
 	if (!is.KnownSize())
 		return false;
 
 	if (is.GetRest() < 65536)
-		return OggFindEOS(oy, os, packet);
+		return (synced || oy.ExpectPageSeekIn(os)) &&
+			OggFindEOS(oy, os, packet);
 
 	if (!is.CheapSeeking())
 		return false;

src/lib/xiph/OggFind.hxx

@@ -47,10 +47,13 @@ OggSeekPageAtOffset(OggSyncState &oy, ogg_stream_state &os, InputStream &is,
  * Try to find the end-of-stream (EOS) packet.  Seek to the end of the
  * file if necessary.
  *
+ * @param synced is the #OggSyncState currently synced?  If not, then
+ * we need to use ogg_sync_pageseek() instead of ogg_sync_pageout(),
+ * which is more expensive
  * @return true if the EOS packet was found
  */
 bool
 OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
-	       InputStream &is);
+	       InputStream &is, bool synced=true);
 
 #endif

src/protocol/ArgParser.cxx

@@ -175,5 +175,5 @@ SignedSongTime
 ParseCommandArgSignedSongTime(const char *s)
 {
 	auto value = ParseCommandArgFloat(s);
-	return SongTime::FromS(value);
+	return SignedSongTime::FromS(value);
 }

test/DumpDecoderClient.cxx

@@ -28,15 +28,15 @@
 
 void
 DumpDecoderClient::Ready(const AudioFormat audio_format,
-			 gcc_unused bool seekable,
+			 bool seekable,
 			 SignedSongTime duration)
 {
 	assert(!initialized);
 	assert(audio_format.IsValid());
 
-	fprintf(stderr, "audio_format=%s duration=%f\n",
+	fprintf(stderr, "audio_format=%s duration=%f seekable=%d\n",
 		ToString(audio_format).c_str(),
-		duration.ToDoubleS());
+		duration.ToDoubleS(), seekable);
 
 	initialized = true;
 }

test/meson.build

@@ -7,9 +7,14 @@ if compiler.get_id() == 'gcc'
     '-Wno-suggest-attribute=format',
     '-Wno-suggest-attribute=noreturn',
     '-Wno-missing-declarations',
+  ]
+endif
 
-    # needed on Jessie for gtest's IsNullLiteralHelper
-    '-Wno-conversion-null',
+if compiler.get_id() == 'clang' and compiler.version().version_compare('>=9')
+  gtest_compile_args += [
+    # work around clang warning caused by GTest's wrong "-lpthread"
+    # compiler flag
+    '-Wno-unused-command-line-argument',
   ]
 endif