diff options
Diffstat (limited to 'src/lib/util/aviio.cpp')
-rw-r--r-- | src/lib/util/aviio.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/util/aviio.cpp b/src/lib/util/aviio.cpp index 728781dd8fc..bd93cbe1847 100644 --- a/src/lib/util/aviio.cpp +++ b/src/lib/util/aviio.cpp @@ -366,8 +366,8 @@ public: avi_file::error huffyuv_decompress_to_yuy16(const std::uint8_t *data, std::uint32_t numbytes, bitmap_yuy16 &bitmap) const; // Uncompressed helpers - avi_file::error uncompressed_rgb24_to_rgb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_rgb32 &bitmap) const; - avi_file::error uncompressed_yuv420p_to_rgb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_rgb32 &bitmap) const; + avi_file::error uncompressed_rgb24_to_argb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_argb32 &bitmap) const; + avi_file::error uncompressed_yuv420p_to_argb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_argb32 &bitmap) const; private: struct huffyuv_table @@ -460,7 +460,7 @@ public: virtual movie_info const &get_movie_info() const override; virtual std::uint32_t first_sample_in_frame(std::uint32_t framenum) const override; - virtual error read_uncompressed_video_frame(std::uint32_t framenum, bitmap_rgb32 &bitmap) override; + virtual error read_uncompressed_video_frame(std::uint32_t framenum, bitmap_argb32 &bitmap) override; virtual error read_video_frame(std::uint32_t framenum, bitmap_yuy16 &bitmap) override; virtual error read_sound_samples(int channel, std::uint32_t firstsample, std::uint32_t numsamples, std::int16_t *output) override; @@ -1489,11 +1489,11 @@ avi_file::error avi_stream::huffyuv_decompress_to_yuy16(const std::uint8_t *data /*------------------------------------------------- - uncompressed_rgb24_to_rgb32 - convert a raw - RGB24-encoded frame to an RGB32 bitmap + uncompressed_rgb24_to_argb32 - convert a raw + RGB24-encoded frame to an ARGB32 bitmap -------------------------------------------------*/ -avi_file::error avi_stream::uncompressed_rgb24_to_rgb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_rgb32 &bitmap) const +avi_file::error avi_stream::uncompressed_rgb24_to_argb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_argb32 &bitmap) const { std::uint32_t dataoffs = 0; @@ -1517,11 +1517,11 @@ avi_file::error avi_stream::uncompressed_rgb24_to_rgb32(const std::uint8_t *data /*------------------------------------------------- - uncompressed_yuv420p_to_rgb32 - convert a - YUV420p-encoded frame to an RGB32 bitmap + uncompressed_yuv420p_to_argb32 - convert a + YUV420p-encoded frame to an ARGB32 bitmap -------------------------------------------------*/ -avi_file::error avi_stream::uncompressed_yuv420p_to_rgb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_rgb32 &bitmap) const +avi_file::error avi_stream::uncompressed_yuv420p_to_argb32(const std::uint8_t *data, std::uint32_t numbytes, bitmap_argb32 &bitmap) const { const int width = bitmap.width(); const int height = bitmap.height(); @@ -1676,10 +1676,10 @@ std::uint32_t avi_file_impl::first_sample_in_frame(std::uint32_t framenum) const /*------------------------------------------------- read_uncompressed_video_frame - read raw video data for a particular frame from the AVI file, - converting to RGB32 format + converting to ARGB32 format -------------------------------------------------*/ -avi_file::error avi_file_impl::read_uncompressed_video_frame(std::uint32_t framenum, bitmap_rgb32 &bitmap) +avi_file::error avi_file_impl::read_uncompressed_video_frame(std::uint32_t framenum, bitmap_argb32 &bitmap) { /* get the video stream */ avi_stream *const stream = get_video_stream(); @@ -1718,9 +1718,9 @@ avi_file::error avi_file_impl::read_uncompressed_video_frame(std::uint32_t frame { /* uncompressed YUV420p */ if (stream->format() == FORMAT_I420) - avierr = stream->uncompressed_yuv420p_to_rgb32(&m_tempbuffer[8], stream->chunk(framenum).length - 8, bitmap); + avierr = stream->uncompressed_yuv420p_to_argb32(&m_tempbuffer[8], stream->chunk(framenum).length - 8, bitmap); else - avierr = stream->uncompressed_rgb24_to_rgb32(&m_tempbuffer[8], stream->chunk(framenum).length - 8, bitmap); + avierr = stream->uncompressed_rgb24_to_argb32(&m_tempbuffer[8], stream->chunk(framenum).length - 8, bitmap); } else { |