1.5.0

philippe44 · Nov 28, 2023 · 4001fa1 · 4001fa1
1 parent 0d8050f
commit 4001fa1
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 8 deletions.
diff --git a/AirConnect-1.4.0.zip → AirConnect-1.5.0.zip b/AirConnect-1.4.0.zip → AirConnect-1.5.0.zip
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+1.5.0
+ - add aac codec (use refactored libraop and move encoder to libcodecs
+
 1.4.0
  - proper fix of HTTP frame sending & filling
 

diff --git a/aircast/src/aircast.c b/aircast/src/aircast.c
@@ -97,7 +97,7 @@ static char usage[] =
 		   "Usage: [options]\n"
 		   "  -b <ip|iface>\t\tnetwork address or interface to bind to\n"
 		   "  -a <port>[:<count>]\tset inbound port and range for RTP and HTTP\n"
-		   "  -c <mp3[:<rate>]|flc[:0..9]|wav>\taudio format send to player\n"
+		   "  -c <mp3[:<rate>]|aac[:<rate>]|flc[:0..9]|wav>\taudio format send to player\n"
    		   "  -v <0..1>\t\t group MediaVolume factor\n"
 		   "  -x <config file>\tread config from file (default is ./config.xml)\n"
 		   "  -i <config file>\tdiscover players, save <config file> and exit\n"
@@ -212,6 +212,7 @@ static void raop_cb(void *owner, raopsr_event_t event, ...) {
 
 				(void)!asprintf(&uri, "http://%s:%u/stream-%u", inet_ntoa(glHost), port, count++);
 				if (!strcasecmp(Device->Config.Codec, "mp3")) ContentType = "audio/mpeg";
+				else if (!strcasecmp(Device->Config.Codec, "aac")) ContentType = "audio/aac";
 				else if (!strcasecmp(Device->Config.Codec, "wav")) ContentType = "audio/wav";
 				else ContentType = "audio/flac";
 				CastLoad(Device->CastCtx, uri, ContentType, Device->Name, &MetaData, 0);

diff --git a/aircast/src/aircast.h b/aircast/src/aircast.h
@@ -18,7 +18,7 @@
 #include "raop_server.h"
 #include "cast_util.h"
 
-#define VERSION "v1.4.0"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.5.0"" ("__DATE__" @ "__TIME__")"
 
 /*----------------------------------------------------------------------------*/
 /* typedefs */

diff --git a/airupnp/AirUPnP.vcxproj b/airupnp/AirUPnP.vcxproj
@@ -31,7 +31,8 @@
     <ClCompile Include="src\mr_util.c" />
   </ItemGroup>
   <ItemGroup>
-    <Library Include="..\common\libraop\targets\win32\$(PlatformTarget)\libraop.lib" />
+    <!-- <Library Include="..\..\libraop\lib\win32\x86\libraop_d.lib" /> -->
+	<Library Include="..\common\libraop\targets\win32\$(PlatformTarget)\libraop.lib" />
     <Library Include="..\common\libcodecs\targets\win32\$(PlatformTarget)\libcodecs.lib" />
     <Library Include="..\common\libmdns\targets\win32\$(PlatformTarget)\libmdns.lib" />
     <Library Include="..\common\libpthreads4w\targets\win32\$(PlatformTarget)\libpthreadVC3d.lib" />

diff --git a/airupnp/airupnp.vcxproj.filters b/airupnp/airupnp.vcxproj.filters
@@ -29,7 +29,7 @@
     <Library Include="..\common\libmdns\targets\win32\$(PlatformTarget)\libmdns.lib" />
     <Library Include="..\common\libpupnp\targets\win32\$(PlatformTarget)\libpupnp.lib" />
     <Library Include="..\common\libpthreads4w\targets\win32\$(PlatformTarget)\libpthreadVC3d.lib" />
-    <Library Include="..\common\libraop\targets\win32\x86\libraop.lib" />
+    <Library Include="..\..\libraop\lib\win32\x86\libraop_d.lib" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="crosstools">

diff --git a/airupnp/src/airupnp.c b/airupnp/src/airupnp.c
@@ -82,6 +82,7 @@ tMRConfig			glMRConfig = {
 								"http-get:*:audio/wav:DLNA.ORG_OP=00;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=0d500000000000000000000000000000",
 								"http-get:*:audio/flac:DLNA.ORG_OP=00;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=0d500000000000000000000000000000",
 								"http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=00;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=0d500000000000000000000000000000",
+								"http-get:*:audio/aac:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=00;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=0d500000000000000000000000000000",
 							},
 					};
 
@@ -321,7 +322,7 @@ void HandleRAOP(void *owner, raopsr_event_t event, ...) {
 					mp3radio = "x-rincon-mp3radio://";
 					LOG_INFO("[%p]: Sonos live stream", Device);
 				}
-				(void)!asprintf(&uri, "%shttp://%s:%u/stream-%u.%s", mp3radio, inet_ntoa(glHost), port,	count++, Device->Config.Codec);
+				(void)!asprintf(&uri, "%shttp://%s:%u/stream-%u.flac", mp3radio, inet_ntoa(glHost), port, count++);
 				AVTSetURI(Device, uri, &Device->MetaData, Device->ProtocolInfo);
 				NFREE(uri);
 			}

