FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed debug info to output to INFO instaed of NOTICE.

Browse Source
This commit is contained in:
Robert Osfield
2009-03-11 17:39:08 +00:00
parent 5233a716c8
commit 7994ed1eb7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
View File

@@ -32,7 +32,7 @@ FFmpegDecoderVideo::FFmpegDecoderVideo(PacketQueue & packets, FFmpegClocks & clo
FFmpegDecoderVideo::~FFmpegDecoderVideo() FFmpegDecoderVideo::~FFmpegDecoderVideo()
{ {
osg::notify(osg::NOTICE)<<"Destructing FFmpegDecoderVideo..."<<std::endl; osg::notify(osg::INFO)<<"Destructing FFmpegDecoderVideo..."<<std::endl;
if (isRunning()) if (isRunning())
@@ -53,7 +53,7 @@ FFmpegDecoderVideo::~FFmpegDecoderVideo()
} }
#endif #endif
osg::notify(osg::NOTICE)<<"Destructed FFmpegDecoderVideo"<<std::endl; osg::notify(osg::INFO)<<"Destructed FFmpegDecoderVideo"<<std::endl;
} }
@@ -246,21 +246,21 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, const AVPicture
} }
osg::notify(osg::NOTICE)<<"Using sws_scale "; osg::notify(osg::INFO)<<"Using sws_scale ";
int result = sws_scale(m_swscale_ctx, int result = sws_scale(m_swscale_ctx,
src->data, src->linesize, 0, src_height, src->data, src->linesize, 0, src_height,
dst->data, dst->linesize); dst->data, dst->linesize);
#else #else
osg::notify(osg::NOTICE)<<"Using img_convert "; osg::notify(osg::INFO)<<"Using img_convert ";
int result = img_convert(dst, dst_pix_fmt, src, int result = img_convert(dst, dst_pix_fmt, src,
src_pix_fmt, src_width, src_height); src_pix_fmt, src_width, src_height);
#endif #endif
osg::Timer_t endTick = osg::Timer::instance()->tick(); osg::Timer_t endTick = osg::Timer::instance()->tick();
osg::notify(osg::NOTICE)<<" time = "<<osg::Timer::instance()->delta_m(startTick,endTick)<<"ms"<<std::endl; osg::notify(osg::INFO)<<" time = "<<osg::Timer::instance()->delta_m(startTick,endTick)<<"ms"<<std::endl;
return result; return result;
} }

6
src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
View File

@@ -39,11 +39,11 @@ FFmpegImageStream::FFmpegImageStream(const FFmpegImageStream & image, const osg:
FFmpegImageStream::~FFmpegImageStream() FFmpegImageStream::~FFmpegImageStream()
{ {
osg::notify(osg::NOTICE)<<"Destructing FFMpegImageStream..."<<std::endl; osg::notify(osg::INFO)<<"Destructing FFmpegImageStream..."<<std::endl;
quit(true); quit(true);
osg::notify(osg::NOTICE)<<"Have done quit"<<std::endl; osg::notify(osg::INFO)<<"Have done quit"<<std::endl;
// release athe audio streams to make sure that the decoder doesn't retain any external // release athe audio streams to make sure that the decoder doesn't retain any external
// refences. // refences.
@@ -55,7 +55,7 @@ FFmpegImageStream::~FFmpegImageStream()
delete m_commands; delete m_commands;
osg::notify(osg::NOTICE)<<"Destructed FFMpegImageStream."<<std::endl; osg::notify(osg::INFO)<<"Destructed FFMpegImageStream."<<std::endl;
} }