diff options
Diffstat (limited to 'src/lib/util/aviio.h')
-rw-r--r-- | src/lib/util/aviio.h | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/lib/util/aviio.h b/src/lib/util/aviio.h index c951f71b22f..f7ac7bccff8 100644 --- a/src/lib/util/aviio.h +++ b/src/lib/util/aviio.h @@ -11,7 +11,6 @@ #ifndef MAME_LIB_UTIL_AVIIO_H #define MAME_LIB_UTIL_AVIIO_H -#include "osdcore.h" #include "bitmap.h" #include <cstdint> @@ -20,20 +19,13 @@ /*************************************************************************** - MACROS + INLINE FUNCTIONS ***************************************************************************/ -#define AVI_FOURCC(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) - -#define FORMAT_UYVY AVI_FOURCC('U','Y','V','Y') -#define FORMAT_VYUY AVI_FOURCC('V','Y','U','Y') -#define FORMAT_YUY2 AVI_FOURCC('Y','U','Y','2') -#define FORMAT_HFYU AVI_FOURCC('H','F','Y','U') -#define FORMAT_I420 AVI_FOURCC('I','4','2','0') -#define FORMAT_DIB AVI_FOURCC('D','I','B',' ') -#define FORMAT_RGB AVI_FOURCC('R','G','B',' ') -#define FORMAT_RAW AVI_FOURCC('R','A','W',' ') -#define FORMAT_UNCOMPRESSED 0x00000000 +inline constexpr std::uint32_t AVI_FOURCC(char a, char b, char c, char d) +{ + return std::uint32_t(a) | (std::uint32_t(b) << 8) | (std::uint32_t(c) << 16) | (std::uint32_t(d) << 24); +} class avi_file @@ -44,6 +36,19 @@ public: CONSTANTS ***********************************************************************/ + enum : std::uint32_t + { + FORMAT_UYVY = AVI_FOURCC('U','Y','V','Y'), + FORMAT_VYUY = AVI_FOURCC('V','Y','U','Y'), + FORMAT_YUY2 = AVI_FOURCC('Y','U','Y','2'), + FORMAT_HFYU = AVI_FOURCC('H','F','Y','U'), + FORMAT_I420 = AVI_FOURCC('I','4','2','0'), + FORMAT_DIB = AVI_FOURCC('D','I','B',' '), + FORMAT_RGB = AVI_FOURCC('R','G','B',' '), + FORMAT_RAW = AVI_FOURCC('R','A','W',' '), + FORMAT_UNCOMPRESSED = 0x00000000 + }; + enum class error { NONE = 0, @@ -113,7 +118,7 @@ public: static error create(std::string const &filename, movie_info const &info, ptr &file); virtual ~avi_file(); - virtual void printf_chunks() = 0; + virtual void display_chunks() = 0; static const char *error_string(error err); virtual movie_info const &get_movie_info() const = 0; |