Skip to content

Commit 8ed360c

Browse files
author
Clement Champetier
committed
Merge pull request #89 from MarcAntoine-Arnaud/clean
Conflicts: src/AvTranscoder/OptionLoader.cpp
2 parents 9f430c7 + 57cb493 commit 8ed360c

31 files changed

+426
-411
lines changed

‎app/cpp/avplay/AvReader.hpp

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,60 +13,60 @@ class AvReader : public Reader
1313
{
1414
public:
1515
AvReader( const std::string& filename )
16-
: m_inputFile( filename )
17-
, m_inputVideo( NULL )
18-
, m_sourceImage( NULL )
19-
, m_imageToDisplay( NULL )
16+
: _inputFile( filename )
17+
, _inputVideo( NULL )
18+
, _sourceImage( NULL )
19+
, _imageToDisplay( NULL )
2020
{
2121
avtranscoder::ProgressListener p;
2222

23-
m_inputFile.analyse( p );
24-
m_videoStream = m_inputFile.getProperties().videoStreams.at(0).streamId;
23+
_inputFile.analyse( p );
24+
_videoStream = _inputFile.getProperties().videoStreams.at(0).streamId;
2525

26-
m_inputFile.readStream( m_videoStream );
26+
_inputFile.readStream( _videoStream );
2727

28-
m_inputVideo = new avtranscoder::InputVideo( m_inputFile.getStream( m_videoStream ) );
28+
_inputVideo = new avtranscoder::InputVideo( _inputFile.getStream( _videoStream ) );
2929

30-
m_inputVideo->setup();
30+
_inputVideo->setup();
3131

32-
m_sourceImage = new avtranscoder::VideoFrame( m_inputFile.getStream( m_videoStream ).getVideoDesc().getVideoFrameDesc() );
32+
_sourceImage = new avtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoDesc().getVideoFrameDesc() );
3333

34-
pixel.setBitsPerPixel( getComponents() * getBitDepth() );
35-
pixel.setComponents( getComponents() );
36-
pixel.setColorComponents( avtranscoder::eComponentRgb );
37-
pixel.setSubsampling( avtranscoder::eSubsamplingNone );
38-
pixel.setAlpha( false );
39-
pixel.setPlanar( false );
34+
_pixel.setBitsPerPixel( getComponents() * getBitDepth() );
35+
_pixel.setComponents( getComponents() );
36+
_pixel.setColorComponents( avtranscoder::eComponentRgb );
37+
_pixel.setSubsampling( avtranscoder::eSubsamplingNone );
38+
_pixel.setAlpha( false );
39+
_pixel.setPlanar( false );
4040

41-
VideoFrameDescToDisplay.setWidth( m_sourceImage->desc().getWidth() );
42-
VideoFrameDescToDisplay.setHeight( m_sourceImage->desc().getHeight() );
43-
VideoFrameDescToDisplay.setDar( m_sourceImage->desc().getDar() );
41+
_videoFrameDescToDisplay.setWidth( _sourceImage->desc().getWidth() );
42+
_videoFrameDescToDisplay.setHeight( _sourceImage->desc().getHeight() );
43+
_videoFrameDescToDisplay.setDar( _sourceImage->desc().getDar() );
4444

45-
VideoFrameDescToDisplay.setPixel( pixel.findPixel() );
45+
_videoFrameDescToDisplay.setPixel( _pixel.findPixel() );
4646

47-
m_imageToDisplay = new avtranscoder::VideoFrame( VideoFrameDescToDisplay );
47+
_imageToDisplay = new avtranscoder::VideoFrame( _videoFrameDescToDisplay );
4848
}
4949

5050
~AvReader()
5151
{
52-
delete m_inputVideo;
53-
delete m_sourceImage;
54-
delete m_imageToDisplay;
52+
delete _inputVideo;
53+
delete _sourceImage;
54+
delete _imageToDisplay;
5555
}
5656

5757
size_t getWidth()
5858
{
59-
return m_inputFile.getProperties().videoStreams.at(0).width;
59+
return _inputFile.getProperties().videoStreams.at(0).width;
6060
};
6161

6262
size_t getHeight()
6363
{
64-
return m_inputFile.getProperties().videoStreams.at(0).height;
64+
return _inputFile.getProperties().videoStreams.at(0).height;
6565
}
6666

6767
size_t getComponents()
6868
{
69-
return m_inputFile.getProperties().videoStreams.at(0).componentsCount;
69+
return _inputFile.getProperties().videoStreams.at(0).componentsCount;
7070
}
7171

7272
size_t getBitDepth()
@@ -76,44 +76,44 @@ class AvReader : public Reader
7676

7777
const char* readNextFrame()
7878
{
79-
++currentFrame;
80-
m_inputVideo->readNextFrame( *m_sourceImage );
81-
m_videoEssenceTransform.convert( *m_sourceImage, *m_imageToDisplay );
82-
return (const char*)m_imageToDisplay->getPtr();
79+
++_currentFrame;
80+
_inputVideo->readNextFrame( *_sourceImage );
81+
_videoEssenceTransform.convert( *_sourceImage, *_imageToDisplay );
82+
return (const char*)_imageToDisplay->getPtr();
8383
}
8484

8585
const char* readPrevFrame()
8686
{
87-
--currentFrame;
88-
return readFrameAt( currentFrame );
87+
--_currentFrame;
88+
return readFrameAt( _currentFrame );
8989
}
9090

9191
const char* readFrameAt( const size_t frame )
9292
{
9393
// /std::cout << "seek at " << frame << std::endl;
94-
m_inputFile.seekAtFrame( frame );
95-
m_inputVideo->flushDecoder();
94+
_inputFile.seekAtFrame( frame );
95+
_inputVideo->flushDecoder();
9696
return readNextFrame();
9797
}
9898

9999
void printMetadatas()
100100
{
101-
std::cout << m_inputFile << std::endl;
101+
std::cout << _inputFile << std::endl;
102102
}
103103

104104
private:
105-
avtranscoder::InputFile m_inputFile;
105+
avtranscoder::InputFile _inputFile;
106106

107-
avtranscoder::InputVideo* m_inputVideo;
107+
avtranscoder::InputVideo* _inputVideo;
108108

109-
avtranscoder::VideoFrame* m_sourceImage;
110-
avtranscoder::VideoFrame* m_imageToDisplay;
109+
avtranscoder::VideoFrame* _sourceImage;
110+
avtranscoder::VideoFrame* _imageToDisplay;
111111

112-
avtranscoder::Pixel pixel;
113-
avtranscoder::VideoFrameDesc VideoFrameDescToDisplay;
112+
avtranscoder::Pixel _pixel;
113+
avtranscoder::VideoFrameDesc _videoFrameDescToDisplay;
114114

115-
avtranscoder::VideoEssenceTransform m_videoEssenceTransform;
116-
size_t m_videoStream;
115+
avtranscoder::VideoEssenceTransform _videoEssenceTransform;
116+
size_t _videoStream;
117117
};
118118

119119
#endif

‎app/cpp/avplay/Reader.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Reader
55
{
66
public:
77
Reader()
8-
: currentFrame( 0 )
8+
: _currentFrame( 0 )
99
{}
1010

1111
virtual size_t getWidth() = 0;
@@ -21,7 +21,7 @@ class Reader
2121

2222
protected:
2323

24-
size_t currentFrame;
24+
size_t _currentFrame;
2525
};
2626

2727
#endif

0 commit comments

Comments
 (0)