Skip to content

Clean #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 13, 2014
Merged

Clean #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
561f975
StreamTranscoder: refactoring processFrame
Aug 12, 2014
83cacd3
DummyVideo: update comment
Aug 12, 2014
534aeeb
setProfile: uniformize print
Aug 12, 2014
6b33f61
InputAudio: clean setup
Aug 12, 2014
6ef256d
Merge branch 'master' of https://github.com/avTranscoder/avTranscoder…
Aug 12, 2014
856985c
CodedDesc: reorder includes
Aug 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AvTranscoder/CodedStructures/CodedDesc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_
#define _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_

#include <string>

#include <AvTranscoder/common.hpp>

#include <string>

class AVCodec;
class AVCodecContext;

Expand Down
2 changes: 1 addition & 1 deletion src/AvTranscoder/EssenceStream/DummyVideo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer )
{
if( ! _inputFrame )
{
// @todo support PAL (0 to 255) and NTFC (16 to 235)
// @todo support PAL (0 to 255) and NTFS (16 to 235)
int fillChar = 0;

if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
Expand Down
6 changes: 0 additions & 6 deletions src/AvTranscoder/EssenceStream/InputAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ void InputAudio::setup()

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

// std::cout << "Audio codec Id : " << _codecContext->codec_id << std::endl;
// std::cout << "Audio codec Id : " << _codec->name << std::endl;
// std::cout << "Audio codec Id : " << _codec->long_name << std::endl;

_codecContext->channels = _inputStream->getAudioDesc().getCodecContext()->channels;

int ret = avcodec_open2( _codecContext, _codec, NULL );

if( ret < 0 || _codecContext == NULL || _codec == NULL )
Expand Down
2 changes: 1 addition & 1 deletion src/AvTranscoder/EssenceStream/InputVideo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void InputVideo::setProfile( const Profile::ProfileDesc& desc )
}
catch( std::exception& e )
{
std::cout << "InputVideo warning: " << e.what() << std::endl;
std::cout << "[InputVideo] warning: " << e.what() << std::endl;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/AvTranscoder/EssenceStream/OutputAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
}
catch( std::exception& e )
{
std::cout << "OutputAudio warning: " << e.what() << std::endl;
//std::cout << "[OutputAudio] warning: " << e.what() << std::endl;
}
}

Expand All @@ -223,7 +223,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame
}
catch( std::exception& e )
{
std::cout << "OutputAudio 2.warning: " << e.what() << std::endl;
std::cout << "[OutputAudio] warning: " << e.what() << std::endl;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/AvTranscoder/File/InputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc )
}
catch( std::exception& e )
{
std::cout << "InputFile warning: " << e.what() << std::endl;
std::cout << "[InputFile] warning: " << e.what() << std::endl;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/AvTranscoder/File/OutputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
}
catch( std::exception& e )
{
std::cout << "OutputFile warning: " << e.what() << std::endl;
//std::cout << "[OutputFile] warning: " << e.what() << std::endl;
}
}

Expand All @@ -272,7 +272,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
}
catch( std::exception& e )
{
std::cout << "OutputFile 2.warning: " << e.what() << std::endl;
std::cout << "[OutputFile] warning: " << e.what() << std::endl;
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions src/AvTranscoder/Transcoder/StreamTranscoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,22 +251,21 @@ StreamTranscoder::~StreamTranscoder()
bool StreamTranscoder::processFrame()
{
++_frameProcessed;
if( _transform )

if( ! _inputEssence )
{
if( _subStreamIndex < 0 )
{
return processTranscode();
return processRewrap();
}

return processTranscode( _subStreamIndex );
return processRewrap( _subStreamIndex );
}

if( _subStreamIndex < 0 )
{
return processRewrap();
return processTranscode();
}

return processRewrap( _subStreamIndex );
return processTranscode( _subStreamIndex );
}

bool StreamTranscoder::processRewrap()
Expand Down