Skip to content

RDKEMW-15922: Coverity fix changes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trupthi1403 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKEMW-15922: Coverity fix changes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions linux-expsync/westeros-linux-expsync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <memory.h>
#include <unistd.h>
#include <assert.h>
#include <inttypes.h>

#include "westeros-linux-expsync.h"

Expand Down
19 changes: 6 additions & 13 deletions westeros-player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,32 +716,26 @@ int main( int argc, char **argv )

while( g_ctx )
{
struct stat finfo;
if ( stat( "/tmp/wp-pause", &finfo ) == 0 )
if ( remove( "/tmp/wp-pause" ) == 0 )
{
remove( "/tmp/wp-pause" );
gst_element_set_state(ctx->pipeline, GST_STATE_PAUSED);
}
else if ( stat( "/tmp/wp-play", &finfo ) == 0 )
else if ( remove( "/tmp/wp-play" ) == 0 )
{
remove( "/tmp/wp-play" );
gst_element_set_state(ctx->pipeline, GST_STATE_PLAYING);
}
else if ( stat( "/tmp/wp-show", &finfo ) == 0 )
else if ( remove( "/tmp/wp-show" ) == 0 )
{
remove( "/tmp/wp-show" );
g_object_set(G_OBJECT(ctx->westerossink), "show-video-window", TRUE, NULL );
}
else if ( stat( "/tmp/wp-hide", &finfo ) == 0 )
else if ( remove( "/tmp/wp-hide" ) == 0 )
{
remove( "/tmp/wp-hide" );
g_object_set(G_OBJECT(ctx->westerossink), "show-video-window", FALSE, NULL );
}
else if ( stat( "/tmp/wp-zoom", &finfo ) == 0 )
else if ( remove( "/tmp/wp-zoom" ) == 0 )
{
static bool full= true;
char work[32];
remove( "/tmp/wp-zoom" );
if ( full )
{
sprintf( work, "%d,%d,%d,%d", 200, 200, 640, 360 );
Expand All @@ -753,10 +747,9 @@ int main( int argc, char **argv )
full= !full;
g_object_set(G_OBJECT(ctx->westerossink), "window-set", work, NULL );
}
else if ( stat( "/tmp/wp-peek", &finfo ) == 0 )
else if ( remove( "/tmp/wp-peek" ) == 0 )
{
GstState state, pending;
remove( "/tmp/wp-peek" );

gst_element_seek( ctx->pipeline,
1.0,
Expand Down
28 changes: 19 additions & 9 deletions westeros-render-embedded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static char message[1024];
static bool emitFPS= false;


#define MAX_TEXTURES (2)
#define MAX_TEXTURES (4)
Comment thread
trupthi1403 marked this conversation as resolved.

struct _WstRenderSurface
{
Expand Down Expand Up @@ -327,6 +327,7 @@ typedef struct _WstRendererEMB
float baseZOrder;
bool fastPathActive;
WstRenderer *rendererFast;
void *moduleFast;

} WstRendererEMB;

Expand Down Expand Up @@ -668,6 +669,11 @@ static void wstRendererEMBDestroy( WstRendererEMB *renderer )
free( renderer->rendererFast );
renderer->rendererFast= 0;
}
if ( renderer->moduleFast )
{
dlclose( renderer->moduleFast );
renderer->moduleFast= 0;
}
free( renderer );
}
}
Expand Down Expand Up @@ -2140,7 +2146,7 @@ static void wstRendererUpdateScene( WstRenderer *renderer )
rendererEMB->fastPathActive= false;
}

if ( rendererEMB->fastPathActive )
if ( rendererEMB->fastPathActive && rendererEMB->rendererFast )
{
rendererEMB->rendererFast->outputX= renderer->outputX;
rendererEMB->rendererFast->outputY= renderer->outputY;
Expand Down Expand Up @@ -2258,16 +2264,19 @@ static void wstRendererUpdateScene( WstRenderer *renderer )
int renderFenceFd;
rendererEMB->displaySync= wstCreateRenderSync(rendererEMB);
renderFenceFd= wstCreateFenceFd(rendererEMB, rendererEMB->displaySync);
for( int i= 0; i < imax; ++i )
if ( renderFenceFd >= 0 )
{
WstRenderSurface *surface= rendererEMB->surfaces[i];
if ( surface->visible && (surface->bufferSync.bufferRelease != NULL) )
for( int i= 0; i < imax; ++i )
{
assert( surface->bufferSync.bufferRelease->renderFenceFd == -1 );
surface->bufferSync.bufferRelease->renderFenceFd= dup(renderFenceFd);
WstRenderSurface *surface= rendererEMB->surfaces[i];
if ( surface->visible && (surface->bufferSync.bufferRelease != NULL) )
{
assert( surface->bufferSync.bufferRelease->renderFenceFd == -1 );
surface->bufferSync.bufferRelease->renderFenceFd= dup(renderFenceFd);
}
}
close(renderFenceFd);
}
close(renderFenceFd);
}
#endif
}
Expand Down Expand Up @@ -2344,7 +2353,7 @@ static void wstRendererSurfaceCommit( WstRenderer *renderer, WstRenderSurface *s
rendererEMB->fastPathActive= false;
}

if ( rendererEMB->fastPathActive )
if ( rendererEMB->fastPathActive && rendererEMB->rendererFast )
{
rendererEMB->rendererFast->surfaceCommit( rendererEMB->rendererFast, surface->surfaceFast, resource );
return;
Expand Down Expand Up @@ -2783,6 +2792,7 @@ static void wstRendererInitFastPath( WstRendererEMB *renderer )
}

renderer->rendererFast= rendererFast;
renderer->moduleFast= module;

{
renderer->baseZOrder= 0.5;
Expand Down
17 changes: 10 additions & 7 deletions westeros-render-gl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ typedef struct _WstShader

static char message[1024];

#define MAX_TEXTURES (2)
#define MAX_TEXTURES (4)
Comment thread
trupthi1403 marked this conversation as resolved.

struct _WstRenderSurface
{
Expand Down Expand Up @@ -2319,16 +2319,19 @@ static void wstRendererUpdateScene( WstRenderer *renderer )
int renderFenceFd;
rendererGL->displaySync= wstCreateRenderSync(rendererGL);
renderFenceFd= wstCreateFenceFd(rendererGL, rendererGL->displaySync);
for( int i= 0; i < imax; ++i )
if ( renderFenceFd >= 0 )
{
WstRenderSurface *surface= rendererGL->surfaces[i];
if ( surface->visible && (surface->bufferSync.bufferRelease != NULL) )
for( int i= 0; i < imax; ++i )
{
assert( surface->bufferSync.bufferRelease->renderFenceFd == -1 );
surface->bufferSync.bufferRelease->renderFenceFd= dup(renderFenceFd);
WstRenderSurface *surface= rendererGL->surfaces[i];
if ( surface->visible && (surface->bufferSync.bufferRelease != NULL) )
{
assert( surface->bufferSync.bufferRelease->renderFenceFd == -1 );
surface->bufferSync.bufferRelease->renderFenceFd= dup(renderFenceFd);
}
}
close(renderFenceFd);
}
close(renderFenceFd);
}
#endif

Expand Down
12 changes: 8 additions & 4 deletions westeros-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ static long long currentTimeMillis()
struct timeval tv;

gettimeofday(&tv, NULL);
timeMillis = tv.tv_sec * 1000 + tv.tv_usec / 1000;
timeMillis = (long long)tv.tv_sec * 1000LL + tv.tv_usec / 1000;

return timeMillis;
}
Expand Down Expand Up @@ -869,7 +869,7 @@ static void shellSurfaceStatus(void *data,
AppCtx *ctx = (AppCtx*)data;
AppSurface* surf;

printf("shellSurfaceStatus: id=%u name=%s x=%d y=%d w=%d h=%d visible=%d opacity=%d zorder=%f\n",
printf("shellSurfaceStatus: id=%u name=%s x=%d y=%d w=%d h=%d visible=%u opacity=%f zorder=%f\n",
surfaceId, name, x, y, width, height, visible,
wl_fixed_to_double(opacity), wl_fixed_to_double(zorder));

Expand Down Expand Up @@ -1306,10 +1306,14 @@ int main( int argc, char** argv)
{
int v= atoi(argv[++i]);
printf("v=%d\n", v);
if ( v > 0 )
if ( v > 0 && v < 1000000 )
{
delay= v;
printf("using delay=%d\n", delay );
}
else if ( v >= 1000000 )
{
printf("warning: delay value %d exceeds maximum (999999), keeping previous value\n", v);
}
}
}
Expand Down Expand Up @@ -2254,4 +2258,4 @@ static void renderGL( AppCtx *ctx, int width, int height, long long startTime, b
{
printf( "renderGL: glGetError() = %X\n", err );
}
}
}
Loading