Merge remote-tracking branch 'origin/master'

Author: wyapx

.github/workflows/python-build-test.yml

@@ -7,11 +7,10 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/python-publish.yml

@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Upload Python Package
+name: Publish to pypi
 
 on:
   release:
@@ -17,7 +17,7 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
          os: [ubuntu-latest, windows-latest, macos-latest]
 
@@ -39,6 +39,7 @@ jobs:
         with:
           fetch-depth: 0  # Optional, use if you use setuptools_scm
           submodules: true  # Optional, use if you have submodules
+
       - name: Build SDist
         run: pipx run build --sdist
 

src/pysilk/utils.py

@@ -5,7 +5,10 @@
 
 def is_silk_data(raw: bytes) -> bool:
     if len(raw) > 10:
-        if raw[:10] == b"\x02#!SILK_V3":
+        offset = 0
+        if raw[0] == 2:
+            offset = 1
+        if raw[offset:10] == b"#!SILK_V3":
             return True
     return False
 

src/silk/codec.cpp

@@ -137,8 +137,13 @@ silkDecode(unsigned char *silkData, int dataLen,
     SKP_SILK_SDK_DecControlStruct DecControl;
 
     /* Check Silk header */
-    if (strncmp((char *) psRead, "\x02#!SILK_V3", 0x0A) != 0)
-        goto failed;
+    if (psRead[0] == 0x02) {
+        if (strncmp((char *) psRead, "\x02#!SILK_V3", 0x0A) != 0)
+            goto failed;
+    } else {
+        if (strncmp((char *) psRead, "#!SILK_V3", 0x09) != 0)
+            goto failed;
+    }
 
     psRead += 0x0A;
 
@@ -286,4 +291,4 @@ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-***********************************************************************/
+***********************************************************************/