Changeset 13787

Show
Ignore:
Timestamp:
01/23/15 18:15:20 (4 days ago)
Author:
robert
Message:

From Javier Taibo,
"I have found a "bug" in the new audio decoding code (actually I think the bug is in ffmpeg, but anyway it should be wise to protect the OSG plug-in about it). I am attaching a security check in FFmpegDecoderAudio.cpp.

If anybody is curious about the problem, it happens sometimes when decoding an AAC audio stream. It eventually includes a PCE block inside the AAC audio frame and then ffmpeg audio decoding function signals a "new_frame" with 1024 samples, but a null pointer instead of the audio data. It can be easily detected because in these cases number of channels is 0. Maybe this is the intended behaviour for ffmpeg, but I find it quite weird.
"

" It seems that libav does not have a channels attribute in AVFrame structure. This new version should do."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-3.2/src/osgPlugins/dds/ReaderWriterDDS.cpp

    r13518 r13787  
    10601060    //unsigned int components     = osg::Image::computeNumComponents(pixelFormat); 
    10611061    unsigned int pixelSize      = osg::Image::computePixelSizeInBits(pixelFormat, dataType); 
    1062     unsigned int imageSize      = img->getImageSizeInBytes(); 
     1062    unsigned int imageSize      = img->getTotalSizeInBytes(); 
    10631063 
    10641064    // Check that theorical image size (computation taking into account DXTC blocks) is not bigger than actual image size.