Implementing own MVE library #289

winterheart · 2024-05-05T20:44:38Z

Pull Request Type

Description

Implementing own MVE library under GPLv3+ license based on D2X work. Currently works video with audio and framed playback (for main menu) on Linux and probably macOS. Windows build is expected to fail as need to adapt DirectSound PCM playback, and there I can use some help with experience of DirectX 6 programming.

Old MVE implementation still here in codebase, we need to decide what to do with it.

Related Issues

Fixes #253.

Screenshots (if applicable)

Checklist

I have tested my changes locally and verified that they work as intended.
I have documented any new or modified functionality.
I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

Lgt2x · 2024-05-06T09:09:23Z

THIRD_PARTY.md

@@ -0,0 +1,63 @@
+# Third party components
+
+This file contains information about third party components, required for


Should we move third parties to a separate directory ? It would make sense in terms of licensing. This way we could internalize again zlib and spdlog easily if we want to

This is a personal preference so feel free to ignore me; I like single-word names like externals whenever possible. If not possible, underscores over spaces. +1 to separate directory for included externals like zlib.

How about thirdparty/libmve?

Lgt2x · 2024-05-06T09:17:47Z

libmve/SystemInterfaces.h

-#define LNXSND_VOLUME_MIN -10000
-#define LNXSND_PAN_LEFT -10000
+#define LNXSND_VOLUME_MIN (-10000)
+#define LNXSND_PAN_LEFT (-10000)
 #define LNXSND_PAN_RIGHT 10000


Lgt2x · 2024-05-06T09:26:14Z

libmve/CMakeLists.txt

-  mveasm.cpp
-  mvelibl.cpp
-  platform.cpp)
+#  mveasm.cpp


Lgt2x · 2024-05-06T09:33:44Z

movie/d3movie.cpp

