TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

compilation errors

Browse Source
This commit is contained in:
David Rose 2008-09-19 21:45:40 +00:00
parent eb4baf3e4d
commit a283ea6013
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/grutil/ffmpegTexture.cxx
View File

@ -117,7 +117,8 @@ modify_page(int z) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool FFMpegTexture:: bool FFMpegTexture::
do_reconsider_video_properties(const FFMpegTexture::VideoStream &stream, do_reconsider_video_properties(const FFMpegTexture::VideoStream &stream,
int num_components, int z) { int num_components, int z,
const LoaderOptions &options) {
double frame_rate = 0.0f; double frame_rate = 0.0f;
int num_frames = 0; int num_frames = 0;
if (!stream._codec_context) { if (!stream._codec_context) {
@ -161,7 +162,7 @@ do_reconsider_video_properties(const FFMpegTexture::VideoStream &stream,
} }
if (!do_reconsider_image_properties(x_size, y_size, num_components, if (!do_reconsider_image_properties(x_size, y_size, num_components,
T_unsigned_byte, z)) { T_unsigned_byte, z, options)) {
return false; return false;
} }
@ -318,6 +319,7 @@ update_frame(int frame) {
bool FFMpegTexture:: bool FFMpegTexture::
do_read_one(const Filename &fullpath, const Filename &alpha_fullpath, do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
int z, int n, int primary_file_num_channels, int alpha_file_channel, int z, int n, int primary_file_num_channels, int alpha_file_channel,
const LoaderOptions &options,
bool header_only, BamCacheRecord *record) { bool header_only, BamCacheRecord *record) {
if (record != (BamCacheRecord *)NULL) { if (record != (BamCacheRecord *)NULL) {
record->add_dependent_file(fullpath); record->add_dependent_file(fullpath);
@ -361,7 +363,7 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
_primary_file_num_channels = 4; _primary_file_num_channels = 4;
_alpha_file_channel = 0; _alpha_file_channel = 0;
if (!do_reconsider_video_properties(page._color, 4, z)) { if (!do_reconsider_video_properties(page._color, 4, z, options)) {
page._color.clear(); page._color.clear();
return false; return false;
} }
@ -371,18 +373,18 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
_alpha_file_channel = alpha_file_channel; _alpha_file_channel = alpha_file_channel;
if (page._alpha.is_valid()) { if (page._alpha.is_valid()) {
if (!do_reconsider_video_properties(page._color, 4, z)) { if (!do_reconsider_video_properties(page._color, 4, z, options)) {
page._color.clear(); page._color.clear();
page._alpha.clear(); page._alpha.clear();
return false; return false;
} }
if (!do_reconsider_video_properties(page._alpha, 4, z)) { if (!do_reconsider_video_properties(page._alpha, 4, z, options)) {
page._color.clear(); page._color.clear();
page._alpha.clear(); page._alpha.clear();
return false; return false;
} }
} else { } else {
if (!do_reconsider_video_properties(page._color, 3, z)) { if (!do_reconsider_video_properties(page._color, 3, z, options)) {
page._color.clear(); page._color.clear();
page._alpha.clear(); page._alpha.clear();
return false; return false;
@ -405,13 +407,14 @@ do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
// texture) to the indicated static image. // texture) to the indicated static image.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool FFMpegTexture:: bool FFMpegTexture::
do_load_one(const PNMImage &pnmimage, const string &name, int z, int n) { do_load_one(const PNMImage &pnmimage, const string &name, int z, int n,
const LoaderOptions &options) {
if (z <= (int)_pages.size()) { if (z <= (int)_pages.size()) {
VideoPage &page = modify_page(z); VideoPage &page = modify_page(z);
page._color.clear(); page._color.clear();
} }
return Texture::do_load_one(pnmimage, name, z, n); return Texture::do_load_one(pnmimage, name, z, n, options);
} }

6
panda/src/grutil/ffmpegTexture.h
View File

@ -48,9 +48,10 @@ protected:
virtual void update_frame(int frame); virtual void update_frame(int frame);
virtual bool do_read_one(const Filename &fullpath, const Filename &alpha_fullpath, virtual bool do_read_one(const Filename &fullpath, const Filename &alpha_fullpath,
int z, int n, int primary_file_num_channels, int alpha_file_channel, int z, int n, int primary_file_num_channels, int alpha_file_channel,
const LoaderOptions &options,
bool header_only, BamCacheRecord *record); bool header_only, BamCacheRecord *record);
virtual bool do_load_one(const PNMImage &pnmimage, const string &name, virtual bool do_load_one(const PNMImage &pnmimage, const string &name,
int z, int n); int z, int n, const LoaderOptions &options);
private: private:
class VideoPage; class VideoPage;
@ -58,7 +59,8 @@ private:
VideoPage &modify_page(int z); VideoPage &modify_page(int z);
bool do_reconsider_video_properties(const VideoStream &stream, bool do_reconsider_video_properties(const VideoStream &stream,
int num_components, int z); int num_components, int z,
const LoaderOptions &options);
void do_update(); void do_update();
class VideoStream { class VideoStream {