Skip to content

Commit 3a1ee11

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge pull request #29 from cchampet/dev_refactoringStructures
Refactoring & clean
2 parents c20fc7c + a068a40 commit 3a1ee11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+208
-324
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/CodedStream/AvInputStream.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ extern "C" {
99

1010
#include <libavcodec/avcodec.h>
1111
#include <libavformat/avformat.h>
12-
#include <libavutil/avutil.h>
13-
#include <libavutil/pixdesc.h>
14-
#include <libavutil/avstring.h>
1512
}
1613

1714
#include <stdexcept>

‎src/AvTranscoder/CodedStream/AvInputStream.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#include "InputStream.hpp"
55

6+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
7+
68
namespace avtranscoder
79
{
810

‎src/AvTranscoder/CodedStream/AvOutputStream.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <AvTranscoder/File/OutputFile.hpp>
44

55
#include <cassert>
6-
#include <iostream>
76

87
namespace avtranscoder
98
{

‎src/AvTranscoder/CodedStream/InputStream.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef _AV_TRANSCODER_CODED_STREAM_INPUT_STREAM_HPP_
22
#define _AV_TRANSCODER_CODED_STREAM_INPUT_STREAM_HPP_
33

4-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
5-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
6-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
4+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
5+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
6+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
77

88
namespace avtranscoder
99
{

‎src/AvTranscoder/CodedStream/OutputStream.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef _AV_TRANSCODER_CODED_STREAM_OUTPUT_STREAM_HPP_
22
#define _AV_TRANSCODER_CODED_STREAM_OUTPUT_STREAM_HPP_
33

4-
#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
5-
#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
6-
#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
4+
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
5+
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
6+
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
77

88
namespace avtranscoder
99
{

‎src/AvTranscoder/DatasStructures/AudioDesc.cpp renamed to ‎src/AvTranscoder/CodedStructures/AudioDesc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ namespace avtranscoder
66
{
77

88
AudioDesc::AudioDesc( const std::string& codecName )
9-
: EssenceDesc( codecName )
9+
: CodedDesc( codecName )
1010
{
1111
}
1212

1313
AudioDesc::AudioDesc( const AVCodecID codecId )
14-
: EssenceDesc( codecId )
14+
: CodedDesc( codecId )
1515
{
1616
}
1717

18-
AudioDesc::AudioDesc( const EssenceDesc& essenceDesc )
19-
: EssenceDesc( essenceDesc.getCodecId() )
18+
AudioDesc::AudioDesc( const CodedDesc& essenceDesc )
19+
: CodedDesc( essenceDesc.getCodecId() )
2020
{
2121
m_codec = essenceDesc.getCodec();
2222
m_codecContext = essenceDesc.getCodecContext();

‎src/AvTranscoder/DatasStructures/AudioDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/AudioDesc.hpp

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,22 @@
33

44
#include <string>
55

6-
extern "C" {
7-
#ifndef __STDC_CONSTANT_MACROS
8-
#define __STDC_CONSTANT_MACROS
9-
#endif
10-
#ifndef INT64_C
11-
#define INT64_C(c) (c ## LL)
12-
#define UINT64_C(c) (c ## ULL)
13-
#endif
14-
#include <libavcodec/avcodec.h>
15-
}
16-
176
#include <AvTranscoder/common.hpp>
18-
#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
19-
#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
7+
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
8+
9+
#include "CodedDesc.hpp"
10+
11+
class AVCodec;
2012

2113
namespace avtranscoder
2214
{
2315

24-
class AvExport AudioDesc : public EssenceDesc
16+
class AvExport AudioDesc : public CodedDesc
2517
{
2618
public:
2719
AudioDesc( const std::string& codecName = "" );
2820
AudioDesc( const AVCodecID codecId );
29-
AudioDesc( const EssenceDesc& essenceDesc );
21+
AudioDesc( const CodedDesc& essenceDesc );
3022

3123
AudioFrameDesc getFrameDesc() const;
3224
const size_t getSampleRate() const;

‎src/AvTranscoder/DatasStructures/EssenceDesc.cpp renamed to ‎src/AvTranscoder/CodedStructures/CodedDesc.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
#include "EssenceDesc.hpp"
1+
#include "CodedDesc.hpp"
22

33
extern "C" {
44
#ifndef __STDC_CONSTANT_MACROS
55
#define __STDC_CONSTANT_MACROS
66
#endif
7+
#include <libavcodec/avcodec.h>
78
#include <libavutil/opt.h>
89
#include <libavutil/error.h>
910
}
@@ -15,48 +16,48 @@ extern "C" {
1516

1617
namespace avtranscoder {
1718

18-
EssenceDesc::EssenceDesc( const std::string& codecName )
19+
CodedDesc::CodedDesc( const std::string& codecName )
1920
: m_codec( NULL )
2021
, m_codecContext( NULL )
2122
{
2223
if( codecName.size() )
2324
setCodec( codecName );
2425
}
2526

26-
EssenceDesc::EssenceDesc( const AVCodecID codecId )
27+
CodedDesc::CodedDesc( const AVCodecID codecId )
2728
: m_codec( NULL )
2829
, m_codecContext( NULL )
2930
{
3031
setCodec( codecId );
3132
}
3233

33-
std::string EssenceDesc::getCodecName() const
34+
std::string CodedDesc::getCodecName() const
3435
{
3536
assert( m_codecContext != NULL );
3637
return avcodec_descriptor_get( m_codecContext->codec_id )->name;
3738
}
3839

39-
AVCodecID EssenceDesc::getCodecId() const
40+
AVCodecID CodedDesc::getCodecId() const
4041
{
4142
assert( m_codecContext != NULL );
4243
return m_codecContext->codec_id;
4344
}
4445

45-
void EssenceDesc::setCodec( const std::string& codecName )
46+
void CodedDesc::setCodec( const std::string& codecName )
4647
{
4748
avcodec_register_all(); // Warning: should be called only once
4849
m_codec = avcodec_find_encoder_by_name( codecName.c_str() );
4950
initCodecContext();
5051
}
5152

52-
void EssenceDesc::setCodec( const AVCodecID codecId )
53+
void CodedDesc::setCodec( const AVCodecID codecId )
5354
{
5455
avcodec_register_all(); // Warning: should be called only once
5556
m_codec = avcodec_find_encoder( codecId );
5657
initCodecContext();
5758
}
5859

59-
void EssenceDesc::initCodecContext( )
60+
void CodedDesc::initCodecContext( )
6061
{
6162
if( m_codec == NULL )
6263
{
@@ -75,7 +76,7 @@ void EssenceDesc::initCodecContext( )
7576
}
7677
}
7778

78-
void EssenceDesc::set( const std::string& key, const std::string& flag, const bool enable )
79+
void CodedDesc::set( const std::string& key, const std::string& flag, const bool enable )
7980
{
8081
int error = 0;
8182
int64_t optVal;
@@ -112,7 +113,7 @@ void EssenceDesc::set( const std::string& key, const std::string& flag, const bo
112113
}
113114
}
114115

115-
void EssenceDesc::set( const std::string& key, const bool value )
116+
void CodedDesc::set( const std::string& key, const bool value )
116117
{
117118
int error = av_opt_set_int( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
118119
if( error != 0 )
@@ -124,7 +125,7 @@ void EssenceDesc::set( const std::string& key, const bool value )
124125
}
125126
}
126127

127-
void EssenceDesc::set( const std::string& key, const int value )
128+
void CodedDesc::set( const std::string& key, const int value )
128129
{
129130
//const AVOption* flagOpt = av_opt_find( m_codecContext, key.c_str(), NULL, 0, AV_OPT_SEARCH_CHILDREN );
130131

@@ -140,7 +141,7 @@ void EssenceDesc::set( const std::string& key, const int value )
140141
}
141142
}
142143

143-
void EssenceDesc::set( const std::string& key, const int num, const int den )
144+
void CodedDesc::set( const std::string& key, const int num, const int den )
144145
{
145146
AVRational ratio;
146147
ratio.num = num;
@@ -157,7 +158,7 @@ void EssenceDesc::set( const std::string& key, const int num, const int den )
157158
}
158159
}
159160

160-
void EssenceDesc::set( const std::string& key, const double value )
161+
void CodedDesc::set( const std::string& key, const double value )
161162
{
162163
int error = av_opt_set_double( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
163164
if( error != 0 )
@@ -171,7 +172,7 @@ void EssenceDesc::set( const std::string& key, const double value )
171172
}
172173
}
173174

174-
void EssenceDesc::set( const std::string& key, const std::string& value )
175+
void CodedDesc::set( const std::string& key, const std::string& value )
175176
{
176177
int error = av_opt_set( m_codecContext, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN );
177178
if( error != 0 )

‎src/AvTranscoder/DatasStructures/EssenceDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/CodedDesc.hpp

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,21 @@
33

44
#include <string>
55

6-
extern "C" {
7-
#ifndef __STDC_CONSTANT_MACROS
8-
#define __STDC_CONSTANT_MACROS
9-
#endif
10-
#ifndef INT64_C
11-
#define INT64_C(c) (c ## LL)
12-
#define UINT64_C(c) (c ## ULL)
13-
#endif
14-
#include <libavcodec/avcodec.h>
15-
}
16-
176
#include <AvTranscoder/common.hpp>
187

8+
class AVCodec;
9+
class AVCodecContext;
10+
1911
namespace avtranscoder
2012
{
2113

22-
class AvExport EssenceDesc
14+
class AvExport CodedDesc
2315
{
2416
public:
25-
EssenceDesc( const std::string& codecName );
26-
EssenceDesc( const AVCodecID codecId );
17+
CodedDesc( const std::string& codecName );
18+
CodedDesc( const AVCodecID codecId );
2719

28-
virtual ~EssenceDesc() {}
20+
virtual ~CodedDesc() {}
2921

3022
std::string getCodecName() const;
3123
AVCodecID getCodecId() const;

‎src/AvTranscoder/DatasStructures/DataStreamDesc.hpp renamed to ‎src/AvTranscoder/CodedStructures/DataStreamDesc.hpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
#ifndef _AV_TRANSCODER_DATA_DATA_STREAM_DESC_HPP_
22
#define _AV_TRANSCODER_DATA_DATA_STREAM_DESC_HPP_
33

4-
#include <string>
54
#include <vector>
6-
7-
extern "C" {
8-
#ifndef __STDC_CONSTANT_MACROS
9-
#define __STDC_CONSTANT_MACROS
10-
#endif
11-
#ifndef INT64_C
12-
#define INT64_C(c) (c ## LL)
13-
#define UINT64_C(c) (c ## ULL)
14-
#endif
15-
#include <libavcodec/avcodec.h>
16-
}
5+
#include <cstring>
176

187
namespace avtranscoder
198
{

0 commit comments

Comments
 (0)