Commit cfabda27 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'reenable-lc3plus-code-changes-job' into 'main' 

[ci] reenable lc3plus-ensure-no-code-changes

See merge request !2330
parents 822b7d98 1befb228

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ check-first-frame-is-sid: 
    expose_as: "logs-sidstart"

    expire_in: "5 days"



.lc3plus-ensure-no-code-changes:

lc3plus-ensure-no-code-changes:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-main

scripts/lc3plus_lib_setup/get_lc3plus.sh

+3 −0
Original line number Diff line number Diff line
@@ -59,3 +59,6 @@ printf ' 
DisableFormat: true

SortIncludes: Never

' >lib_lc3plus/.clang-format



# temporary until LC3plus release is updated

git apply scripts/lc3plus_lib_setup/lc3plus_float.patch

scripts/lc3plus_lib_setup/lc3plus_float.patch

0 → 100644
+49 −0
Original line number Diff line number Diff line 
diff --git b/lib_lc3plus/lc3plus.c a/lib_lc3plus/lc3plus.c

index 7063c4e183..594683cd2c 100644

--- b/lib_lc3plus/lc3plus.c

+++ a/lib_lc3plus/lc3plus.c

@@ -77,8 +77,10 @@ static int lc3plus_frame_size_supported(LC3PLUS_FrameDuration frame_dms)

     case LC3PLUS_FRAME_DURATION_7p5MS: /* fallthru */

     case LC3PLUS_FRAME_DURATION_10MS:

             return 1;

-    default: return 0;

+    default: break;

     }

+

+    return 0;

 }

 

 static int null_in_list(void **list, int n)

diff --git b/lib_lc3plus/ltpf_decoder.c a/lib_lc3plus/ltpf_decoder.c

index f6560d9710..48aa9a2d70 100644

--- b/lib_lc3plus/ltpf_decoder.c

+++ a/lib_lc3plus/ltpf_decoder.c

@@ -14,21 +14,25 @@

 #ifdef CR9_C_ADD_1p25MS

 static LC3_INT16 get_continuation (LC3_INT32 fading_case, LC3PLUS_FrameDuration frame_dms, LC3_INT32 pos, LC3_INT32 total) 

 {

+    LC3_INT16 retval;

+

     if ( frame_dms != LC3PLUS_FRAME_DURATION_1p25MS )

     {

-        return 0;

+        retval = 0;

     }

     else

     {

         if ( pos == total )

         {

-            return 0;

+            retval = 0;

         }

         else

         {

-            return fading_case;

+            retval = fading_case;

         }

     }

+    

+    return retval;

 }

 #endif