Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3dc7599

Browse files
Merge pull request#55 from cchampet/dev_clean
Clean
2 parentsa1435c1 +856985c commit3dc7599

File tree

8 files changed

+15
-22
lines changed

8 files changed

+15
-22
lines changed

‎src/AvTranscoder/CodedStructures/CodedDesc.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_
22
#define_AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_
33

4-
#include<string>
5-
64
#include<AvTranscoder/common.hpp>
75

6+
#include<string>
7+
88
classAVCodec;
99
classAVCodecContext;
1010

‎src/AvTranscoder/EssenceStream/DummyVideo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer )
3838
{
3939
if( ! _inputFrame )
4040
{
41-
// @todo support PAL (0 to 255) andNTFC (16 to 235)
41+
// @todo support PAL (0 to 255) andNTFS (16 to 235)
4242
int fillChar =0;
4343

4444
if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )

‎src/AvTranscoder/EssenceStream/InputAudio.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ void InputAudio::setup()
7272

7373
_codecContext->channels = _inputStream->getAudioDesc().getChannels();
7474

75-
// std::cout << "Audio codec Id : " << _codecContext->codec_id << std::endl;
76-
// std::cout << "Audio codec Id : " << _codec->name << std::endl;
77-
// std::cout << "Audio codec Id : " << _codec->long_name << std::endl;
78-
79-
_codecContext->channels = _inputStream->getAudioDesc().getCodecContext()->channels;
80-
8175
int ret =avcodec_open2( _codecContext, _codec,NULL );
8276

8377
if( ret <0 || _codecContext ==NULL || _codec ==NULL )

‎src/AvTranscoder/EssenceStream/InputVideo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void InputVideo::setProfile( const Profile::ProfileDesc& desc )
164164
}
165165
catch( std::exception& e )
166166
{
167-
std::cout <<"InputVideo warning:" << e.what() << std::endl;
167+
std::cout <<"[InputVideo] warning:" << e.what() << std::endl;
168168
}
169169
}
170170
}

‎src/AvTranscoder/EssenceStream/OutputAudio.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
201201
}
202202
catch( std::exception& e )
203203
{
204-
std::cout <<"OutputAudio warning:" << e.what() << std::endl;
204+
//std::cout << "[OutputAudio] warning: " << e.what() << std::endl;
205205
}
206206
}
207207

@@ -222,7 +222,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
222222
}
223223
catch( std::exception& e )
224224
{
225-
std::cout <<"OutputAudio 2.warning:" << e.what() << std::endl;
225+
std::cout <<"[OutputAudio]warning:" << e.what() << std::endl;
226226
}
227227
}
228228
}

‎src/AvTranscoder/File/InputFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc )
230230
}
231231
catch( std::exception& e )
232232
{
233-
std::cout <<"InputFile warning:" << e.what() << std::endl;
233+
std::cout <<"[InputFile] warning:" << e.what() << std::endl;
234234
}
235235
}
236236
}

‎src/AvTranscoder/File/OutputFile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
252252
}
253253
catch( std::exception& e )
254254
{
255-
std::cout <<"OutputFile warning:" << e.what() << std::endl;
255+
//std::cout << "[OutputFile] warning: " << e.what() << std::endl;
256256
}
257257
}
258258

@@ -272,7 +272,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
272272
}
273273
catch( std::exception& e )
274274
{
275-
std::cout <<"OutputFile 2.warning:" << e.what() << std::endl;
275+
std::cout <<"[OutputFile]warning:" << e.what() << std::endl;
276276
}
277277
}
278278
}

‎src/AvTranscoder/Transcoder/StreamTranscoder.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,22 +274,21 @@ void StreamTranscoder::init()
274274
boolStreamTranscoder::processFrame()
275275
{
276276
++_frameProcessed;
277-
if( _transform )
277+
278+
if( ! _inputEssence )
278279
{
279280
if( _subStreamIndex <0 )
280281
{
281-
returnprocessTranscode();
282+
returnprocessRewrap();
282283
}
283-
284-
returnprocessTranscode( _subStreamIndex );
284+
returnprocessRewrap( _subStreamIndex );
285285
}
286286

287287
if( _subStreamIndex <0 )
288288
{
289-
returnprocessRewrap();
289+
returnprocessTranscode();
290290
}
291-
292-
returnprocessRewrap( _subStreamIndex );
291+
returnprocessTranscode( _subStreamIndex );
293292
}
294293

295294
boolStreamTranscoder::processRewrap()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp