output: null_encoder: Fix bug in ordering of input/output callbacks

This would cause a pop from the metadata queue in the output callback before the input callback has a chance to push to the queue. Signed-off-by: Naushir Patuck <[email protected]>
raspberrypi · Dec 1, 2022 · 9c5d319 · 9c5d319
1 parent 4068771
commit 9c5d319
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/encoder/null_encoder.cpp b/encoder/null_encoder.cpp
@@ -57,7 +57,10 @@ void NullEncoder::outputThread()
 					return;
 			}
 		}
-		output_ready_callback_(item.mem, item.length, item.timestamp_us, true);
+		// Ensure the input done callback happens before the output ready callback.
+		// This is needed as the metadata queue gets pushed in the former, and popped
+		// in the latter.
 		input_done_callback_(nullptr);
+		output_ready_callback_(item.mem, item.length, item.timestamp_us, true);
 	}
 }