diff --git a/IO/FFMPEG/vtkFFMPEGVideoSource.h b/IO/FFMPEG/vtkFFMPEGVideoSource.h index 5a31d84b53ac0172e0aecd6783ebdfa281a65963..f74ff7a26a9ad5fb56d91af9b4be7febf51c113d 100644 --- a/IO/FFMPEG/vtkFFMPEGVideoSource.h +++ b/IO/FFMPEG/vtkFFMPEGVideoSource.h @@ -158,14 +158,22 @@ protected: vtkFFMPEGVideoSource(); ~vtkFFMPEGVideoSource(); - int DecodingThreads; - AudioCallbackType AudioCallback; void *AudioCallbackClientData; - void ReadFrame(); + int DecodingThreads; - vtkFFMPEGVideoSourceInternal *Internal; + static void *DrainAudioThread( + vtkMultiThreader::ThreadInfo *data); + void *DrainAudio(vtkMultiThreader::ThreadInfo *data); + int DrainAudioThreadId; + + static void *DrainThread( + vtkMultiThreader::ThreadInfo *data); + void *Drain(vtkMultiThreader::ThreadInfo *data); + int DrainThreadId; + + bool EndOfFile; vtkNew<vtkConditionVariable> FeedCondition; vtkNew<vtkMutexLock> FeedMutex; @@ -176,18 +184,11 @@ protected: void *Feed(vtkMultiThreader::ThreadInfo *data); int FeedThreadId; - static void *DrainAudioThread( - vtkMultiThreader::ThreadInfo *data); - void *DrainAudio(vtkMultiThreader::ThreadInfo *data); - int DrainAudioThreadId; + char *FileName; - static void *DrainThread( - vtkMultiThreader::ThreadInfo *data); - void *Drain(vtkMultiThreader::ThreadInfo *data); - int DrainThreadId; + vtkFFMPEGVideoSourceInternal *Internal; - char *FileName; - bool EndOfFile; + void ReadFrame(); private: vtkFFMPEGVideoSource(const vtkFFMPEGVideoSource&) = delete;