@@ -596,7 +588,7 @@ int NextPow2(int n) {
 void BlitToMovieBitmap(unsigned char *buf, unsigned int bufw, unsigned int bufh, unsigned int hicolor,
                       bool usePow2Texture, int &texW, int &texH) {
  // get some sizes
-  int drawWidth = hicolor ? (bufw >> 1) : bufw;


What is hicolor doing ? l. 612/620 still tests for it

hicolor is indicator that MVE is 16-bit color (there two types of MVEs - 8bit paletted - Dolby Sound intro, and hicolor/truecolor - other intros and videos).
Regarding to changes - there was unnecessary doubling and halving back size of width in old libmve and movie callbacks.

Lgt2x · 2024-05-06T21:03:31Z

I think you're aware but video sound cuts on playback when I tested.

winterheart · 2024-05-07T00:11:35Z

I think you're aware but video sound cuts on playback when I tested.

Well, surprisingly, I don't have any issues with new mve playback. Maybe there sound buffer too short...

Lgt2x · 2024-05-07T07:56:41Z

I think you're aware but video sound cuts on playback when I tested.

Well, surprisingly, I don't have any issues with new mve playback. Maybe there sound buffer too short...

Sound works for a couple seconds, stops and starts again 2 seconds later. I can provide a recording if needed

winterheart · 2024-05-07T08:26:26Z

Probably here issue:

  SDL_AudioSpec spec {
      .freq = sample_rate,
      .format = (unsigned short)format,
      .channels = (unsigned char)(stereo ? 2 : 1),
      .size = (unsigned int)desired_buffer,
      .callback = mve_audio_callback,
  };

Can you please try set size with 4096 or more on spec in mveplay.c for testing?

Lgt2x · 2024-05-07T08:31:48Z

It works without a problem with hardcoded size=4096

winterheart · 2024-05-07T08:37:04Z

Probably I should move it out into configuration with default value 4096.

winterheart · 2024-05-16T12:22:49Z

I decided to make a hybrid build with SDL2 backend for MVE sound playback and DSound for the rest. Still, I need some testing on real Windows platform.

Lgt2x

Really nice, thank you for taking care of that. I'll test on Windows before merging. libmve should go in the thirdparty dir that did not exist when you first started this, but it can be moved later.

Lgt2x · 2024-05-22T17:48:22Z

And you have some conflict resolution to do :)

JeodC · 2024-05-22T17:56:16Z

Really nice, thank you for taking care of that. I'll test on Windows before merging. libmve should go in the thirdparty dir that did not exist when you first started this, but it can be moved later.

Windows sound is not working yet. You approved before testing.

Added D2X implementation licensed under GPLv3 terms. Cut from https://github.com/btb/d2x/tree/c030c4531ad19f1658ea9635ff4ee6861e1d15e0

Adapting movie and mve interfaces each other. Converted open() to fopen() et al. calls. movie expected image as RGB565 from old mve, but now it's RGB555, so there no need additional conversion. Fixed hicolor related conversion of width in movie's callbacks. Headers cleanup in both subsystems. Sound and frame callbacks are still unavailable.

Merge libmve.h into mvelib.h

Reorganized MVE to use own MVESTREAM pointer for each opened MVE file.

Sound supported by SDL backend.

Replaced SDL 1.2 legacy calls to SDL2 equivalents. Changed spec.size to fixed value 4096 as values obtained from file can produce sound stuttering.

Replacing circular ring implementation with queue that keeps decoded data between SDL audio callbacks.

Implemented abstraction layer and SDL backend.

winterheart · 2024-05-30T19:54:26Z

I've reimplemented initial DSound support on Windows, but unfortunately there some regressions: sound crackling and stutters on playback in Windows. There need some synchronization between frames and audio playback.

winterheart force-pushed the mve branch from 89c9649 to d12a4f8 Compare May 5, 2024 20:53

Lgt2x self-requested a review May 6, 2024 09:05

Lgt2x reviewed May 6, 2024

View reviewed changes

Lgt2x mentioned this pull request May 6, 2024

Remove pragma ignoring -Wnarrowing #48

Closed

JeodC mentioned this pull request May 6, 2024

CI artifacts lack licenses for libraries #295

Closed

winterheart force-pushed the mve branch from d12a4f8 to 0911fe9 Compare May 7, 2024 00:22

winterheart mentioned this pull request May 8, 2024

[Runtime Issue]: choppy and intermittent audio in videos/cutscenes in raspberry pi 4/5 64 bit, otherwise ok #310

Closed

20 tasks

winterheart force-pushed the mve branch 5 times, most recently from 3447263 to ca2c4e9 Compare May 15, 2024 23:47

JeodC mentioned this pull request May 18, 2024

[Runtime Issue]: Sometimes level 5’s cutscene doesn’t fill the screen #365

Open

20 tasks

winterheart force-pushed the mve branch from ca2c4e9 to 4671407 Compare May 18, 2024 22:37

winterheart mentioned this pull request May 20, 2024

Unify and cleanup sound related code into single sndlib module #374

Merged

13 tasks

JeodC mentioned this pull request May 21, 2024

Fix cross-compiling "int $3" build error #380

Closed

13 tasks

Lgt2x approved these changes May 22, 2024

View reviewed changes

Lgt2x mentioned this pull request May 22, 2024

Fix libmve bug #359

Closed

13 tasks

winterheart force-pushed the mve branch from 4671407 to b5999b2 Compare May 22, 2024 21:06

bryanperris added enhancement Something to modernize things needs testing Needs testing to confirm issue or resolution labels May 23, 2024

winterheart force-pushed the mve branch 2 times, most recently from 162a065 to ee18505 Compare May 25, 2024 22:21

winterheart marked this pull request as draft May 25, 2024 22:22

winterheart added 13 commits May 30, 2024 00:22

Add D2X implementation of MVE

0886f3c

Added D2X implementation licensed under GPLv3 terms. Cut from https://github.com/btb/d2x/tree/c030c4531ad19f1658ea9635ff4ee6861e1d15e0

MVE: add copyright headers, clang-format

fc0ae47

MVE: convert libmve files to C++

40c41de

MVE: Refactoring code

b98c06e

Merge libmve.h into mvelib.h

MVE: Implementing frame playing (main menu)

dfce58b

Reorganized MVE to use own MVESTREAM pointer for each opened MVE file.

MVE: Initial sound support

2426cb9

Sound supported by SDL backend.

MVE: Add support for big-endian systems

0e5df69

MVE: Migrate to SDL2 functions

87d3187

Replaced SDL 1.2 legacy calls to SDL2 equivalents. Changed spec.size to fixed value 4096 as values obtained from file can produce sound stuttering.

MVE: use deque for FIFO buffer

3ebf0d0

Replacing circular ring implementation with queue that keeps decoded data between SDL audio callbacks.

MVE: Implementing class for sound playback

9a1a17a

Implemented abstraction layer and SDL backend.

MVE: Initial support of DSound playback

41386ef

MVE: Make timer code crossplatform

5969f27

winterheart force-pushed the mve branch from ee18505 to 5969f27 Compare May 30, 2024 19:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementing own MVE library #289

Implementing own MVE library #289

winterheart commented May 5, 2024

Lgt2x May 6, 2024

JeodC May 6, 2024 •

edited

bryanperris May 23, 2024

Lgt2x May 6, 2024

Lgt2x May 6, 2024

Lgt2x May 6, 2024

winterheart May 6, 2024

Lgt2x commented May 6, 2024

winterheart commented May 7, 2024

Lgt2x commented May 7, 2024

winterheart commented May 7, 2024

Lgt2x commented May 7, 2024

winterheart commented May 7, 2024

winterheart commented May 16, 2024

Lgt2x left a comment

Lgt2x commented May 22, 2024

JeodC commented May 22, 2024 •

edited

winterheart commented May 30, 2024

		@@ -0,0 +1,63 @@
		# Third party components

		This file contains information about third party components, required for

Implementing own MVE library #289

Are you sure you want to change the base?

Implementing own MVE library #289

Conversation

winterheart commented May 5, 2024

Pull Request Type

Description

Related Issues

Screenshots (if applicable)

Checklist

Additional Comments

Lgt2x May 6, 2024

Choose a reason for hiding this comment

JeodC May 6, 2024 • edited

Choose a reason for hiding this comment

bryanperris May 23, 2024

Choose a reason for hiding this comment

Lgt2x May 6, 2024

Choose a reason for hiding this comment

Lgt2x May 6, 2024

Choose a reason for hiding this comment

Lgt2x May 6, 2024

Choose a reason for hiding this comment

winterheart May 6, 2024

Choose a reason for hiding this comment

Lgt2x commented May 6, 2024

winterheart commented May 7, 2024

Lgt2x commented May 7, 2024

winterheart commented May 7, 2024

Lgt2x commented May 7, 2024

winterheart commented May 7, 2024

winterheart commented May 16, 2024

Lgt2x left a comment

Choose a reason for hiding this comment

Lgt2x commented May 22, 2024

JeodC commented May 22, 2024 • edited

winterheart commented May 30, 2024

JeodC May 6, 2024 •

edited

JeodC commented May 22, 2024 •

edited