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/trunk/examples/CMakeLists.txt

    r13473 r13482  
    207207    ENDIF() 
    208208 
    209     IF   (QT_FOUND AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) 
    210  
    211         IF (QT_QTOPENGL_LIBRARY) 
     209    IF   ( (QT4_FOUND OR Qt5Widgets_FOUND) AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) 
     210 
     211        IF ( QT4_FOUND OR Qt5Widgets_FOUND) 
    212212            ADD_SUBDIRECTORY(osgviewerQt) 
    213213            ADD_SUBDIRECTORY(osgqfont) 
    214214        ENDIF() 
    215215 
    216         IF (QT4_FOUND AND QT_QTWEBKIT_FOUND) 
     216        IF ( (QT4_FOUND AND QT_QTWEBKIT_FOUND) OR Qt5WebKitWidgets_FOUND ) 
    217217            ADD_SUBDIRECTORY(osgQtWidgets) 
    218218            ADD_SUBDIRECTORY(osgQtBrowser)