Skip to content

Commit 5178dc7

Browse files
author
Clement Champetier
committed
Rename OutputVideo / OutputAudio classes to AvOutputVideo / AvOutputAudio
1 parent 044c3f5 commit 5178dc7

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎app/cpp/avTranscoder/avTranscoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
3030
VideoFrame sourceImage( VideoFrameDesc );
3131

3232
// init video encoder
33-
OutputVideo outputVideo;
33+
AvOutputVideo outputVideo;
3434
outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), VideoFrameDesc );
3535
VideoFrame imageToEncode( outputVideo.getVideoDesc().getVideoFrameDesc() );
3636

‎app/cpp/presetChecker/presetChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ int main( int argc, char** argv )
2727
try{
2828
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
2929
{
30-
avtranscoder::OutputVideo outputVideo;
30+
avtranscoder::AvOutputVideo outputVideo;
3131
outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
3232
}
3333

3434
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
3535
{
36-
avtranscoder::OutputAudio outputAudio;
36+
avtranscoder::AvOutputAudio outputAudio;
3737
outputAudio.setProfile( profile, outputAudio.getAudioDesc().getFrameDesc() );
3838
}
3939
}

‎src/AvTranscoder/essenceStream/OutputAudio.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ extern "C" {
1515
namespace avtranscoder
1616
{
1717

18-
OutputAudio::OutputAudio()
18+
AvOutputAudio::AvOutputAudio()
1919
: IOutputEssence( "pcm_s16le" )
2020
{
2121
}
2222

23-
void OutputAudio::setup()
23+
void AvOutputAudio::setup()
2424
{
2525
av_register_all(); // Warning: should be called only once
2626

@@ -43,7 +43,7 @@ void OutputAudio::setup()
4343
}
4444
}
4545

46-
bool OutputAudio::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame )
46+
bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame )
4747
{
4848
#if LIBAVCODEC_VERSION_MAJOR > 54
4949
AVFrame* frame = av_frame_alloc();
@@ -137,7 +137,7 @@ bool OutputAudio::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
137137
return ret == 0;
138138
}
139139

140-
bool OutputAudio::encodeFrame( DataStream& codedFrame )
140+
bool AvOutputAudio::encodeFrame( DataStream& codedFrame )
141141
{
142142
AVCodecContext* codecContext = _codedDesc.getCodecContext();
143143

@@ -172,7 +172,7 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )
172172
#endif
173173
}
174174

175-
void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc )
175+
void AvOutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc )
176176
{
177177
if( ! desc.count( Profile::avProfileCodec ) ||
178178
! desc.count( Profile::avProfileSampleFormat ) )

‎src/AvTranscoder/essenceStream/OutputAudio.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_AUDIO_HPP_
2-
#define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_AUDIO_HPP_
1+
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_AUDIO_HPP_
2+
#define _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_AUDIO_HPP_
33

44
#include "IOutputEssence.hpp"
55

@@ -12,10 +12,10 @@
1212
namespace avtranscoder
1313
{
1414

15-
class OutputAudio : public IOutputEssence
15+
class AvOutputAudio : public IOutputEssence
1616
{
1717
public:
18-
OutputAudio();
18+
AvOutputAudio();
1919

2020
void setup();
2121

‎src/AvTranscoder/essenceStream/OutputVideo.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ extern "C" {
1616
namespace avtranscoder
1717
{
1818

19-
OutputVideo::OutputVideo( )
19+
AvOutputVideo::AvOutputVideo( )
2020
: IOutputEssence( "mpeg2video" )
2121
{
2222
}
2323

24-
void OutputVideo::setup( )
24+
void AvOutputVideo::setup( )
2525
{
2626
av_register_all(); // Warning: should be called only once
2727

@@ -45,7 +45,7 @@ void OutputVideo::setup( )
4545
}
4646

4747

48-
bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame )
48+
bool AvOutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame )
4949
{
5050
#if LIBAVCODEC_VERSION_MAJOR > 54
5151
AVFrame* frame = av_frame_alloc();
@@ -138,7 +138,7 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
138138
return ret == 0;
139139
}
140140

141-
bool OutputVideo::encodeFrame( DataStream& codedFrame )
141+
bool AvOutputVideo::encodeFrame( DataStream& codedFrame )
142142
{
143143
AVCodecContext* codecContext = _codedDesc.getCodecContext();
144144

@@ -173,7 +173,7 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )
173173
#endif
174174
}
175175

176-
void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& frameDesc )
176+
void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& frameDesc )
177177
{
178178
if( ! desc.count( Profile::avProfileCodec ) ||
179179
! desc.count( Profile::avProfilePixelFormat ) ||

‎src/AvTranscoder/essenceStream/OutputVideo.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
2-
#define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
1+
#ifndef _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_VIDEO_HPP_
2+
#define _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_VIDEO_HPP_
33

44
#include "IOutputEssence.hpp"
55

@@ -12,10 +12,10 @@
1212
namespace avtranscoder
1313
{
1414

15-
class AvExport OutputVideo : public IOutputEssence
15+
class AvExport AvOutputVideo : public IOutputEssence
1616
{
1717
public:
18-
OutputVideo();
18+
AvOutputVideo();
1919

2020
void setup();
2121

‎src/AvTranscoder/transcoder/StreamTranscoder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ StreamTranscoder::StreamTranscoder(
9696
_inputEssence = new AvInputVideo( *static_cast<AvInputStream*>( _inputStream ) );
9797
_inputEssence->setup();
9898

99-
OutputVideo* outputVideo = new OutputVideo();
99+
AvOutputVideo* outputVideo = new AvOutputVideo();
100100

101101
_outputEssence = outputVideo;
102102

@@ -122,7 +122,7 @@ StreamTranscoder::StreamTranscoder(
122122
_inputEssence = new AvInputAudio( *static_cast<AvInputStream*>( _inputStream ) );
123123
_inputEssence->setup();
124124

125-
OutputAudio* outputAudio = new OutputAudio();
125+
AvOutputAudio* outputAudio = new AvOutputAudio();
126126

127127
_outputEssence = outputAudio;
128128

@@ -189,7 +189,7 @@ StreamTranscoder::StreamTranscoder(
189189

190190
if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
191191
{
192-
OutputVideo* outputVideo = new OutputVideo();
192+
AvOutputVideo* outputVideo = new AvOutputVideo();
193193

194194
_outputEssence = outputVideo;
195195

@@ -212,7 +212,7 @@ StreamTranscoder::StreamTranscoder(
212212

213213
if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
214214
{
215-
OutputAudio* outputAudio = new OutputAudio();
215+
AvOutputAudio* outputAudio = new AvOutputAudio();
216216

217217
_outputEssence = outputAudio;
218218

0 commit comments

Comments
 (0)