TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

p3movies_composite2 etc.

Browse Source
This commit is contained in:
David Rose 2011-12-06 21:56:25 +00:00
parent 610a8fdfb9
commit b773dfb41c
14 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -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')

3
panda/src/movies/Sources.pp
View File

@ -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 \

8
panda/src/movies/config_movies.cxx
View File

@ -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" {

3
panda/src/movies/ffmpegAudio.cxx
View File

@ -12,9 +12,10 @@
//
////////////////////////////////////////////////////////////////////
#include "ffmpegAudio.h"
#ifdef HAVE_FFMPEG
#include "ffmpegAudio.h"
#include "ffmpegAudioCursor.h"
TypeHandle FfmpegAudio::_type_handle;

4
panda/src/movies/ffmpegAudioCursor.cxx
View File

@ -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"

1
panda/src/movies/ffmpegAudioCursor.h
View File

@ -25,6 +25,7 @@
#include "pointerTo.h"
#include "ffmpegVirtualFile.h"
class FfmpegAudio;
struct AVFormatContext;
struct AVCodecContext;
struct AVStream;

4
panda/src/movies/ffmpegVideo.cxx
View File

@ -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;

16
panda/src/movies/ffmpegVideoCursor.cxx
View File

@ -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;

1
panda/src/movies/ffmpegVideoCursor.h
View File

@ -30,6 +30,7 @@
#include "conditionVar.h"
#include "pdeque.h"
class FfmpegVideo;
struct AVFormatContext;
struct AVCodecContext;
struct AVStream;

8
panda/src/movies/ffmpegVirtualFile.cxx
View File

@ -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

2
panda/src/movies/ffmpegVirtualFile.h
View File

@ -23,10 +23,10 @@
#include "filename.h"
#include "subfileInfo.h"
#include <stdarg.h>
extern "C" {
#include "libavformat/avio.h"
}
#include <stdarg.h>
struct URLContext;
struct AVFormatContext;

13
panda/src/movies/p3movies_composite1.cxx
View File

@ -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"

5
panda/src/movies/p3movies_composite2.cxx Normal file
View File

@ -0,0 +1,5 @@
#include "ffmpegAudio.cxx"
#include "ffmpegVideo.cxx"
#include "ffmpegVirtualFile.cxx"
#include "ffmpegAudioCursor.cxx"
#include "ffmpegVideoCursor.cxx"

2
panda/src/movies/userDataAudioCursor.h
View File

@ -19,6 +19,8 @@
#include "luse.h"
#include "pointerTo.h"
#include "pointerToArray.h"
#include "movieAudioCursor.h"
class UserDataAudio;
////////////////////////////////////////////////////////////////////