media file M4B should matches too

janbar · Dec 14, 2019 · e4107dd · e4107dd
1 parent f7edf18
commit e4107dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/noson/src/filepicreader.cpp b/noson/src/filepicreader.cpp
@@ -126,7 +126,7 @@ StreamReader::STREAM * FilePicReader::OpenStream(const std::string& streamUrl)
       return stream;
     }
   }
-  if (suffix.compare("m4a") == 0)
+  if (suffix.compare("m4a") == 0 || suffix.compare("m4b") == 0)
   {
     Picture * picture = ExtractMP4Picture(filePath, picType, error);
     if (picture)

diff --git a/noson/src/filestreamer.cpp b/noson/src/filestreamer.cpp
@@ -45,6 +45,7 @@ FileStreamer::codec_type FileStreamer::codecTypeTab[] = {
   { "mpeg4aac"      , "aac"  , "audio/aac"  },
   { "vorbis"        , "ogg"  , "application/ogg" },
   { "mp4a"          , "m4a"  , "audio/mp4"  },
+  { "mp4b"          , "m4b"  , "audio/mp4"  },
 };
 
 int FileStreamer::codecTypeTabSize = sizeof(FileStreamer::codecTypeTab) / sizeof(FileStreamer::codec_type);
@@ -330,7 +331,8 @@ bool FileStreamer::probeMP4A(const std::string& filePath)
   if (file)
   {
     char buf[12];
-    if (fread(buf, 1, 12, file) == 12 && memcmp(buf + 4, "ftypM4A ", 8) == 0)
+    if (fread(buf, 1, 12, file) == 12 &&
+            (memcmp(buf + 4, "ftypM4A ", 8) == 0 || memcmp(buf + 4, "ftypM4B ", 8) == 0))
       ret = true;
     fclose(file);
   }