diff --git a/airupnp/src/airupnp.h b/airupnp/src/airupnp.h
@@ -21,7 +21,7 @@
 #include "cross_util.h"
 #include "metadata.h"
 
-#define VERSION "v1.4.0"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.5.0"" ("__DATE__" @ "__TIME__")"
 
 /*----------------------------------------------------------------------------*/
 /* typedefs */
@@ -68,6 +68,7 @@ typedef struct sMRConfig
 		char wav[STR_LEN];
 		char flac[STR_LEN];
 		char mp3[STR_LEN];
+		char aac[STR_LEN];
 	} ProtocolInfo;
 } tMRConfig;
 

diff --git a/airupnp/src/config_upnp.c b/airupnp/src/config_upnp.c
@@ -76,6 +76,7 @@ void SaveConfig(char *name, void *ref, bool full) {
 	XMLUpdateNode(doc, proto, false, "pcm", glMRConfig.ProtocolInfo.pcm);
 	XMLUpdateNode(doc, proto, false, "wav", glMRConfig.ProtocolInfo.wav);
 	XMLUpdateNode(doc, proto, false, "flac", glMRConfig.ProtocolInfo.flac);
+	XMLUpdateNode(doc, proto, false, "aac", glMRConfig.ProtocolInfo.aac);
 	XMLUpdateNode(doc, proto, false, "mp3", glMRConfig.ProtocolInfo.mp3);
 
 	// mutex is locked here so no risk of a player being destroyed in our back
@@ -148,6 +149,7 @@ static void LoadConfigItem(tMRConfig *Conf, char *name, char *val) {
 	if (!strcmp(name, "pcm")) strcpy(Conf->ProtocolInfo.pcm, val);
 	if (!strcmp(name, "wav")) strcpy(Conf->ProtocolInfo.wav, val);
 	if (!strcmp(name, "flac")) strcpy(Conf->ProtocolInfo.flac, val);
+	if (!strcmp(name, "aac")) strcpy(Conf->ProtocolInfo.aac, val);
 	if (!strcmp(name, "mp3")) strcpy(Conf->ProtocolInfo.mp3, val);
 }
 

diff --git a/buildall.sh b/buildall.sh
@@ -0,0 +1,2 @@
+cd airupnp && ../build.sh $1 && cd ..
+cd aircast && ../build.sh $1 && cd ..
diff --git a/common/libcodecs b/common/libcodecs
diff --git a/common/libraop b/common/libraop
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cd airupnp && ../build.sh $1 && cd ..
		cd aircast && ../build.sh $1 && cd ..
+2 −1		Makefile
+ −		bin/cliraop-macos
+ −		bin/cliraop-macos-arm64
+ −		bin/cliraop.exe
+1 −1		libcodecs
+1 −1		libraop.vcxproj
+10 −14		src/raop_server.c
+1 −1		src/raop_server.h
+60 −249		src/raop_streamer.c
+1 −14		src/raop_streamer.h
+ −		targets/freebsd/x86_64/libraop.a
+1 −1		targets/include/raop_server.h
+1 −14		targets/include/raop_streamer.h
+ −		targets/linux/aarch64/libraop.a
+ −		targets/linux/arm/libraop.a
+ −		targets/linux/armv5/libraop.a
+ −		targets/linux/armv6/libraop.a
+ −		targets/linux/mips/libraop.a
+ −		targets/linux/mipsel/libraop.a
+ −		targets/linux/powerpc/libraop.a
+ −		targets/linux/sparc64/libraop.a
+ −		targets/linux/x86/libraop.a
+ −		targets/linux/x86_64/libraop.a
+ −		targets/macos/arm64/libraop.a
+ −		targets/macos/x86_64/libraop.a
+ −		targets/solaris/x86_64/libraop.a
+ −		targets/win32/x86/libraop.lib
+ −		targets/win32/x86/libraop.pdb
+ −		targets/win32/x86/libraop_d.lib
+ −		targets/win32/x86/libraop_d.pdb