Fix clipped sample rate changing between files

When the clipped sample rate changes, the resampler needs to be restarted. This was previously failing because the target sample rate wasn't changing. Signed-off-by: Christopher Snowhill <[email protected]>
losnoco · Jul 14, 2023 · 3d24168 · 3d24168
1 parent 323a554
commit 3d24168
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Audio/Output/OutputAVFoundation.h b/Audio/Output/OutputAVFoundation.h
@@ -42,6 +42,8 @@ using std::atomic_long;
 
 	BOOL rsDone;
 	void *rsstate, *rsold;
+
+	double lastClippedSampleRate;
 
 	void *rsvis;
 	double lastVisRate;

diff --git a/Audio/Output/OutputAVFoundation.m b/Audio/Output/OutputAVFoundation.m
@@ -85,6 +85,10 @@ - (int)renderInput:(int)amountToRead toBuffer:(float *)buffer {
 			format.mSampleRate = maxSampleRate;
 			dstRate = maxSampleRate;
 			formatClipped = YES;
+			if(srcRate != lastClippedSampleRate) {
+				lastClippedSampleRate = srcRate;
+				streamFormatStarted = NO;
+			}
 		}
 		if(!streamFormatStarted || config != realStreamChannelConfig || memcmp(&newFormat, &format, sizeof(format)) != 0) {
 			[currentPtsLock lock];
@@ -817,7 +821,7 @@ - (int)makeBlockBuffer:(CMBlockBufferRef *)blockBufferOut {
 				rsDone = NO;
 				realStreamFormat = newFormat;
 				realStreamChannelConfig = newChannelConfig;
-				streamFormatChanged = YES;
+				[self updateStreamFormat];
 			}
 		}
 
@@ -962,6 +966,8 @@ - (BOOL)setup {
 		rsDone = NO;
 		rsstate = NULL;
 		rsold = NULL;
+
+		lastClippedSampleRate = 0.0;
 
 		rsvis = NULL;
 		lastVisRate = 44100.0;