hrev53422 adds 4 changesets to branch 'master'
old head: 42630943fd02c8e5f83f618f54e58d9899b6e4d6
new head: 3a0988b833f96c7eb352c04334c382c53e40a0f0
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=3a0988b833f9+%5E42630943fd02
----------------------------------------------------------------------------
297af3088c9b: mp3_decoder_test: Fix invalid taking address of temporary
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I2e41a048784a666de8937e224ee0cd8d17ba24ab
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1785
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
13b4d9799bbe: VideoDecoder.cpp: Fix invalid C++ extra qualification
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Ide54bce3a762826c33dafa87a1d7fdceac275619
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1786
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
132242e027a1: yuv_converter.h: Fix integer truncation
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I445d3d2c4d80b65747257c0e4fc444427599c451
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1787
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
3a0988b833f9: s3:More fixes for invalid type casts
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Id4170d950f9f79fc5edd808f49d58da974cb32b7
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1788
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Jaroslaw Pelczar <jarek@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 10 insertions(+), 8 deletions(-)
src/add-ons/accelerants/s3/virge_edid.cpp | 2 +-
src/add-ons/accelerants/s3/virge_init.cpp | 4 ++--
src/add-ons/media/media-add-ons/radeon/yuv_converter.h | 2 +-
src/tests/kits/media/VideoDecoder.cpp | 6 +++---
src/tests/kits/media/mp3_decoder_test/mp3_decoder_test.cpp | 4 +++-
############################################################################
Commit: 297af3088c9bfe32dff361793067b45e6b3121a3
URL: https://git.haiku-os.org/haiku/commit/?id=297af3088c9b
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:19:23 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:20:22 2019 UTC
mp3_decoder_test: Fix invalid taking address of temporary
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I2e41a048784a666de8937e224ee0cd8d17ba24ab
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1785
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/tests/kits/media/mp3_decoder_test/mp3_decoder_test.cpp
b/src/tests/kits/media/mp3_decoder_test/mp3_decoder_test.cpp
index 1e326d4fdb..5c1bee4bcf 100644
--- a/src/tests/kits/media/mp3_decoder_test/mp3_decoder_test.cpp
+++ b/src/tests/kits/media/mp3_decoder_test/mp3_decoder_test.cpp
@@ -128,8 +128,10 @@ main(int argc, char* argv[])
if (InitializeMp3DecodingCookie(&decodingCookie) != B_OK)
exit(1);
+ media_format rawAudioFormat = CreateRawMediaFormat();
+
media_raw_audio_format* audioOutputFormat
- = &CreateRawMediaFormat().u.raw_audio;
+ = &rawAudioFormat.u.raw_audio;
BSoundPlayer player(audioOutputFormat, "wave_player", Mp3Decoding,
NULL, &decodingCookie);
############################################################################
Commit: 13b4d9799bbe508842f2d5c05da04d6d8d3442c1
URL: https://git.haiku-os.org/haiku/commit/?id=13b4d9799bbe
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:20:14 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:20:22 2019 UTC
VideoDecoder.cpp: Fix invalid C++ extra qualification
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Ide54bce3a762826c33dafa87a1d7fdceac275619
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1786
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/tests/kits/media/VideoDecoder.cpp
b/src/tests/kits/media/VideoDecoder.cpp
index 55e5a08129..854d941654 100644
--- a/src/tests/kits/media/VideoDecoder.cpp
+++ b/src/tests/kits/media/VideoDecoder.cpp
@@ -20,7 +20,7 @@
class VideoView: public BView
{
public:
- VideoView::VideoView(BMediaTrack* track, int32 width, int32
height);
+ VideoView(BMediaTrack* track, int32 width, int32 height);
void Draw(BRect);
void KeyDown(const char*, int32);
@@ -62,8 +62,8 @@ VideoView::KeyDown(const char*, int32)
class VideoWindow: public BWindow
{
public:
- VideoWindow::VideoWindow(const char* videoFile);
- VideoWindow::~VideoWindow();
+ VideoWindow(const char* videoFile);
+ ~VideoWindow();
private:
BFile* fFile;
############################################################################
Commit: 132242e027a1cfc3fbbb6c29cad0233aab11ca77
URL: https://git.haiku-os.org/haiku/commit/?id=132242e027a1
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:21:21 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:20:22 2019 UTC
yuv_converter.h: Fix integer truncation
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: I445d3d2c4d80b65747257c0e4fc444427599c451
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1787
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/radeon/yuv_converter.h
b/src/add-ons/media/media-add-ons/radeon/yuv_converter.h
index 734616619f..2ba4b4fdae 100644
--- a/src/add-ons/media/media-add-ons/radeon/yuv_converter.h
+++ b/src/add-ons/media/media-add-ons/radeon/yuv_converter.h
@@ -20,7 +20,7 @@
- colour components should be interpolated for odd pixels
*/
- static const int8 c_offs[8] =
+ static const uint8 c_offs[8] =
{ 128, 128, 128, 128, 128, 128, 128, 128 };
static const int16 y_offs[4] =
############################################################################
Revision: hrev53422
Commit: 3a0988b833f96c7eb352c04334c382c53e40a0f0
URL: https://git.haiku-os.org/haiku/commit/?id=3a0988b833f9
Author: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Date: Wed Aug 28 15:33:47 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Aug 30 14:20:22 2019 UTC
s3:More fixes for invalid type casts
Signed-off-by: Jaroslaw Pelczar <jarek@xxxxxxxxxxxx>
Change-Id: Id4170d950f9f79fc5edd808f49d58da974cb32b7
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1788
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/s3/virge_edid.cpp
b/src/add-ons/accelerants/s3/virge_edid.cpp
index c1e58de595..137ee8a6e0 100644
--- a/src/add-ons/accelerants/s3/virge_edid.cpp
+++ b/src/add-ons/accelerants/s3/virge_edid.cpp
@@ -92,7 +92,7 @@ Virge_GetEdidInfo(edid1_info& edidInfo)
uint32 DDCPort = 0xAA;
i2c_bus bus;
- bus.cookie = (void*)DDCPort;
+ bus.cookie = (void*)(addr_t)DDCPort;
bus.set_signals = &SetI2CSignals_Alt;
bus.get_signals = &GetI2CSignals_Alt;
ddc2_init_timing(&bus);
diff --git a/src/add-ons/accelerants/s3/virge_init.cpp
b/src/add-ons/accelerants/s3/virge_init.cpp
index b726cc49db..265e91f615 100644
--- a/src/add-ons/accelerants/s3/virge_init.cpp
+++ b/src/add-ons/accelerants/s3/virge_init.cpp
@@ -89,9 +89,9 @@ Virge_Init(void)
// some DX chipsets don't seem to do it automatically.
WritePIO_8(CRTC_INDEX, 0x59);
- WritePIO_8(CRTC_DATA, (uint32)(si.videoMemPCI) >> 24);
+ WritePIO_8(CRTC_DATA, (uint8)((uint32)(si.videoMemPCI) >> 24));
WritePIO_8(CRTC_INDEX, 0x5A);
- WritePIO_8(CRTC_DATA, (uint32)(si.videoMemPCI) >> 16);
+ WritePIO_8(CRTC_DATA, (uint8)((uint32)(si.videoMemPCI) >> 16));
// Enable MMIO.
