wip: save timestamp

walkawayy · Jul 19, 2023 · 4518944 · 4518944
1 parent b79954a
commit 4518944
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/game/savegame/savegame_bson.c b/src/game/savegame/savegame_bson.c
@@ -1222,7 +1222,7 @@ bool Savegame_BSON_LoadFromFile(MYFILE *fp, GAME_INFO *game_info)
 
     int16_t load_track = json_object_get_int(root_obj, "music_track", -1);
 
-    int32_t timestamp_arr[2];
+    int64_t timestamp_arr[2];
     timestamp_arr[0] = json_object_get_int(root_obj, "music_timestamp1", -1);
     timestamp_arr[1] = json_object_get_int(root_obj, "music_timestamp2", -1);
     LOG_DEBUG("music_timestamp1 %d", timestamp_arr[0]);
@@ -1308,7 +1308,7 @@ void Savegame_BSON_SaveToFile(MYFILE *fp, GAME_INFO *game_info)
     if (save_track) {
         save_timestamp = Music_GetTimestamp(Music_CurrentTrack());
     }
-    int *timestamp_arr = (int *)&save_timestamp;
+    int64_t *timestamp_arr = (int64_t *)&save_timestamp;
     json_object_append_int(root_obj, "music_timestamp1", timestamp_arr[0]);
     json_object_append_int(root_obj, "music_timestamp2", timestamp_arr[1]);
     LOG_DEBUG("music_timestamp1 %d", timestamp_arr[0]);

diff --git a/src/specific/s_audio_stream.c b/src/specific/s_audio_stream.c
@@ -528,8 +528,14 @@ int64_t S_Audio_StreamGetTimestamp(int sound_id)
         LOG_DEBUG("Getting timestamp for sound_id %d.", sound_id);
         SDL_LockAudioDevice(g_AudioDeviceID);
         AUDIO_STREAM_SOUND *stream = &m_StreamSounds[sound_id];
-        return stream->av.frame->best_effort_timestamp;
+        int64_t timestamp = 0;
+        int ret = avcodec_receive_frame(stream->av.codec_ctx, stream->av.frame);
+        if (ret >= 0) {
+            timestamp = stream->av.frame->best_effort_timestamp;
+        }
         SDL_UnlockAudioDevice(g_AudioDeviceID);
+        LOG_DEBUG("Timestamp: %d.", timestamp);
+        return timestamp;
     }
 
     return -1;