OcMp3Lib: Fix naming as MPEG3 is not MP3

Include/Acidanthera/Library/OcMpeg3Lib.h → Include/Acidanthera/Library/OcMp3Lib.h

@@ -12,8 +12,8 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
-#ifndef OC_MPEG3_LIB_H
-#define OC_MPEG3_LIB_H
+#ifndef OC_MP3_LIB_H
+#define OC_MP3_LIB_H
 
 #include <Protocol/AudioIo.h>
 
@@ -21,7 +21,7 @@
   Decode MP3 audio to PCM audio.
   WARNING: This method does not take untrusted data.
 
-  @param[in]  InBuffer       Buffer with mpeg3 audio data.
+  @param[in]  InBuffer       Buffer with mp3 audio data.
   @param[in]  InBufferSize   InBuffer size in bytes.
   @param[out] OutBuffer      Decoded PCM data allocated from pool (needs to be freed).
   @param[out] OutBufferSize  Decoded PCM data size in bytes.
@@ -34,7 +34,7 @@
   @retval EFI_OUT_OF_RESOURCES on memory allocation failure.
 **/
 EFI_STATUS
-OcDecodeMpeg3 (
+OcDecodeMp3 (
   IN  CONST VOID                     *InBuffer,
   IN  UINT32                         InBufferSize,
   OUT VOID                           **OutBuffer,
@@ -44,4 +44,4 @@ OcDecodeMpeg3 (
   OUT UINT8                          *Channels
   );
 
-#endif // OC_MPEG3_LIB_H
+#endif // OC_MP3_LIB_H

Library/OcMpeg3Lib/OcMpeg3Lib.c → Library/OcMp3Lib/OcMp3Lib.c

@@ -18,7 +18,7 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/OcGuardLib.h>
-#include <Library/OcMpeg3Lib.h>
+#include <Library/OcMp3Lib.h>
 #include "helix/mp3dec.h"
 
 /**
@@ -86,7 +86,7 @@ BufferResize (
 }
 
 EFI_STATUS
-OcDecodeMpeg3 (
+OcDecodeMp3 (
   IN  CONST VOID                     *InBuffer,
   IN  UINT32                         InBufferSize,
   OUT VOID                           **OutBuffer,

Library/OcMpeg3Lib/OcMpeg3Lib.inf → Library/OcMp3Lib/OcMp3Lib.inf

@@ -18,11 +18,11 @@
 
 [Defines]
   INF_VERSION    = 0x00010005
-  BASE_NAME      = OcMpeg3Lib
+  BASE_NAME      = OcMp3Lib
   FILE_GUID      = 05882BFC-54A4-4D21-A5F6-D87E4C4079EA
   MODULE_TYPE    = BASE
   VERSION_STRING = 1.0
-  LIBRARY_CLASS  = OcMpeg3Lib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER
+  LIBRARY_CLASS  = OcMp3Lib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER
 
 # VALID_ARCHITECTURES = IA32 X64
 
@@ -61,4 +61,4 @@
   helix/statname.h
   helix/stproc.c
   helix/trigtabs.c
-  OcMpeg3Lib.c
+  OcMp3Lib.c

OpenCorePkg.dec

@@ -833,7 +833,7 @@
   OcMemoryLib|Include/Acidanthera/Library/OcMemoryLib.h
 
   ##  @libraryclass
-  OcMpeg3Lib|Include/Acidanthera/Library/OcMpeg3Lib.h
+  OcMp3Lib|Include/Acidanthera/Library/OcMp3Lib.h
 
   ##  @libraryclass
   OcMiscLib|Include/Acidanthera/Library/OcMiscLib.h

OpenCorePkg.dsc

@@ -93,7 +93,7 @@
   OcMacInfoLib|OpenCorePkg/Library/OcMacInfoLib/OcMacInfoLib.inf
   OcMemoryLib|OpenCorePkg/Library/OcMemoryLib/OcMemoryLib.inf
   OcMiscLib|OpenCorePkg/Library/OcMiscLib/OcMiscLib.inf
-  OcMpeg3Lib|OpenCorePkg/Library/OcMpeg3Lib/OcMpeg3Lib.inf
+  OcMp3Lib|OpenCorePkg/Library/OcMp3Lib/OcMp3Lib.inf
   OcOSInfoLib|OpenCorePkg/Library/OcOSInfoLib/OcOSInfoLib.inf
   OcPngLib|OpenCorePkg/Library/OcPngLib/OcPngLib.inf
   OcRngLib|OpenCorePkg/Library/OcRngLib/OcRngLib.inf
@@ -213,7 +213,7 @@
   OpenCorePkg/Library/OcMachoLib/OcMachoLib.inf
   OpenCorePkg/Library/OcMemoryLib/OcMemoryLib.inf
   OpenCorePkg/Library/OcMiscLib/OcMiscLib.inf
-  OpenCorePkg/Library/OcMpeg3Lib/OcMpeg3Lib.inf
+  OpenCorePkg/Library/OcMp3Lib/OcMp3Lib.inf
   OpenCorePkg/Library/OcOSInfoLib/OcOSInfoLib.inf
   OpenCorePkg/Library/OcPngLib/OcPngLib.inf
   OpenCorePkg/Library/OcRngLib/OcRngLib.inf

Utilities/TestMp3/Makefile

@@ -6,7 +6,7 @@
 PROJECT = Mp3
 PRODUCT = $(PROJECT)$(SUFFIX)
 OBJS    = $(PROJECT).o \
-	OcMpeg3Lib.o \
+	OcMp3Lib.o \
 	bitstream.o \
 	buffers.o \
 	dct32.o \
@@ -22,8 +22,8 @@ OBJS    = $(PROJECT).o \
 	stproc.o \
 	subband.o \
 	trigtabs.o
-VPATH   = ../../Library/OcMpeg3Lib:$\
-	../../Library/OcMpeg3Lib/helix
+VPATH   = ../../Library/OcMp3Lib:$\
+	../../Library/OcMp3Lib/helix
 include ../../User/Makefile
 ifneq ($(SANITIZE),)
 	CFLAGS += -fno-sanitize=shift

Utilities/TestMp3/Mp3.c

@@ -15,7 +15,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/OcMpeg3Lib.h>
+#include <Library/OcMp3Lib.h>
 #include <Library/OcMiscLib.h>
 
 #include <string.h>
@@ -39,7 +39,7 @@ int ENTRY_POINT(int argc, char** argv) {
   EFI_AUDIO_IO_PROTOCOL_BITS bits;
   UINT8                      channels;
 
-  EFI_STATUS Status = OcDecodeMpeg3 (
+  EFI_STATUS Status = OcDecodeMp3 (
     buffer,
     size,
     &outbuffer,
@@ -70,7 +70,7 @@ INT32 LLVMFuzzerTestOneInput(CONST UINT8 *Data, UINTN Size) {
     EFI_AUDIO_IO_PROTOCOL_BITS bits;
     UINT8                      channels;
 
-    EFI_STATUS Status = OcDecodeMpeg3 (
+    EFI_STATUS Status = OcDecodeMp3 (
       Data,
       Size,
       &outbuffer,