From b773dfb41ce70a475a082471f78aeb1c1cc9e226 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 6 Dec 2011 21:56:25 +0000 Subject: [PATCH] p3movies_composite2 etc. --- makepanda/makepanda.py | 2 ++ panda/src/movies/Sources.pp | 3 ++- panda/src/movies/config_movies.cxx | 8 +++----- panda/src/movies/ffmpegAudio.cxx | 3 ++- panda/src/movies/ffmpegAudioCursor.cxx | 4 +++- panda/src/movies/ffmpegAudioCursor.h | 1 + panda/src/movies/ffmpegVideo.cxx | 4 +++- panda/src/movies/ffmpegVideoCursor.cxx | 16 ++++++++++------ panda/src/movies/ffmpegVideoCursor.h | 1 + panda/src/movies/ffmpegVirtualFile.cxx | 8 +++++++- panda/src/movies/ffmpegVirtualFile.h | 2 +- panda/src/movies/p3movies_composite1.cxx | 13 ------------- panda/src/movies/p3movies_composite2.cxx | 5 +++++ panda/src/movies/userDataAudioCursor.h | 2 ++ 14 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 panda/src/movies/p3movies_composite2.cxx diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index d0e6c1bf1f..bb1ecb15ba 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2750,6 +2750,7 @@ if (not RUNTIME): if (not RUNTIME): OPTS=['DIR:panda/src/movies', 'BUILDING:PANDA', 'FFMPEG'] TargetAdd('p3movies_composite1.obj', opts=OPTS, input='p3movies_composite1.cxx') + TargetAdd('p3movies_composite2.obj', opts=OPTS, input='p3movies_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/movies', ["*.h", "*_composite.cxx"]) TargetAdd('libp3movies.in', opts=OPTS, input=IGATEFILES) TargetAdd('libp3movies.in', opts=['IMOD:panda', 'ILIB:libp3movies', 'SRCDIR:panda/src/movies']) @@ -2933,6 +2934,7 @@ if (not RUNTIME): TargetAdd('libpanda.dll', input='p3cull_composite1.obj') TargetAdd('libpanda.dll', input='p3cull_composite2.obj') TargetAdd('libpanda.dll', input='p3movies_composite1.obj') + TargetAdd('libpanda.dll', input='p3movies_composite2.obj') TargetAdd('libpanda.dll', input='libp3movies_igate.obj') TargetAdd('libpanda.dll', input='p3grutil_multitexReducer.obj') TargetAdd('libpanda.dll', input='p3grutil_composite1.obj') diff --git a/panda/src/movies/Sources.pp b/panda/src/movies/Sources.pp index bb86b35cfb..4af73ed3e9 100644 --- a/panda/src/movies/Sources.pp +++ b/panda/src/movies/Sources.pp @@ -9,7 +9,8 @@ #define LOCAL_LIBS \ p3gobj - #define COMBINED_SOURCES $[TARGET]_composite1.cxx + #define COMBINED_SOURCES \ + $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx #define SOURCES \ movieAudio.h movieAudio.I \ diff --git a/panda/src/movies/config_movies.cxx b/panda/src/movies/config_movies.cxx index 171ec5cb64..7cf7908bd8 100644 --- a/panda/src/movies/config_movies.cxx +++ b/panda/src/movies/config_movies.cxx @@ -14,21 +14,19 @@ #include "config_movies.h" #include "dconfig.h" - #include "movieVideo.h" #include "movieVideoCursor.h" - #include "movieAudio.h" #include "movieAudioCursor.h" - #include "inkblotVideo.h" #include "inkblotVideoCursor.h" - #include "ffmpegVideo.h" #include "ffmpegVideoCursor.h" - #include "ffmpegAudio.h" #include "ffmpegAudioCursor.h" +#include "userDataAudio.h" +#include "userDataAudioCursor.h" +#include "microphoneAudio.h" #ifdef HAVE_FFMPEG extern "C" { diff --git a/panda/src/movies/ffmpegAudio.cxx b/panda/src/movies/ffmpegAudio.cxx index 14f42d5a28..16256f76a3 100644 --- a/panda/src/movies/ffmpegAudio.cxx +++ b/panda/src/movies/ffmpegAudio.cxx @@ -12,9 +12,10 @@ // //////////////////////////////////////////////////////////////////// +#include "ffmpegAudio.h" + #ifdef HAVE_FFMPEG -#include "ffmpegAudio.h" #include "ffmpegAudioCursor.h" TypeHandle FfmpegAudio::_type_handle; diff --git a/panda/src/movies/ffmpegAudioCursor.cxx b/panda/src/movies/ffmpegAudioCursor.cxx index cf97597b3e..0bf01a1c1a 100644 --- a/panda/src/movies/ffmpegAudioCursor.cxx +++ b/panda/src/movies/ffmpegAudioCursor.cxx @@ -12,9 +12,11 @@ // //////////////////////////////////////////////////////////////////// +#include "ffmpegAudioCursor.h" + #ifdef HAVE_FFMPEG -#include "ffmpegAudioCursor.h" +#include "ffmpegAudio.h" extern "C" { #include "libavcodec/avcodec.h" #include "libavformat/avformat.h" diff --git a/panda/src/movies/ffmpegAudioCursor.h b/panda/src/movies/ffmpegAudioCursor.h index 9ce5e2db2c..e72c4da0ea 100644 --- a/panda/src/movies/ffmpegAudioCursor.h +++ b/panda/src/movies/ffmpegAudioCursor.h @@ -25,6 +25,7 @@ #include "pointerTo.h" #include "ffmpegVirtualFile.h" +class FfmpegAudio; struct AVFormatContext; struct AVCodecContext; struct AVStream; diff --git a/panda/src/movies/ffmpegVideo.cxx b/panda/src/movies/ffmpegVideo.cxx index 4ef49f04d9..ca5d82585d 100644 --- a/panda/src/movies/ffmpegVideo.cxx +++ b/panda/src/movies/ffmpegVideo.cxx @@ -12,11 +12,13 @@ // //////////////////////////////////////////////////////////////////// +#include "ffmpegVideo.h" + #ifdef HAVE_FFMPEG -#include "ffmpegVideo.h" #include "ffmpegVideoCursor.h" #include "config_movies.h" +#include "bamReader.h" TypeHandle FfmpegVideo::_type_handle; diff --git a/panda/src/movies/ffmpegVideoCursor.cxx b/panda/src/movies/ffmpegVideoCursor.cxx index 6353d3a41d..1bad79a3cc 100644 --- a/panda/src/movies/ffmpegVideoCursor.cxx +++ b/panda/src/movies/ffmpegVideoCursor.cxx @@ -12,10 +12,17 @@ // //////////////////////////////////////////////////////////////////// +#include "ffmpegVideoCursor.h" + #ifdef HAVE_FFMPEG -#include "ffmpegVideoCursor.h" #include "config_movies.h" +#include "pStatCollector.h" +#include "pStatTimer.h" +#include "mutexHolder.h" +#include "reMutexHolder.h" +#include "ffmpegVideo.h" +#include "bamReader.h" extern "C" { #include "libavcodec/avcodec.h" #include "libavformat/avformat.h" @@ -23,10 +30,6 @@ extern "C" { #include "libswscale/swscale.h" #endif } -#include "pStatCollector.h" -#include "pStatTimer.h" -#include "mutexHolder.h" -#include "reMutexHolder.h" ReMutex FfmpegVideoCursor::_av_lock; TypeHandle FfmpegVideoCursor::_type_handle; @@ -350,7 +353,8 @@ set_time(double timestamp, int loop_count) { if (ffmpeg_cat.is_spam() && frame != _current_frame) { ffmpeg_cat.spam() - << "set_time(" << time << "): " << frame << ", loop_count = " << loop_count << "\n"; + << "set_time(" << timestamp << "): " << frame + << ", loop_count = " << loop_count << "\n"; } _current_frame = frame; diff --git a/panda/src/movies/ffmpegVideoCursor.h b/panda/src/movies/ffmpegVideoCursor.h index 30245c40ea..d271b894a8 100644 --- a/panda/src/movies/ffmpegVideoCursor.h +++ b/panda/src/movies/ffmpegVideoCursor.h @@ -30,6 +30,7 @@ #include "conditionVar.h" #include "pdeque.h" +class FfmpegVideo; struct AVFormatContext; struct AVCodecContext; struct AVStream; diff --git a/panda/src/movies/ffmpegVirtualFile.cxx b/panda/src/movies/ffmpegVirtualFile.cxx index ef814634a1..be2942a1d7 100644 --- a/panda/src/movies/ffmpegVirtualFile.cxx +++ b/panda/src/movies/ffmpegVirtualFile.cxx @@ -12,13 +12,19 @@ // //////////////////////////////////////////////////////////////////// +#include "pandabase.h" + #ifdef HAVE_FFMPEG -#include "pandabase.h" #include "config_movies.h" #include "ffmpegVirtualFile.h" #include "virtualFileSystem.h" +extern "C" { + #include "libavcodec/avcodec.h" + #include "libavformat/avformat.h" +} + #ifndef AVSEEK_SIZE #define AVSEEK_SIZE 0x10000 #endif diff --git a/panda/src/movies/ffmpegVirtualFile.h b/panda/src/movies/ffmpegVirtualFile.h index 319f7d9d58..098ef91632 100644 --- a/panda/src/movies/ffmpegVirtualFile.h +++ b/panda/src/movies/ffmpegVirtualFile.h @@ -23,10 +23,10 @@ #include "filename.h" #include "subfileInfo.h" +#include extern "C" { #include "libavformat/avio.h" } -#include struct URLContext; struct AVFormatContext; diff --git a/panda/src/movies/p3movies_composite1.cxx b/panda/src/movies/p3movies_composite1.cxx index 6df7f2b4ad..d60e632190 100644 --- a/panda/src/movies/p3movies_composite1.cxx +++ b/panda/src/movies/p3movies_composite1.cxx @@ -1,24 +1,11 @@ #include "movieVideo.cxx" #include "movieVideoCursor.cxx" - #include "movieAudio.cxx" #include "movieAudioCursor.cxx" - #include "inkblotVideo.cxx" #include "inkblotVideoCursor.cxx" - -#include "ffmpegAudio.cxx" -#include "ffmpegAudioCursor.cxx" - -#include "ffmpegVideo.cxx" -#include "ffmpegVideoCursor.cxx" - -#include "ffmpegVirtualFile.cxx" - #include "userDataAudio.cxx" #include "userDataAudioCursor.cxx" - #include "microphoneAudio.cxx" #include "microphoneAudioDS.cxx" - #include "config_movies.cxx" diff --git a/panda/src/movies/p3movies_composite2.cxx b/panda/src/movies/p3movies_composite2.cxx new file mode 100644 index 0000000000..962abbdb0e --- /dev/null +++ b/panda/src/movies/p3movies_composite2.cxx @@ -0,0 +1,5 @@ +#include "ffmpegAudio.cxx" +#include "ffmpegVideo.cxx" +#include "ffmpegVirtualFile.cxx" +#include "ffmpegAudioCursor.cxx" +#include "ffmpegVideoCursor.cxx" diff --git a/panda/src/movies/userDataAudioCursor.h b/panda/src/movies/userDataAudioCursor.h index dc27607a8c..d642462c4c 100644 --- a/panda/src/movies/userDataAudioCursor.h +++ b/panda/src/movies/userDataAudioCursor.h @@ -19,6 +19,8 @@ #include "luse.h" #include "pointerTo.h" #include "pointerToArray.h" +#include "movieAudioCursor.h" + class UserDataAudio; ////////////////////////////////////////////////////////////////////