1 files changed, 131 insertions, 0 deletions

diff --git a/graphics/osg/files/patch-src_osgPlugins_ffmpeg_FFmpegDecoderAudio.hpp b/graphics/osg/files/patch-src_osgPlugins_ffmpeg_FFmpegDecoderAudio.hpp
new file mode 100644
index 000000000000..5679e5baaad7
--- /dev/null
+++ b/graphics/osg/files/patch-src_osgPlugins_ffmpeg_FFmpegDecoderAudio.hpp
@@ -0,0 +1,131 @@
+--- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp.orig	2022-12-01 18:17:31 UTC
++++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp
+@@ -1,20 +1,19 @@
+-
+ #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_AUDIO_H
+ #define HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_AUDIO_H
+ 
+-#include <OpenThreads/Thread>
++extern "C" {
++#include <libavcodec/avcodec.h>
++#include <libswresample/swresample.h>
++}
+ 
++#include <OpenThreads/Thread>
+ #include <osg/Timer>
+-
++#include <osg/AudioStream>
+ #include "FFmpegClocks.hpp"
+ #include "FFmpegPacket.hpp"
+ #include "FFmpegParameters.hpp"
+-
+-#include <osg/AudioStream>
+-
+ #include "BoundedMessageQueue.hpp"
+ 
+-
+ namespace osgFFmpeg {
+ 
+ 
+@@ -24,12 +23,12 @@ class FFmpegDecoderAudio : public OpenThreads::Thread 
+ public:
+ 
+     typedef BoundedMessageQueue<FFmpegPacket> PacketQueue;
+-    typedef void (* PublishFunc) (const FFmpegDecoderAudio & decoder, void * user_data);
++    typedef void (*PublishFunc)(const FFmpegDecoderAudio &decoder, void *user_data);
+ 
+-    FFmpegDecoderAudio(PacketQueue & packets, FFmpegClocks & clocks);
++    FFmpegDecoderAudio(PacketQueue &packets, FFmpegClocks &clocks);
+     ~FFmpegDecoderAudio();
+ 
+-    void open(AVStream * stream, FFmpegParameters* parameters);
++    void open(AVStream *stream, FFmpegParameters *parameters);
+     void pause(bool pause);
+     void close(bool waitForThreadToExit);
+ 
+@@ -39,7 +38,7 @@ class FFmpegDecoderAudio : public OpenThreads::Thread 
+     virtual void run();
+ 
+     void setAudioSink(osg::ref_ptr<osg::AudioSink> audio_sink);
+-    void fillBuffer(void * buffer, size_t size);
++    void fillBuffer(void *buffer, size_t size);
+ 
+     bool validContext() const;
+     int frequency() const;
+@@ -53,37 +52,37 @@ class FFmpegDecoderAudio : public OpenThreads::Thread 
+ 
+     void decodeLoop();
+     void adjustBufferEndPts(size_t buffer_size);
+-    size_t decodeFrame(void * buffer, size_t size);
++    size_t decodeFrame(void *buffer, size_t size);
+ 
+ 
+-    PacketQueue &                       m_packets;
+-    FFmpegClocks &                      m_clocks;
+-    AVStream *                          m_stream;
+-    AVCodecContext *                    m_context;
+-    FFmpegPacket                        m_packet;
+-    const uint8_t *                     m_packet_data;
+-    int                                 m_bytes_remaining;
++    PacketQueue &m_packets;
++    FFmpegClocks &m_clocks;
++    AVStream *m_stream;
++    AVCodecContext *m_context;
++    FFmpegPacket m_packet;
++    const uint8_t *m_packet_data;
++    int m_bytes_remaining;
+ 
+-    Buffer                              m_audio_buffer;
+-    size_t                              m_audio_buf_size;
+-    size_t                              m_audio_buf_index;
++    Buffer m_audio_buffer;
++    size_t m_audio_buf_size;
++    size_t m_audio_buf_index;
+ 
+-    int                                 m_in_sample_rate;
+-    int                                 m_in_nb_channels;
+-    AVSampleFormat                      m_in_sample_format;
+-    int                                 m_out_sample_rate;
+-    int                                 m_out_nb_channels;
+-    AVSampleFormat                      m_out_sample_format;
++    int m_in_sample_rate;
++    int m_in_nb_channels;
++    AVSampleFormat m_in_sample_format;
++    int m_out_sample_rate;
++    int m_out_nb_channels;
++    AVSampleFormat m_out_sample_format;
+ 
+-    SinkPtr                             m_audio_sink;
++    SinkPtr m_audio_sink;
+ 
+-    osg::Timer                          m_pause_timer;
++    osg::Timer m_pause_timer;
+ 
+-    bool                                m_end_of_stream;
+-    bool                                m_paused;
+-    volatile bool                       m_exit;
++    bool m_end_of_stream;
++    bool m_paused;
++    volatile bool m_exit;
+ 
+-    SwrContext *                        m_swr_context;  // Sw resampling context
++    SwrContext *m_swr_context; // Sw resampling context
+ };
+ 
+ 
+@@ -92,7 +91,7 @@ inline bool FFmpegDecoderAudio::validContext() const
+ 
+ inline bool FFmpegDecoderAudio::validContext() const
+ {
+-    return m_context != 0;
++    return m_context != nullptr;
+ }
+ 
+ 
+@@ -110,5 +109,5 @@ inline int FFmpegDecoderAudio::nbChannels() const
+ } // namespace osgFFmpeg
+ 
+ 
+-
+ #endif // HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_AUDIO_H
++