Skip to content

Commit 12465ec

Browse files
author
Clement Champetier
committed
EssenceDesc: rename to CodedDesc
1 parent 2305486 commit 12465ec

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

‎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/CodedStructures/AudioDesc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ extern "C" {
1616

1717
#include <AvTranscoder/common.hpp>
1818
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
19-
#include "EssenceDesc.hpp"
19+
#include "CodedDesc.hpp"
2020

2121
namespace avtranscoder
2222
{
2323

24-
class AvExport AudioDesc : public EssenceDesc
24+
class AvExport AudioDesc : public CodedDesc
2525
{
2626
public:
2727
AudioDesc( const std::string& codecName = "" );
2828
AudioDesc( const AVCodecID codecId );
29-
AudioDesc( const EssenceDesc& essenceDesc );
29+
AudioDesc( const CodedDesc& essenceDesc );
3030

3131
AudioFrameDesc getFrameDesc() const;
3232
const size_t getSampleRate() const;

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

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

33
extern "C" {
44
#ifndef __STDC_CONSTANT_MACROS
@@ -15,48 +15,48 @@ extern "C" {
1515

1616
namespace avtranscoder {
1717

18-
EssenceDesc::EssenceDesc( const std::string& codecName )
18+
CodedDesc::CodedDesc( const std::string& codecName )
1919
: m_codec( NULL )
2020
, m_codecContext( NULL )
2121
{
2222
if( codecName.size() )
2323
setCodec( codecName );
2424
}
2525

26-
EssenceDesc::EssenceDesc( const AVCodecID codecId )
26+
CodedDesc::CodedDesc( const AVCodecID codecId )
2727
: m_codec( NULL )
2828
, m_codecContext( NULL )
2929
{
3030
setCodec( codecId );
3131
}
3232

33-
std::string EssenceDesc::getCodecName() const
33+
std::string CodedDesc::getCodecName() const
3434
{
3535
assert( m_codecContext != NULL );
3636
return avcodec_descriptor_get( m_codecContext->codec_id )->name;
3737
}
3838

39-
AVCodecID EssenceDesc::getCodecId() const
39+
AVCodecID CodedDesc::getCodecId() const
4040
{
4141
assert( m_codecContext != NULL );
4242
return m_codecContext->codec_id;
4343
}
4444

45-
void EssenceDesc::setCodec( const std::string& codecName )
45+
void CodedDesc::setCodec( const std::string& codecName )
4646
{
4747
avcodec_register_all(); // Warning: should be called only once
4848
m_codec = avcodec_find_encoder_by_name( codecName.c_str() );
4949
initCodecContext();
5050
}
5151

52-
void EssenceDesc::setCodec( const AVCodecID codecId )
52+
void CodedDesc::setCodec( const AVCodecID codecId )
5353
{
5454
avcodec_register_all(); // Warning: should be called only once
5555
m_codec = avcodec_find_encoder( codecId );
5656
initCodecContext();
5757
}
5858

59-
void EssenceDesc::initCodecContext( )
59+
void CodedDesc::initCodecContext( )
6060
{
6161
if( m_codec == NULL )
6262
{
@@ -75,7 +75,7 @@ void EssenceDesc::initCodecContext( )
7575
}
7676
}
7777

78-
void EssenceDesc::set( const std::string& key, const std::string& flag, const bool enable )
78+
void CodedDesc::set( const std::string& key, const std::string& flag, const bool enable )
7979
{
8080
int error = 0;
8181
int64_t optVal;
@@ -112,7 +112,7 @@ void EssenceDesc::set( const std::string& key, const std::string& flag, const bo
112112
}
113113
}
114114

115-
void EssenceDesc::set( const std::string& key, const bool value )
115+
void CodedDesc::set( const std::string& key, const bool value )
116116
{
117117
int error = av_opt_set_int( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
118118
if( error != 0 )
@@ -124,7 +124,7 @@ void EssenceDesc::set( const std::string& key, const bool value )
124124
}
125125
}
126126

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

@@ -140,7 +140,7 @@ void EssenceDesc::set( const std::string& key, const int value )
140140
}
141141
}
142142

143-
void EssenceDesc::set( const std::string& key, const int num, const int den )
143+
void CodedDesc::set( const std::string& key, const int num, const int den )
144144
{
145145
AVRational ratio;
146146
ratio.num = num;
@@ -157,7 +157,7 @@ void EssenceDesc::set( const std::string& key, const int num, const int den )
157157
}
158158
}
159159

160-
void EssenceDesc::set( const std::string& key, const double value )
160+
void CodedDesc::set( const std::string& key, const double value )
161161
{
162162
int error = av_opt_set_double( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
163163
if( error != 0 )
@@ -171,7 +171,7 @@ void EssenceDesc::set( const std::string& key, const double value )
171171
}
172172
}
173173

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ extern "C" {
1919
namespace avtranscoder
2020
{
2121

22-
class AvExport EssenceDesc
22+
class AvExport CodedDesc
2323
{
2424
public:
25-
EssenceDesc( const std::string& codecName );
26-
EssenceDesc( const AVCodecID codecId );
25+
CodedDesc( const std::string& codecName );
26+
CodedDesc( const AVCodecID codecId );
2727

28-
virtual ~EssenceDesc() {}
28+
virtual ~CodedDesc() {}
2929

3030
std::string getCodecName() const;
3131
AVCodecID getCodecId() const;

‎src/AvTranscoder/CodedStructures/VideoDesc.cpp

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

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

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

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

‎src/AvTranscoder/CodedStructures/VideoDesc.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ extern "C" {
1616

1717
#include <AvTranscoder/common.hpp>
1818
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
19-
#include "EssenceDesc.hpp"
19+
#include "CodedDesc.hpp"
2020

2121
namespace avtranscoder
2222
{
2323

24-
class AvExport VideoDesc : public EssenceDesc
24+
class AvExport VideoDesc : public CodedDesc
2525
{
2626
public:
2727
VideoDesc( const std::string& codecName = "" );
2828
VideoDesc( const AVCodecID codecId );
29-
VideoDesc( const EssenceDesc& essenceDesc );
29+
VideoDesc( const CodedDesc& essenceDesc );
3030

3131
VideoFrameDesc getVideoFrameDesc() const;
3232
std::pair< size_t, size_t > getTimeBase() const;

‎src/AvTranscoder/Transcoder/Transcoder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
6363
addTranscodeStream( filename, streamIndex, profileDesc );
6464
}
6565

66-
void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
66+
void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc )
6767
{
6868
_profile.update( profileDesc );
6969
if( ! filename.length() )
@@ -122,7 +122,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
122122
addTranscodeStream( filename, streamIndex, subStreamIndex, profileDesc );
123123
}
124124

125-
void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
125+
void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc )
126126
{
127127
_profile.update( profileDesc );
128128

@@ -291,7 +291,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
291291
}
292292
}
293293

294-
void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc )
294+
void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const CodedDesc& essenceDesc )
295295
{
296296
if( ! profile.count( Profile::avProfileType ) )
297297
throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );

‎src/AvTranscoder/Transcoder/Transcoder.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Transcoder
3939
/*
4040
* @note If filename is empty, add a dummy stream.
4141
*/
42-
void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
42+
void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc );
4343

4444
/**
4545
* @brief Add a stream and set a profile
@@ -57,7 +57,7 @@ class Transcoder
5757
/**
5858
* @note If filename is empty, add a dummy stream.
5959
*/
60-
void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
60+
void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc );
6161

6262
/**
6363
* @brief Add the stream
@@ -79,7 +79,7 @@ class Transcoder
7979

8080
void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile );
8181

82-
void addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc );
82+
void addDummyStream( const Profile::ProfileDesc& profile, const CodedDesc& essenceDesc );
8383

8484
InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
8585

‎src/AvTranscoder/avTranscoder.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
1717
#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
1818

19-
#include <AvTranscoder/CodedStructures/EssenceDesc.hpp>
19+
#include <AvTranscoder/CodedStructures/CodedDesc.hpp>
2020
#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
2121
#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
2222
#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
@@ -70,7 +70,7 @@ namespace std {
7070
%include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
7171
%include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
7272

73-
%include <AvTranscoder/CodedStructures/EssenceDesc.hpp>
73+
%include <AvTranscoder/CodedStructures/CodedDesc.hpp>
7474
%include <AvTranscoder/CodedStructures/VideoDesc.hpp>
7575
%include <AvTranscoder/CodedStructures/AudioDesc.hpp>
7676
%include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>

0 commit comments

Comments
 (0)