Merge remote-tracking branch 'upstream/master'

Author: qxdFox

CMakeLists.txt

@@ -3862,9 +3862,14 @@ foreach(target ${TARGETS_OWN})
   endif()
   if(TARGET_OS STREQUAL "android")
     if(ANDROID_PACKAGE_NAME)
-      target_compile_definitions(${target} PRIVATE ANDROID_PACKAGE_NAME=${ANDROID_PACKAGE_NAME})
+      target_compile_definitions(${target} PRIVATE ANDROID_PACKAGE_NAME="${ANDROID_PACKAGE_NAME}")
     else()
-      message(FATAL_ERROR "ANDROID_PACKAGE_NAME must define the package name when compiling for Android (using underscores instead of dots, e.g. org_example_app)")
+      message(FATAL_ERROR "ANDROID_PACKAGE_NAME must define the package name when compiling for Android (e.g. org.example.app)")
+    endif()
+    if(ANDROID_PACKAGE_NAME_JNI)
+      target_compile_definitions(${target} PRIVATE ANDROID_PACKAGE_NAME_JNI=${ANDROID_PACKAGE_NAME_JNI})
+    else()
+      message(FATAL_ERROR "ANDROID_PACKAGE_NAME_JNI must define the package name when compiling for Android (using underscores instead of dots, e.g. org_example_app)")
     endif()
   endif()
 endforeach()

datasrc/network.py

