eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
brunoherbelin
2020-04-14 23:14:53 +02:00
parent 014fd4fc5f
commit c7a69c1ac8
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaPlayer.cpp
View File

@@ -366,9 +366,6 @@ void MediaPlayer::seekTo(GstClockTime pos)
if (!seekable_) if (!seekable_)
return; return;
// remember pos
GstClockTime previous_pos = position();
// apply seek // apply seek
GstClockTime target = CLAMP(pos, 0, duration_); GstClockTime target = CLAMP(pos, 0, duration_);
execute_seek_command(target); execute_seek_command(target);
@@ -674,7 +671,7 @@ GstFlowReturn MediaPlayer::callback_pull_sample_video (GstElement *bin, MediaPla
return ret; return ret;
} }
void MediaPlayer::callback_end_of_video (GstElement *bin, MediaPlayer *m) void MediaPlayer::callback_end_of_video (GstElement *, MediaPlayer *m)
{ {
if (m) { if (m) {
// reached end of stream (eos) : might need to loop ! // reached end of stream (eos) : might need to loop !
@@ -684,7 +681,7 @@ void MediaPlayer::callback_end_of_video (GstElement *bin, MediaPlayer *m)
void MediaPlayer::callback_discoverer_process (GstDiscoverer *discoverer, GstDiscovererInfo *info, GError *err, MediaPlayer *m) void MediaPlayer::callback_discoverer_process (GstDiscoverer *discoverer, GstDiscovererInfo *info, GError *err, MediaPlayer *m)
{ {
if (!m) if (!discoverer || !m)
return; return;
// handle general errors // handle general errors
@@ -775,7 +772,7 @@ void MediaPlayer::callback_discoverer_process (GstDiscoverer *discoverer, GstDis
void MediaPlayer::callback_discoverer_finished(GstDiscoverer *discoverer, MediaPlayer *m) void MediaPlayer::callback_discoverer_finished(GstDiscoverer *discoverer, MediaPlayer *m)
{ {
// finished the discoverer : finalize open status // finished the discoverer : finalize open status
if (m) { if (discoverer && m) {
// no error message, open media // no error message, open media
if ( m->discoverer_message_.str().empty()) if ( m->discoverer_message_.str().empty())
m->execute_open(); m->execute_open();

6
MediaPlayer.h
View File

@@ -254,9 +254,9 @@ private:
bool fill_v_frame(GstBuffer *buf); bool fill_v_frame(GstBuffer *buf);
static GstFlowReturn callback_pull_sample_video (GstElement *bin, MediaPlayer *m); static GstFlowReturn callback_pull_sample_video (GstElement *bin, MediaPlayer *m);
static void callback_end_of_video (GstElement *bin, MediaPlayer *m); static void callback_end_of_video (GstElement *, MediaPlayer *m);
static void callback_discoverer_process (GstDiscoverer *discoverer_, GstDiscovererInfo *info, GError *err, MediaPlayer *m); static void callback_discoverer_process (GstDiscoverer *discoverer, GstDiscovererInfo *info, GError *err, MediaPlayer *m);
static void callback_discoverer_finished(GstDiscoverer *discoverer_, MediaPlayer *m); static void callback_discoverer_finished(GstDiscoverer *discoverer, MediaPlayer *m);
}; };

4
Resource.cpp
View File

@@ -122,7 +122,6 @@ uint Resource::getTextureDDS(const std::string& path, float *aspect_ratio)
// get the buffer = bytes [128 - ] // get the buffer = bytes [128 - ]
const char *buffer = fp + 128; const char *buffer = fp + 128;
uint components = (fourCC == FOURCC_DXT1) ? 3 : 4;
uint format = 0; uint format = 0;
switch(fourCC) switch(fourCC)
{ {
@@ -163,8 +162,7 @@ uint Resource::getTextureDDS(const std::string& path, float *aspect_ratio)
for (uint level = 0; level < mipMapCount && (width || height); ++level) for (uint level = 0; level < mipMapCount && (width || height); ++level)
{ {
uint size = ((width+3)/4)*((height+3)/4)*blockSize; uint size = ((width+3)/4)*((height+3)/4)*blockSize;
glCompressedTexImage2D(GL_TEXTURE_2D, level, format, width, height, glCompressedTexImage2D(GL_TEXTURE_2D, level, format, width, height, 0, size, buffer + offset);
0, size, buffer + offset);
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
offset += size; offset += size;