From 63a9e2d22d7aa61936f8d9bfe13e20b431f275fe Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Tue, 16 Apr 2019 15:42:37 +0100
Subject: [PATCH] Change CalypStream methods to support const

---
 lib/CalypStream.cpp      | 26 +++++++++++++++-----------
 lib/CalypStream.h        | 25 ++++++++++++++-----------
 lib/StreamHandlerRaw.cpp |  1 +
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/lib/CalypStream.cpp b/lib/CalypStream.cpp
index b140407..eaeddb9 100644
--- a/lib/CalypStream.cpp
+++ b/lib/CalypStream.cpp
@@ -229,11 +229,11 @@ CalypStream::~CalypStream()
   close();
 }
 
-ClpString CalypStream::getFormatName()
+ClpString CalypStream::getFormatName() const
 {
   return !d->handler ? "" : d->handler->getFormatName();
 }
-ClpString CalypStream::getCodecName()
+ClpString CalypStream::getCodecName() const
 {
   return !d->handler ? "" : d->handler->getCodecName();
 }
@@ -392,17 +392,17 @@ void CalypStream::close()
   d->isInit = false;
 }
 
-ClpString CalypStream::getFileName()
+ClpString CalypStream::getFileName() const
 {
   return d->cFilename;
 }
 
-bool CalypStream::isNative()
+bool CalypStream::isNative() const
 {
   return d->handler->m_bNative;
 }
 
-ClpULong CalypStream::getFrameNum()
+ClpULong CalypStream::getFrameNum() const
 {
   return d->handler->m_uiTotalNumberFrames;
 }
@@ -414,22 +414,26 @@ unsigned int CalypStream::getHeight() const
 {
   return d->handler->m_uiHeight;
 }
+unsigned int CalypStream::getBitsPerPixel() const
+{
+  return d->handler->m_uiBitsPerPixel;
+}
 int CalypStream::getEndianess() const
 {
   return d->handler->m_iEndianness;
 }
-double CalypStream::getFrameRate()
+double CalypStream::getFrameRate() const
 {
   return d->handler->m_dFrameRate;
 }
 
-long CalypStream::getCurrFrameNum()
+long CalypStream::getCurrFrameNum() const
 {
   return d->iCurrFrameNum;
 }
 
 void CalypStream::getFormat( unsigned int& rWidth, unsigned int& rHeight, int& rInputFormat, unsigned int& rBitsPerPel, int& rEndianness,
-                             unsigned int& rFrameRate )
+                             unsigned int& rFrameRate ) const
 {
   if( d->isInit )
   {
@@ -475,7 +479,7 @@ void CalypStream::loadAll()
   d->iCurrFrameNum = 0;
 }
 
-void CalypStream::getDuration( int* duration_array )
+void CalypStream::getDuration( int* duration_array ) const
 {
   //   int hours, mins, secs = 0;
   // #ifdef USE_FFMPEG
@@ -574,7 +578,7 @@ void CalypStream::readNextFrameFillRGBBuffer()
   return;
 }
 
-CalypFrame* CalypStream::getCurrFrame( CalypFrame* pyuv_image )
+CalypFrame* CalypStream::getCurrFrame( CalypFrame* pyuv_image ) const
 {
   if( pyuv_image == NULL )
     pyuv_image = new CalypFrame( d->frameBuffer->current() );
@@ -583,7 +587,7 @@ CalypFrame* CalypStream::getCurrFrame( CalypFrame* pyuv_image )
   return pyuv_image;
 }
 
-CalypFrame* CalypStream::getCurrFrame()
+CalypFrame* CalypStream::getCurrFrame() const
 {
   return d->frameBuffer->current();
 }
diff --git a/lib/CalypStream.h b/lib/CalypStream.h
index 969d0a8..8c3c2ff 100644
--- a/lib/CalypStream.h
+++ b/lib/CalypStream.h
@@ -67,8 +67,10 @@ public:
   CalypStream();
   ~CalypStream();
 
-  ClpString getFormatName();
-  ClpString getCodecName();
+  ClpString getFormatName() const;
+  ;
+  ClpString getCodecName() const;
+  ;
 
   bool open( ClpString filename, ClpString resolution, ClpString input_format, unsigned int bitsPel, int endianness, unsigned int frame_rate,
              bool bInput );
@@ -77,16 +79,17 @@ public:
   bool reload();
   void close();
 
-  bool isNative();
-  ClpString getFileName();
-  ClpULong getFrameNum();
+  bool isNative() const;
+  ClpString getFileName() const;
+  ClpULong getFrameNum() const;
   unsigned int getWidth() const;
   unsigned int getHeight() const;
+  unsigned int getBitsPerPixel() const;
   int getEndianess() const;
-  long getCurrFrameNum();
-  double getFrameRate();
+  long getCurrFrameNum() const;
+  double getFrameRate() const;
   void getFormat( unsigned int& rWidth, unsigned int& rHeight, int& rInputFormat, unsigned int& rBitsPerPel, int& rEndianness,
-                  unsigned int& rFrameRate );
+                  unsigned int& rFrameRate ) const;
 
   void loadAll();
 
@@ -96,18 +99,18 @@ public:
   bool saveFrame( const ClpString& filename );
   static bool saveFrame( const ClpString& filename, CalypFrame* saveFrame );
 
-  CalypFrame* getCurrFrame( CalypFrame* );
+  CalypFrame* getCurrFrame( CalypFrame* ) const;
 
   // continuous read control
   bool setNextFrame();
   void readNextFrame();
   void readNextFrameFillRGBBuffer();
-  CalypFrame* getCurrFrame();
+  CalypFrame* getCurrFrame() const;
 
   bool seekInputRelative( bool bIsFoward );
   bool seekInput( unsigned long new_frame_num );
 
-  void getDuration( int* duration_array );
+  void getDuration( int* duration_array ) const;
 
 private:
   bool readFrame( CalypFrame* frame );
diff --git a/lib/StreamHandlerRaw.cpp b/lib/StreamHandlerRaw.cpp
index cc9f464..01a7de1 100644
--- a/lib/StreamHandlerRaw.cpp
+++ b/lib/StreamHandlerRaw.cpp
@@ -57,6 +57,7 @@ bool StreamHandlerRaw::openHandler( ClpString strFilename, bool bInput )
   calculateFrameNumber();
   m_strFormatName = "YUV";
   m_strCodecName = "Raw Video";
+  m_dFrameRate = 30;
   return true;
 }