replay: remove dependency on audio/

The replay infrastructure shouldn't depend on internals of audio/.
(st_sample is an internal implementation detail and could be different)

Let audio drive the audio samples recording/replaying.

Notice also we don't need to save & restore the internal ring "wpos",
all replay should care about is the number of samples and the samples.

Bump the replay version.

Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/audio/audio.c b/audio/audio.c
index 1fa63ee0421e2b46407014bdb8c18e533d565005..3e16b7193994c7cfb95d3a8706e1105e9be148f6 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1301,13 +1301,32 @@ static void audio_run_in(AudioMixengBackend *s)
     while ((hw = audio_pcm_hw_find_any_enabled_in(s, hw))) {
         SWVoiceIn *sw;
         size_t captured = 0, min;
+        int pos;
 
         if (replay_mode != REPLAY_MODE_PLAY) {
             captured = audio_pcm_hw_run_in(
                 hw, hw->conv_buf.size - audio_pcm_hw_get_live_in(hw));
         }
-        replay_audio_in(&captured, hw->conv_buf.buffer, &hw->conv_buf.pos,
-                        hw->conv_buf.size);
+
+        replay_audio_in_start(&captured);
+        assert(captured <= hw->conv_buf.size);
+        if (replay_mode == REPLAY_MODE_PLAY) {
+            hw->conv_buf.pos = (hw->conv_buf.pos + captured) % hw->conv_buf.size;
+        }
+        for (pos = (hw->conv_buf.pos - captured + hw->conv_buf.size) % hw->conv_buf.size;
+             pos != hw->conv_buf.pos;
+             pos = (pos + 1) % hw->conv_buf.size) {
+                uint64_t left, right;
+
+                if (replay_mode == REPLAY_MODE_RECORD) {
+                    audio_sample_to_uint64(hw->conv_buf.buffer, pos, &left, &right);
+                }
+                replay_audio_in_sample_lr(&left, &right);
+                if (replay_mode == REPLAY_MODE_PLAY) {
+                    audio_sample_from_uint64(hw->conv_buf.buffer, pos, left, right);
+                }
+        }
+        replay_audio_in_finish();
 
         min = audio_pcm_hw_find_min_in (hw);
         hw->total_samples_captured += captured - min;

diff --git a/audio/audio_int.h b/audio/audio_int.h
index e1f9fa333ba9c0349d02ce1e64a69917d99e22be..250fd45238d0e81c47ae67edbee4b0bff09922a8 100644 (file)
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -309,6 +309,11 @@ static inline size_t audio_ring_posb(size_t pos, size_t dist, size_t len)
 AudiodevPerDirectionOptions *audio_get_pdo_in(Audiodev *dev);
 AudiodevPerDirectionOptions *audio_get_pdo_out(Audiodev *dev);
 
+void audio_sample_to_uint64(const st_sample *sample, int pos,
+                            uint64_t *left, uint64_t *right);
+void audio_sample_from_uint64(st_sample *sample, int pos,
+                              uint64_t left, uint64_t right);
+
 #define TYPE_AUDIO_MIXENG_BACKEND "audio-mixeng-backend"
 OBJECT_DECLARE_TYPE(AudioMixengBackend, AudioMixengBackendClass, AUDIO_MIXENG_BACKEND)
 

diff --git a/include/qemu/audio.h b/include/qemu/audio.h
index 1eeead2a72249e558c1723e46369695bb06f4369..03ce9adbc88d8372b6a16eaded8f95c5ade76456 100644 (file)
--- a/include/qemu/audio.h
+++ b/include/qemu/audio.h
@@ -120,11 +120,6 @@ void audio_cleanup(void);
 
 typedef struct st_sample st_sample;
 
-void audio_sample_to_uint64(const st_sample *sample, int pos,
-                            uint64_t *left, uint64_t *right);
-void audio_sample_from_uint64(st_sample *sample, int pos,
-                            uint64_t left, uint64_t right);
-
 void audio_add_audiodev(Audiodev *audio);
 void audio_add_default_audiodev(Audiodev *dev, Error **errp);
 void audio_parse_option(const char *opt);

diff --git a/include/system/replay.h b/include/system/replay.h
index f8715ca9feb87feab095326b98bd4cf96f3e6d65..19fb6dbb396304796b7a5f533333152577648032 100644 (file)
--- a/include/system/replay.h
+++ b/include/system/replay.h
@@ -165,8 +165,15 @@ void replay_net_packet_event(ReplayNetState *rns, unsigned flags,
 
 /*! Saves/restores number of played samples of audio out operation. */
 void replay_audio_out(size_t *played);
-/*! Saves/restores recorded samples of audio in operation. */
-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size);
+/*
+ * Start saves/restores recorded samples of audio in operation.
+ * Must be called before replay_audio_in_sample_lr().
+ */
+void replay_audio_in_start(size_t *recorded);
+/* Saves/restores recorded samples. */
+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right);
+/* Finish saves/restores recorded samples. */
+void replay_audio_in_finish(void);
 
 /* VM state operations */
 

