Show
Ignore:
Timestamp:
01/23/15 18:15:20 (2 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/trunk/include/osgDB/DataTypes

    r13584 r13788  
    6464const int ID_VEC3US_ARRAY = 24; 
    6565const int ID_VEC4US_ARRAY = 25; 
     66 
     67const int ID_VEC2I_ARRAY = 26; 
     68const int ID_VEC3I_ARRAY = 27; 
     69const int ID_VEC4I_ARRAY = 28; 
     70const int ID_VEC2UI_ARRAY = 29; 
     71const int ID_VEC3UI_ARRAY = 30; 
     72const int ID_VEC4UI_ARRAY = 31; 
    6673 
    6774const int ID_DRAWARRAYS = 50;