Commit 9f63d1c2 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Staying consistant in types

parent f31a26be
......@@ -89,7 +89,9 @@ float WorkflowFileRenderer::getFps() const
return m_outputFps;
}
int WorkflowFileRenderer::lock( void *datas, int64_t *dts, int64_t *pts, unsigned int *flags, size_t *bufferSize, void **buffer )
int
WorkflowFileRenderer::lock( void *datas, qint64 *dts, qint64 *pts, quint32 *flags,
size_t *bufferSize, void **buffer )
{
WorkflowFileRenderer* self = reinterpret_cast<WorkflowFileRenderer*>( datas );
int ret = WorkflowRenderer::lock( datas, dts, pts, flags, bufferSize, buffer );
......
......@@ -39,7 +39,8 @@ public:
WorkflowFileRenderer( const QString& outputFileName );
virtual ~WorkflowFileRenderer();
static int lock( void* datas, int64_t *dts, int64_t *pts, unsigned int *flags, size_t *bufferSize, void **buffer );
static int lock( void* datas, qint64 *dts, qint64 *pts, quint32 *flags,
size_t *bufferSize, void **buffer );
static void unlock( void* datas, size_t size, void* buff );
void run();
......
......@@ -99,7 +99,9 @@ WorkflowRenderer::~WorkflowRenderer()
delete m_waitCond;
}
int WorkflowRenderer::lock( void *datas, int64_t *dts, int64_t *pts, unsigned int *flags, size_t *bufferSize, void **buffer )
int
WorkflowRenderer::lock( void *datas, qint64 *dts, qint64 *pts, quint32 *flags,
size_t *bufferSize, void **buffer )
{
int ret = 1;
EsHandler* handler = reinterpret_cast<EsHandler*>( datas );
......@@ -124,7 +126,8 @@ int WorkflowRenderer::lock( void *datas, int64_t *dts, int64_t *pts, unsigne
return ret;
}
int WorkflowRenderer::lockVideo( int64_t *pts, size_t *bufferSize, void **buffer )
int
WorkflowRenderer::lockVideo( qint64 *pts, size_t *bufferSize, void **buffer )
{
qint64 ptsDiff = 0;
......@@ -148,7 +151,8 @@ int WorkflowRenderer::lockVideo( int64_t *pts, size_t *bufferSize, void **bu
return 0;
}
int WorkflowRenderer::lockAudio( int64_t *pts, size_t *bufferSize, void **buffer )
int
WorkflowRenderer::lockAudio( qint64 *pts, size_t *bufferSize, void **buffer )
{
qint64 ptsDiff;
......
......@@ -276,8 +276,8 @@ class WorkflowRenderer : public GenericRenderer
* \param bufferSize The size of the buffer that will be provided
* \param buffer The buffer itself.
*/
static int lock( void *data, int64_t *dts, int64_t *pts,
unsigned int *flags, size_t *bufferSize, void **buffer );
static int lock( void *data, qint64 *dts, qint64 *pts,
quint32 *flags, size_t *bufferSize, void **buffer );
/**
* \brief "Subcallback", for video frame injection
*
......@@ -285,7 +285,7 @@ class WorkflowRenderer : public GenericRenderer
* \param bufferSize The size of the buffer that will be provided
* \param buffer The buffer itself.
*/
int lockVideo( int64_t *pts, size_t *bufferSize, void **buffer );
int lockVideo( qint64 *pts, size_t *bufferSize, void **buffer );
/**
* \brief "Subcallback", for audio sample injection
*
......@@ -293,7 +293,7 @@ class WorkflowRenderer : public GenericRenderer
* \param bufferSize The size of the buffer that will be provided
* \param buffer The buffer itself.
*/
int lockAudio( int64_t *pts, size_t *bufferSize, void **buffer );
int lockAudio( qint64 *pts, size_t *bufferSize, void **buffer );
/**
* \brief unlock callback for the imem module
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment