Skip to content

Commit 2305486

Browse files
author
Clement Champetier
committed
Image / ImageDesc: rename to VideoFrame / VideoFrameDesc
1 parent f7fcd74 commit 2305486

File tree

16 files changed

+62
-62
lines changed

16 files changed

+62
-62
lines changed

‎app/avTranscoder/avTranscoder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
2626

2727
// init video decoders
2828
InputVideo inputVideo( input.getStream( 0 ) );
29-
ImageDesc imageDesc = input.getStream( 0 ).getVideoDesc().getImageDesc();
30-
Image sourceImage( imageDesc );
29+
VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoDesc().getVideoFrameDesc();
30+
VideoFrame sourceImage( VideoFrameDesc );
3131

3232
// init video encoder
3333
OutputVideo outputVideo;
34-
outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), imageDesc );
35-
Image imageToEncode( outputVideo.getVideoDesc().getImageDesc() );
34+
outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), VideoFrameDesc );
35+
VideoFrame imageToEncode( outputVideo.getVideoDesc().getVideoFrameDesc() );
3636

3737
DataStream codedImage;
3838

‎app/avplay/AvReader.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class AvReader : public Reader
2929

3030
m_inputVideo->setup();
3131

32-
m_sourceImage = new avtranscoder::Image( m_inputFile.getStream( m_videoStream ).getVideoDesc().getImageDesc() );
32+
m_sourceImage = new avtranscoder::VideoFrame( m_inputFile.getStream( m_videoStream ).getVideoDesc().getVideoFrameDesc() );
3333

3434
pixel.setBitsPerPixel( getComponents() * getBitDepth() );
3535
pixel.setComponents( getComponents() );
@@ -38,13 +38,13 @@ class AvReader : public Reader
3838
pixel.setAlpha( false );
3939
pixel.setPlanar( false );
4040

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

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

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

5050
~AvReader()
@@ -106,11 +106,11 @@ class AvReader : public Reader
106106

107107
avtranscoder::InputVideo* m_inputVideo;
108108

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

112112
avtranscoder::Pixel pixel;
113-
avtranscoder::ImageDesc imageDescToDisplay;
113+
avtranscoder::VideoFrameDesc VideoFrameDescToDisplay;
114114

115115
avtranscoder::VideoEssenceTransform m_videoEssenceTransform;
116116
size_t m_videoStream;

‎app/presetChecker/presetChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int main( int argc, char** argv )
2525
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
2626
{
2727
avtranscoder::OutputVideo outputVideo;
28-
outputVideo.setProfile( profile, outputVideo.getVideoDesc().getImageDesc() );
28+
outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
2929
}
3030

3131
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )

‎src/AvTranscoder/CodedStructures/VideoDesc.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ VideoDesc::VideoDesc( const EssenceDesc& essenceDesc )
2222
m_codecContext = essenceDesc.getCodecContext();
2323
}
2424

25-
ImageDesc VideoDesc::getImageDesc() const
25+
VideoFrameDesc VideoDesc::getVideoFrameDesc() const
2626
{
2727
assert( m_codecContext != NULL );
28-
ImageDesc imageDesc;
28+
VideoFrameDesc VideoFrameDesc;
2929
Pixel pixel( m_codecContext->pix_fmt );
3030

31-
imageDesc.setWidth ( m_codecContext->width );
32-
imageDesc.setHeight( m_codecContext->height );
33-
imageDesc.setPixel ( pixel );
34-
imageDesc.setDar ( m_codecContext->height, m_codecContext->width );
35-
return imageDesc;
31+
VideoFrameDesc.setWidth ( m_codecContext->width );
32+
VideoFrameDesc.setHeight( m_codecContext->height );
33+
VideoFrameDesc.setPixel ( pixel );
34+
VideoFrameDesc.setDar ( m_codecContext->height, m_codecContext->width );
35+
return VideoFrameDesc;
3636
}
3737

3838
std::pair< size_t, size_t > VideoDesc::getTimeBase() const
@@ -44,9 +44,9 @@ std::pair< size_t, size_t > VideoDesc::getTimeBase() const
4444
return timeBase;
4545
}
4646

47-
void VideoDesc::setImageParameters( const ImageDesc& imageDesc )
47+
void VideoDesc::setImageParameters( const VideoFrameDesc& VideoFrameDesc )
4848
{
49-
setImageParameters( imageDesc.getWidth(), imageDesc.getHeight(), imageDesc.getPixelDesc() );
49+
setImageParameters( VideoFrameDesc.getWidth(), VideoFrameDesc.getHeight(), VideoFrameDesc.getPixelDesc() );
5050
}
5151

5252

‎src/AvTranscoder/CodedStructures/VideoDesc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern "C" {
1515
}
1616

1717
#include <AvTranscoder/common.hpp>
18-
#include <AvTranscoder/EssenceStructures/Image.hpp>
18+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
1919
#include "EssenceDesc.hpp"
2020

2121
namespace avtranscoder
@@ -28,10 +28,10 @@ class AvExport VideoDesc : public EssenceDesc
2828
VideoDesc( const AVCodecID codecId );
2929
VideoDesc( const EssenceDesc& essenceDesc );
3030

31-
ImageDesc getImageDesc() const;
31+
VideoFrameDesc getVideoFrameDesc() const;
3232
std::pair< size_t, size_t > getTimeBase() const;
3333

34-
void setImageParameters( const ImageDesc& imageDesc );
34+
void setImageParameters( const VideoFrameDesc& VideoFrameDesc );
3535
void setImageParameters( const size_t width, const size_t height, const Pixel& pixel );
3636
void setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel );
3737

‎src/AvTranscoder/EssenceStream/DummyVideo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DummyVideo::~DummyVideo( )
2020
void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )
2121
{
2222
_videoDesc = videoDesc;
23-
_imageDesc = _videoDesc.getImageDesc();
23+
_VideoFrameDesc = _videoDesc.getVideoFrameDesc();
2424
}
2525

2626
VideoDesc DummyVideo::getVideoDesc() const
@@ -35,7 +35,7 @@ void DummyVideo::setFrame( Frame& inputFrame )
3535

3636
bool DummyVideo::readNextFrame( Frame& frameBuffer )
3737
{
38-
frameBuffer.getBuffer().resize( _imageDesc.getDataSize() );
38+
frameBuffer.getBuffer().resize( _VideoFrameDesc.getDataSize() );
3939

4040
if( ! _inputFrame )
4141
{

‎src/AvTranscoder/EssenceStream/DummyVideo.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AvExport DummyVideo : public InputEssence
3131
private:
3232
Frame* _inputFrame;
3333
VideoDesc _videoDesc;
34-
ImageDesc _imageDesc;
34+
VideoFrameDesc _VideoFrameDesc;
3535

3636
size_t _numberOfView;
3737
};

‎src/AvTranscoder/EssenceStream/InputVideo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ bool InputVideo::readNextFrame( Frame& frameBuffer )
124124
av_free_packet( &packet );
125125
}
126126

127-
Image& imageBuffer = static_cast<Image&>( frameBuffer );
127+
VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
128128

129129
size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
130130
if( imageBuffer.getBuffer().size() != decodedSize )

‎src/AvTranscoder/EssenceStream/InputVideo.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
33

44
#include "InputEssence.hpp"
5-
#include <AvTranscoder/EssenceStructures/Image.hpp>
5+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
66

77
#include <vector>
88

‎src/AvTranscoder/EssenceStream/OutputVideo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
6565
avcodec_get_frame_defaults( frame );
6666
#endif
6767

68-
const Image& sourceImageFrame = static_cast<const Image&>( sourceFrame );
68+
const VideoFrame& sourceImageFrame = static_cast<const VideoFrame&>( sourceFrame );
6969

7070
frame->width = codecContext->width;
7171
frame->height = codecContext->height;
@@ -183,7 +183,7 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )
183183
#endif
184184
}
185185

186-
void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )
186+
void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& VideoFrameDesc )
187187
{
188188
if( ! desc.count( Profile::avProfileCodec ) ||
189189
! desc.count( Profile::avProfilePixelFormat ) ||
@@ -197,7 +197,7 @@ void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscod
197197
const size_t frameRate = std::strtoul( desc.find( Profile::avProfileFrameRate )->second.c_str(), NULL, 0 );
198198
_videoDesc.setTimeBase( 1, frameRate );
199199

200-
_videoDesc.setImageParameters( imageDesc );
200+
_videoDesc.setImageParameters( VideoFrameDesc );
201201

202202
for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
203203
{

‎src/AvTranscoder/EssenceStream/OutputVideo.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
77
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
8-
#include <AvTranscoder/EssenceStructures/Image.hpp>
8+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
99

1010
#include <AvTranscoder/Profile.hpp>
1111

@@ -37,7 +37,7 @@ class AvExport OutputVideo : public OutputEssence
3737
*/
3838
bool encodeFrame( DataStream& codedFrame );
3939

40-
void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc );
40+
void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& VideoFrameDesc );
4141

4242
VideoDesc& getVideoDesc() { return _videoDesc; }
4343

‎src/AvTranscoder/EssenceStructures/Image.hpp renamed to ‎src/AvTranscoder/EssenceStructures/VideoFrame.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace avtranscoder
3333
// //EColorRange eColorRange;
3434
// };
3535

36-
class AvExport ImageDesc
36+
class AvExport VideoFrameDesc
3737
{
3838
public:
3939
void setWidth ( const size_t width ) { m_width = width; }
@@ -75,25 +75,25 @@ class AvExport ImageDesc
7575

7676
//template< template<typename> Alloc >
7777
//class AvExport ImageBase
78-
class AvExport Image : public Frame
78+
class AvExport VideoFrame : public Frame
7979
{
8080
public:
81-
Image( const ImageDesc& ref )
82-
: m_imageDesc( ref )
81+
VideoFrame( const VideoFrameDesc& ref )
82+
: m_videoFrameDesc( ref )
8383
{
8484
m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );
8585
}
8686

87-
virtual ~Image()
87+
virtual ~VideoFrame()
8888
{};
8989

90-
const ImageDesc& desc() const { return m_imageDesc; }
90+
const VideoFrameDesc& desc() const { return m_videoFrameDesc; }
9191

9292
private:
93-
const ImageDesc m_imageDesc;
93+
const VideoFrameDesc m_videoFrameDesc;
9494
};
9595

96-
//typedef ImageBase<std::allocator> Image;
96+
//typedef ImageBase<std::allocator> VideoFrame;
9797

9898
}
9999

‎src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern "C" {
1515
}
1616

1717
#include <AvTranscoder/EssenceStructures/Pixel.hpp>
18-
#include <AvTranscoder/EssenceStructures/Image.hpp>
18+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
1919

2020
#include <iostream>
2121
#include <iomanip>
@@ -39,8 +39,8 @@ VideoEssenceTransform::VideoEssenceTransform()
3939

4040
bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
4141
{
42-
const Image& src = static_cast<const Image&>( srcFrame );
43-
const Image& dst = static_cast<const Image&>( dstFrame );
42+
const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
43+
const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );
4444

4545
assert( src.desc().getWidth() != 0 );
4646
assert( src.desc().getHeight() != 0 );
@@ -84,8 +84,8 @@ bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
8484

8585
void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
8686
{
87-
const Image& src = static_cast<const Image&>( srcFrame );
88-
Image& dst = static_cast<Image&>( dstFrame );
87+
const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
88+
VideoFrame& dst = static_cast<VideoFrame&>( dstFrame );
8989

9090
assert( src.desc().getWidth() != 0 );
9191
assert( src.desc().getHeight() != 0 );

‎src/AvTranscoder/File/OutputFile.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
22
#define _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
33

4-
#include <AvTranscoder/EssenceStructures/Image.hpp>
4+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
55
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
66
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
77
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>

‎src/AvTranscoder/Transcoder/StreamTranscoder.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ StreamTranscoder::StreamTranscoder(
7676

7777
_outputEssence = outputVideo;
7878

79-
ImageDesc outputImageDesc = _inputStream->getVideoDesc().getImageDesc();
79+
VideoFrameDesc outputVideoFrameDesc = _inputStream->getVideoDesc().getVideoFrameDesc();
8080

81-
outputImageDesc.setPixel( Pixel( profile.find( Profile::avProfilePixelFormat )->second.c_str() ) );
81+
outputVideoFrameDesc.setPixel( Pixel( profile.find( Profile::avProfilePixelFormat )->second.c_str() ) );
8282

83-
outputVideo->setProfile( profile, outputImageDesc );
83+
outputVideo->setProfile( profile, outputVideoFrameDesc );
8484

8585
_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
8686

87-
_sourceBuffer = new Image( _inputStream->getVideoDesc().getImageDesc() );
87+
_sourceBuffer = new VideoFrame( _inputStream->getVideoDesc().getVideoFrameDesc() );
8888

89-
// outputVideo->getVideoDesc().setImageParameters( _inputStream->getVideoDesc().getImageDesc().getWidth(), _inputStream->getVideoDesc().getImageDesc().getHeight(), av_get_pix_fmt( desc[ Profile::avProfilePixelFormat ].c_str() ) );
89+
// outputVideo->getVideoDesc().setImageParameters( _inputStream->getVideoDesc().getVideoFrameDesc().getWidth(), _inputStream->getVideoDesc().getVideoFrameDesc().getHeight(), av_get_pix_fmt( desc[ Profile::avProfilePixelFormat ].c_str() ) );
9090

91-
_frameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
91+
_frameBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
9292

9393
_transform = new VideoEssenceTransform();
9494

@@ -170,12 +170,12 @@ StreamTranscoder::StreamTranscoder(
170170
OutputVideo* outputVideo = new OutputVideo();
171171

172172
_outputEssence = outputVideo;
173-
ImageDesc inputImageDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getImageDesc();
174-
outputVideo->setProfile( profile, inputImageDesc );
173+
VideoFrameDesc inputVideoFrameDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
174+
outputVideo->setProfile( profile, inputVideoFrameDesc );
175175

176176
_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
177-
_sourceBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
178-
_frameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
177+
_sourceBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
178+
_frameBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
179179

180180
_transform = new VideoEssenceTransform();
181181

‎src/AvTranscoder/avTranscoder.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <AvTranscoder/EssenceStructures/Pixel.hpp>
1515
#include <AvTranscoder/EssenceStructures/Frame.hpp>
16-
#include <AvTranscoder/EssenceStructures/Image.hpp>
16+
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
1717
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
1818

1919
#include <AvTranscoder/CodedStructures/EssenceDesc.hpp>
@@ -67,7 +67,7 @@ namespace std {
6767

6868
%include <AvTranscoder/EssenceStructures/Pixel.hpp>
6969
%include <AvTranscoder/EssenceStructures/Frame.hpp>
70-
%include <AvTranscoder/EssenceStructures/Image.hpp>
70+
%include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
7171
%include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
7272

7373
%include <AvTranscoder/CodedStructures/EssenceDesc.hpp>

0 commit comments

Comments
 (0)