@@ -24,7 +24,7 @@
 ]
 GameInfoFlags2 = [
 	"ALLOW_X_SKINS", "GAMETYPE_CITY", "GAMETYPE_FDDRACE", "ENTITIES_FDDRACE", "HUD_HEALTH_ARMOR", "HUD_AMMO",
-	"HUD_DDRACE", "NO_WEAK_HOOK", "NO_SKIN_CHANGE_FOR_FROZEN", "DDRACE_TEAM"
+	"HUD_DDRACE", "NO_WEAK_HOOK", "NO_SKIN_CHANGE_FOR_FROZEN", "DDRACE_TEAM", "PREDICT_EVENTS"
 ]
 ExPlayerFlags = ["AFK", "PAUSED", "SPEC"]
 LegacyProjectileFlags = [f"CLIENTID_BIT{i}" for i in range(8)] + [
@@ -77,7 +77,7 @@
 
 enum
 {
-	GAMEINFO_CURVERSION=10,
+	GAMEINFO_CURVERSION=11,
 };
 '''
 
@@ -659,4 +659,8 @@
 	NetMessageEx("Cl_EnableSpectatorCount", "enable-spectator-count@netmsg.ddnet.org", [
 		NetBool("m_Enable"),
 	]),
+	
+	NetMessageEx("Sv_MapInfo", "map-info@netmsg.ddnet.org", [
+		NetString("m_pDescription"),
+	]),
 ]

scripts/android/cmake_android.sh

@@ -157,7 +157,8 @@ function build_for_type() {
 		-DCMAKE_ANDROID_ARCH_ABI="${2}" \
 		-DCARGO_NDK_TARGET="${3}" \
 		-DCARGO_NDK_API="$ANDROID_API" \
-		-DANDROID_PACKAGE_NAME="${PACKAGE_NAME//./_}" \
+		-DANDROID_PACKAGE_NAME="${PACKAGE_NAME}" \
+		-DANDROID_PACKAGE_NAME_JNI="${PACKAGE_NAME//./_}" \
 		-DPREFER_BUNDLED_LIBS=ON \
 		-DSERVER=ON \
 		-DTOOLS=OFF \

src/base/log.cpp

@@ -160,7 +160,10 @@ class CLoggerAndroid : public ILogger
 		case LEVEL_WARN: AndroidLevel = ANDROID_LOG_WARN; break;
 		case LEVEL_ERROR: AndroidLevel = ANDROID_LOG_ERROR; break;
 		}
-		__android_log_write(AndroidLevel, pMessage->m_aSystem, pMessage->Message());
+		char aTag[64];
+		str_copy(aTag, ANDROID_PACKAGE_NAME "/");
+		str_append(aTag, pMessage->m_aSystem);
+		__android_log_write(AndroidLevel, aTag, pMessage->Message());
 	}
 };
 std::unique_ptr<ILogger> log_logger_android()

src/engine/client/serverbrowser.cpp

@@ -322,6 +322,13 @@ const CServerInfo *CServerBrowser::SortedGet(int Index) const
 	return &m_vpServerlist[m_vSortedServerlist[Index]]->m_Info;
 }
 
+const CServerInfo *CServerBrowser::Get(int Index) const
+{
+	if(Index < 0 || Index >= (int)m_vpServerlist.size())
+		return nullptr;
+	return &m_vpServerlist[Index]->m_Info;
+}
+
 int CServerBrowser::GenerateToken(const NETADDR &Addr) const
 {
 	SHA256_CTX Sha256;
@@ -573,10 +580,10 @@ void CServerBrowser::Filter()
 			}
 		}
 
+		UpdateServerFriends(&Info);
+
 		if(!Filtered)
 		{
-			UpdateServerFriends(&Info);
-
 			if(!g_Config.m_BrFilterFriends || Info.m_FriendState != IFriends::FRIEND_NO)
 			{
 				m_NumSortedPlayers += Info.m_NumFilteredPlayers;

src/engine/client/serverbrowser.h

@@ -262,6 +262,7 @@ class CServerBrowser : public IServerBrowser
 	void RequestResort() { m_NeedResort = true; }
 
 	int NumServers() const override { return m_vpServerlist.size(); }
+	const CServerInfo *Get(int Index) const override;
 	int Players(const CServerInfo &Item) const override;
 	int Max(const CServerInfo &Item) const override;
 	int NumSortedServers() const override { return m_vSortedServerlist.size(); }

src/engine/client/sound.cpp

@@ -146,7 +146,9 @@ void CSound::Mix(short *pFinalOut, unsigned Frames)
 		if(Voice.m_Tick == Voice.m_pSample->m_NumFrames)
 		{
 			if(Voice.m_Flags & ISound::FLAG_LOOP)
-				Voice.m_Tick = 0;
+			{
+				Voice.m_Tick = Voice.m_pSample->m_LoopStart;
+			}
 			else
 			{
 				Voice.m_pSample = nullptr;
@@ -324,6 +326,10 @@ void CSound::RateConvert(CSample &Sample) const
 		}
 	}
 
+	// adjust looping position, note that this is not precise
+	const double Factor = (double)m_MixingRate / (double)Sample.m_Rate;
+	Sample.m_LoopStart = std::round(Sample.m_LoopStart * Factor);
+
 	// free old data and apply new
 	free(Sample.m_pData);
 	Sample.m_pData = pNewData;
@@ -371,15 +377,40 @@ bool CSound::DecodeOpus(CSample &Sample, const void *pData, unsigned DataSize, c
 			Pos += Read;
 		}
 
-		op_free(pOpusFile);
-
 		Sample.m_pData = pSampleData;
 		Sample.m_NumFrames = Pos;
 		Sample.m_Rate = 48000;
 		Sample.m_Channels = NumChannels;
-		Sample.m_LoopStart = -1;
-		Sample.m_LoopEnd = -1;
+		Sample.m_LoopStart = 0;
 		Sample.m_PausedAt = 0;
+
+		const OpusTags *pTags = op_tags(pOpusFile, -1);
+		if(pTags)
+		{
+			for(int i = 0; i < pTags->comments; ++i)
+			{
+				const char *pComment = pTags->user_comments[i];
+				if(!pComment)
+					continue;
+				if(!str_startswith(pComment, "LOOP_START="))
+					continue;
+				int LoopStart = -1;
+				if(!str_toint(pComment + str_length("LOOP_START="), &LoopStart))
+				{
+					log_error("sound/opus", "Invalid LOOP_START tag. Value='%s' Filename='%s'", pComment + str_length("LOOP_START="), pContextName);
+					break;
+				}
+				if(LoopStart < 0 || LoopStart >= Sample.m_NumFrames)
+				{
+					log_error("sound/opus", "Tag LOOP_START out of range. Value=%d Min=0 Max=%d Filename='%s'", LoopStart, Sample.m_NumFrames - 1, pContextName);
+					break;
+				}
+				Sample.m_LoopStart = LoopStart;
+				break;
+			}
+		}
+
+		op_free(pOpusFile);
 	}
 	else
 	{
@@ -504,8 +535,7 @@ bool CSound::DecodeWV(CSample &Sample, const void *pData, unsigned DataSize, con
 		Sample.m_NumFrames = NumSamples;
 		Sample.m_Rate = SampleRate;
 		Sample.m_Channels = NumChannels;
-		Sample.m_LoopStart = -1;
-		Sample.m_LoopEnd = -1;
+		Sample.m_LoopStart = 0;
 		Sample.m_PausedAt = 0;
 
 		s_pWVBuffer = nullptr;
@@ -790,9 +820,28 @@ void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float TimeOffset)
 	bool IsLooping = m_aVoices[VoiceId].m_Flags & ISound::FLAG_LOOP;
 	uint64_t TickOffset = m_aVoices[VoiceId].m_pSample->m_Rate * TimeOffset;
 	if(m_aVoices[VoiceId].m_pSample->m_NumFrames > 0 && IsLooping)
-		Tick = TickOffset % m_aVoices[VoiceId].m_pSample->m_NumFrames;
+	{
+		const int LoopStart = m_aVoices[VoiceId].m_pSample->m_LoopStart;
+		const int NumFrames = m_aVoices[VoiceId].m_pSample->m_NumFrames;
+		if(TickOffset < static_cast<uint64_t>(NumFrames))
+		{
+			// Still in first playthrough
+			Tick = TickOffset;
+		}
+		else
+		{
+			// Past first playthrough, wrap within loop section only
+			const int LoopLength = NumFrames - LoopStart;
+			if(LoopLength > 0)
+				Tick = LoopStart + ((TickOffset - NumFrames) % LoopLength);
+			else
+				Tick = LoopStart;
+		}
+	}
 	else
-		Tick = std::clamp(TickOffset, (uint64_t)0, (uint64_t)m_aVoices[VoiceId].m_pSample->m_NumFrames);
+	{
+		Tick = std::clamp<uint64_t>(TickOffset, 0, m_aVoices[VoiceId].m_pSample->m_NumFrames);
+	}
 
 	// at least 200msec off, else depend on buffer size
 	float Threshold = maximum(0.2f * m_aVoices[VoiceId].m_pSample->m_Rate, (float)m_MaxFrames);

src/engine/client/sound.h

@@ -21,7 +21,6 @@ struct CSample
 	int m_Rate;
 	int m_Channels;
 	int m_LoopStart;
-	int m_LoopEnd;
 	int m_PausedAt;
 
 	float TotalTime() const

src/engine/server/main.cpp

@@ -211,10 +211,10 @@ int main(int argc, const char **argv)
 }
 
 #if defined(CONF_PLATFORM_ANDROID)
-#if !defined(ANDROID_PACKAGE_NAME)
-#error "ANDROID_PACKAGE_NAME must define the package name when compiling for Android (using underscores instead of dots, e.g. org_example_app)"
+#if !defined(ANDROID_PACKAGE_NAME_JNI)
+#error "ANDROID_PACKAGE_NAME_JNI must define the package name when compiling for Android (using underscores instead of dots, e.g. org_example_app)"
 #endif
-// Helpers to force macro expansion else the ANDROID_PACKAGE_NAME macro is not expanded
+// Helpers to force macro expansion else the ANDROID_PACKAGE_NAME_JNI macro is not expanded
 #define EXPAND_MACRO(x) x
 #define JNI_MAKE_NAME(PACKAGE, CLASS, FUNCTION) Java_##PACKAGE##_##CLASS##_##FUNCTION
 #define JNI_EXPORTED_FUNCTION(PACKAGE, CLASS, FUNCTION, RETURN_TYPE, ...) \
@@ -233,7 +233,7 @@ std::vector<std::string> FetchAndroidServerCommandQueue()
 	return vResult;
 }
 
-JNI_EXPORTED_FUNCTION(ANDROID_PACKAGE_NAME, NativeServer, runServer, jint, JNIEnv *pEnv, jobject Object, jstring WorkingDirectory, jobjectArray ArgumentsArray)
+JNI_EXPORTED_FUNCTION(ANDROID_PACKAGE_NAME_JNI, NativeServer, runServer, jint, JNIEnv *pEnv, jobject Object, jstring WorkingDirectory, jobjectArray ArgumentsArray)
 {
 	// Set working directory to external storage location. This is not possible
 	// in Java so we pass the intended working directory to the native code.
@@ -268,7 +268,7 @@ JNI_EXPORTED_FUNCTION(ANDROID_PACKAGE_NAME, NativeServer, runServer, jint, JNIEn
 	return main(vpArguments.size(), vpArguments.data());
 }
 
-JNI_EXPORTED_FUNCTION(ANDROID_PACKAGE_NAME, NativeServer, executeCommand, void, JNIEnv *pEnv, jobject Object, jstring Command)
+JNI_EXPORTED_FUNCTION(ANDROID_PACKAGE_NAME_JNI, NativeServer, executeCommand, void, JNIEnv *pEnv, jobject Object, jstring Command)
 {
 	const char *pCommand = pEnv->GetStringUTFChars(Command, nullptr);
 	{

src/engine/serverbrowser.h

@@ -346,6 +346,7 @@ class IServerBrowser : public IInterface
 	virtual int LoadingProgression() const = 0;
 
 	virtual int NumServers() const = 0;
+	virtual const CServerInfo *Get(int Index) const = 0;
 
 	virtual int Players(const CServerInfo &Item) const = 0;
 	virtual int Max(const CServerInfo &Item) const = 0;