diff --git a/replay/replay-audio.c b/replay/replay-audio.c
index 1b614f41379fc642f4dae3888ab04703778d7287..7d20ae9110c624b0f2d9ba4cd8b5bbf74520386e 100644 (file)
--- a/replay/replay-audio.c
+++ b/replay/replay-audio.c
@@ -13,7 +13,6 @@
 #include "qemu/error-report.h"
 #include "system/replay.h"
 #include "replay-internal.h"
-#include "qemu/audio.h"
 
 void replay_audio_out(size_t *played)
 {
@@ -35,38 +34,48 @@ void replay_audio_out(size_t *played)
     }
 }
 
-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)
+void replay_audio_in_start(size_t *nsamples)
 {
-    int pos;
-    uint64_t left, right;
     if (replay_mode == REPLAY_MODE_RECORD) {
         g_assert(replay_mutex_locked());
         replay_save_instructions();
         replay_put_event(EVENT_AUDIO_IN);
-        replay_put_qword(*recorded);
-        replay_put_qword(*wpos);
-        for (pos = (*wpos - *recorded + size) % size ; pos != *wpos
-             ; pos = (pos + 1) % size) {
-            audio_sample_to_uint64(samples, pos, &left, &right);
-            replay_put_qword(left);
-            replay_put_qword(right);
-        }
+        replay_put_qword(*nsamples);
+        replay_state.n_audio_samples = *nsamples;
     } else if (replay_mode == REPLAY_MODE_PLAY) {
         g_assert(replay_mutex_locked());
         replay_account_executed_instructions();
         if (replay_next_event_is(EVENT_AUDIO_IN)) {
-            *recorded = replay_get_qword();
-            *wpos = replay_get_qword();
-            for (pos = (*wpos - *recorded + size) % size ; pos != *wpos
-                 ; pos = (pos + 1) % size) {
-                left = replay_get_qword();
-                right = replay_get_qword();
-                audio_sample_from_uint64(samples, pos, left, right);
-            }
-            replay_finish_event();
+            *nsamples = replay_get_qword();
+            replay_state.n_audio_samples = *nsamples;
         } else {
             error_report("Missing audio in event in the replay log");
             abort();
         }
     }
 }
+
+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)
+{
+    if (replay_mode == REPLAY_MODE_RECORD) {
+        replay_put_qword(*left);
+        replay_put_qword(*right);
+    } else if (replay_mode == REPLAY_MODE_PLAY) {
+        *left = replay_get_qword();
+        *right = replay_get_qword();
+    } else {
+        return;
+    }
+
+    assert(replay_state.n_audio_samples > 0);
+    replay_state.n_audio_samples--;
+}
+
+void replay_audio_in_finish(void)
+{
+    assert(replay_state.n_audio_samples == 0);
+
+    if (replay_mode == REPLAY_MODE_PLAY) {
+        replay_finish_event();
+    }
+}

diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 75249b7693612d2fd33ce6d37003d68928aac709..643b357da121164caf3a28c25d46d6911c26b9c6 100644 (file)
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -85,6 +85,7 @@ enum ReplayEvents {
  * @file_offset: offset into replay log at replay snapshot
  * @block_request_id: current serialised block request id
  * @read_event_id: current async read event id
+ * @n_audio_samples: expected audio samples
  */
 typedef struct ReplayState {
     int64_t cached_clock[REPLAY_CLOCK_COUNT];
@@ -96,6 +97,7 @@ typedef struct ReplayState {
     uint64_t file_offset;
     uint64_t block_request_id;
     uint64_t read_event_id;
+    size_t n_audio_samples;
 } ReplayState;
 extern ReplayState replay_state;
 

diff --git a/replay/replay.c b/replay/replay.c
index b2121788c1d72315033d00cac6916507ba8aabc6..2e5c6fa82eaa22c750d39c14ad16a37eb57d8c36 100644 (file)
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -22,7 +22,7 @@
 
 /* Current version of the replay mechanism.
    Increase it when file format changes. */
-#define REPLAY_VERSION              0xe0200c
+#define REPLAY_VERSION              0xe0200d
 /* Size of replay log header */
 #define HEADER_SIZE                 (sizeof(uint32_t) + sizeof(uint64_t))
 

diff --git a/replay/stubs-system.c b/replay/stubs-system.c
index 7f85764936f131f58080f680d5afcbe0b7de543d..b2c52bc40436fe61bd76563f0ec1eff3346bc0ad 100644 (file)
--- a/replay/stubs-system.c
+++ b/replay/stubs-system.c
@@ -15,7 +15,13 @@ void replay_input_sync_event(void)
 void replay_add_blocker(const char *feature)
 {
 }
-void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)
+void replay_audio_in_start(size_t *nsamples)
+{
+}
+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)
+{
+}
+void replay_audio_in_finish(void)
 {
 }
 void replay_audio_out(size_t *played)

diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py
index 097636570dd898411190a149473fff7ad51231bc..081aaa36c5ec8a717f79850f48eb2290e8c9db78 100755 (executable)
--- a/scripts/replay-dump.py
+++ b/scripts/replay-dump.py
@@ -395,6 +395,9 @@ v12_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction),
                   Decoder(39, "EVENT_END", decode_end),
 ]
 
+# EVENT_AUDIO_IN has changed
+v13_event_table = v12_event_table
+
 def parse_arguments():
     "Grab arguments for script"
     parser = argparse.ArgumentParser()
@@ -413,7 +416,10 @@ def decode_file(filename):
     # see REPLAY_VERSION
     print("HEADER: version 0x%x" % (version))
 
-    if version == 0xe0200c:
+    if version == 0xe0200d:
+        event_decode_table = v13_event_table
+        replay_state.checkpoint_start = 30
+    elif version == 0xe0200c:
         event_decode_table = v12_event_table
         replay_state.checkpoint_start = 30
     elif version == 0xe02007:

diff --git a/tests/audio/audio-stubs.c b/tests/audio/audio-stubs.c
index dd7f635d460b65829c69e5e4127d931c8320e0e9..2c19dfa7d6bb27b66dfc0582786c5c92f34dcaff 100644 (file)
--- a/tests/audio/audio-stubs.c
+++ b/tests/audio/audio-stubs.c
@@ -35,12 +35,19 @@ dbus_win32_import_socket(GDBusMethodInvocation *invocation,
 }
 #endif
 
-void replay_audio_in(size_t *recorded, st_sample *samples,
-                     size_t *wpos, size_t size)
+void replay_audio_out(size_t *played)
 {
 }
 
-void replay_audio_out(size_t *played)
+void replay_audio_in_start(size_t *nsamples)
+{
+}
+
+void replay_audio_in_sample_lr(uint64_t *left, uint64_t *right)
+{
+}
+
+void replay_audio_in_finish(void)
 {
 }