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

fix seek problems with certain avi's

Browse Source
This commit is contained in:
David Rose 2011-12-12 22:33:28 +00:00
parent 1302a89f3d
commit f5da2ff9bf
2 changed files with 31 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,7 @@ FfmpegVideoCursor() :
_action_cvar(_lock), _action_cvar(_lock),
_thread_status(TS_stopped), _thread_status(TS_stopped),
_seek_frame(0), _seek_frame(0),
_packet0(NULL), _packet(NULL),
_packet1(NULL),
_format_ctx(NULL), _format_ctx(NULL),
_video_ctx(NULL), _video_ctx(NULL),
_convert_ctx(NULL), _convert_ctx(NULL),
@ -106,10 +105,8 @@ init_from(FfmpegVideo *source) {
return; return;
} }
_packet0 = new AVPacket; _packet = new AVPacket;
_packet1 = new AVPacket; memset(_packet, 0, sizeof(AVPacket));
memset(_packet0, 0, sizeof(AVPacket));
memset(_packet1, 0, sizeof(AVPacket));
fetch_packet(0); fetch_packet(0);
fetch_frame(-1); fetch_frame(-1);
@ -137,8 +134,7 @@ FfmpegVideoCursor(FfmpegVideo *src) :
_action_cvar(_lock), _action_cvar(_lock),
_thread_status(TS_stopped), _thread_status(TS_stopped),
_seek_frame(0), _seek_frame(0),
_packet0(NULL), _packet(NULL),
_packet1(NULL),
_format_ctx(NULL), _format_ctx(NULL),
_video_ctx(NULL), _video_ctx(NULL),
_convert_ctx(NULL), _convert_ctx(NULL),
@ -614,20 +610,12 @@ cleanup() {
_frame_out = NULL; _frame_out = NULL;
} }
if (_packet0) { if (_packet) {
if (_packet0->data) { if (_packet->data) {
av_free_packet(_packet0); av_free_packet(_packet);
} }
delete _packet0; delete _packet;
_packet0 = NULL; _packet = NULL;
}
if (_packet1) {
if (_packet1->data) {
av_free_packet(_packet1);
}
delete _packet1;
_packet1 = NULL;
} }
} }
@ -813,17 +801,17 @@ fetch_packet(int default_frame) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool FfmpegVideoCursor:: bool FfmpegVideoCursor::
do_fetch_packet(int default_frame) { do_fetch_packet(int default_frame) {
if (_packet0->data) { if (_packet->data) {
av_free_packet(_packet0); av_free_packet(_packet);
} }
while (av_read_frame(_format_ctx, _packet0) >= 0) { while (av_read_frame(_format_ctx, _packet) >= 0) {
if (_packet0->stream_index == _video_index) { if (_packet->stream_index == _video_index) {
_packet_frame = _packet0->dts; _packet_frame = _packet->dts;
return false; return false;
} }
av_free_packet(_packet0); av_free_packet(_packet);
} }
_packet0->data = 0; _packet->data = 0;
if (!_eof_known && default_frame != 0) { if (!_eof_known && default_frame != 0) {
_eof_frame = _packet_frame; _eof_frame = _packet_frame;
@ -843,18 +831,6 @@ do_fetch_packet(int default_frame) {
return true; return true;
} }
////////////////////////////////////////////////////////////////////
// Function: FfmpegVideoCursor::flip_packets
// Access: Private
// Description: Called within the sub-thread. Reverses _packet0 and _packet1.
////////////////////////////////////////////////////////////////////
void FfmpegVideoCursor::
flip_packets() {
AVPacket *t = _packet0;
_packet0 = _packet1;
_packet1 = t;
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: FfmpegVideoCursor::fetch_frame // Function: FfmpegVideoCursor::fetch_frame
// Access: Private // Access: Private
@ -873,25 +849,15 @@ fetch_frame(int frame) {
int finished = 0; int finished = 0;
if (_packet_frame <= frame) { if (_packet_frame <= frame) {
_video_ctx->skip_frame = AVDISCARD_BIDIR; finished = 0;
// Put the current packet aside in case we discover it's the
// packet to keep.
flip_packets();
// Get the next packet. The first packet beyond the frame we're // Get the next packet. The first packet beyond the frame we're
// looking for marks the point to stop. // looking for marks the point to stop.
_begin_frame = _packet_frame;
if (fetch_packet(frame)) {
_end_frame = _packet_frame;
_frame_ready = false;
return;
}
while (_packet_frame <= frame) { while (_packet_frame <= frame) {
PStatTimer timer(_seek_pcollector); PStatTimer timer(_seek_pcollector);
// Decode and discard the previous packet. // Decode the previous packet, and get the next one.
decode_frame(finished, _packet1); decode_frame(finished);
flip_packets();
_begin_frame = _packet_frame; _begin_frame = _packet_frame;
if (fetch_packet(frame)) { if (fetch_packet(frame)) {
_end_frame = _packet_frame; _end_frame = _packet_frame;
@ -899,18 +865,12 @@ fetch_frame(int frame) {
return; return;
} }
} }
_video_ctx->skip_frame = AVDISCARD_DEFAULT;
// At this point, _packet0 contains the *next* packet to be
// decoded next frame, and _packet1 contains the packet to decode
// for this frame.
decode_frame(finished, _packet1);
} else { } else {
// Just get the next frame. // Just get the next frame.
finished = 0; finished = 0;
while (!finished && _packet0->data) { while (!finished && _packet->data) {
decode_frame(finished, _packet0); decode_frame(finished);
_begin_frame = _packet_frame; _begin_frame = _packet_frame;
fetch_packet(_begin_frame + 1); fetch_packet(_begin_frame + 1);
} }
@ -927,12 +887,12 @@ fetch_frame(int frame) {
// the specified packet into _frame. // the specified packet into _frame.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void FfmpegVideoCursor:: void FfmpegVideoCursor::
decode_frame(int &finished, AVPacket *packet) { decode_frame(int &finished) {
if (ffmpeg_global_lock) { if (ffmpeg_global_lock) {
ReMutexHolder av_holder(_av_lock); ReMutexHolder av_holder(_av_lock);
do_decode_frame(finished, packet); do_decode_frame(finished);
} else { } else {
do_decode_frame(finished, packet); do_decode_frame(finished);
} }
} }
@ -943,12 +903,12 @@ decode_frame(int &finished, AVPacket *packet) {
// configured on). // configured on).
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void FfmpegVideoCursor:: void FfmpegVideoCursor::
do_decode_frame(int &finished, AVPacket *packet) { do_decode_frame(int &finished) {
#if LIBAVCODEC_VERSION_INT < 3414272 #if LIBAVCODEC_VERSION_INT < 3414272
avcodec_decode_video(_video_ctx, _frame, avcodec_decode_video(_video_ctx, _frame,
&finished, packet->data, packet->size); &finished, _packet->data, _packet->size);
#else #else
avcodec_decode_video2(_video_ctx, _frame, &finished, packet); avcodec_decode_video2(_video_ctx, _frame, &finished, _packet);
#endif #endif
} }

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

@ -147,10 +147,9 @@ private:
bool fetch_packet(int default_frame); bool fetch_packet(int default_frame);
bool do_fetch_packet(int default_frame); bool do_fetch_packet(int default_frame);
void flip_packets();
void fetch_frame(int frame); void fetch_frame(int frame);
void decode_frame(int &finished, AVPacket *packet); void decode_frame(int &finished);
void do_decode_frame(int &finished, AVPacket *packet); void do_decode_frame(int &finished);
void seek(int frame, bool backward); void seek(int frame, bool backward);
void do_seek(int frame, bool backward); void do_seek(int frame, bool backward);
int binary_seek(int min_frame, int max_frame, int target_frame, int num_iterations); int binary_seek(int min_frame, int max_frame, int target_frame, int num_iterations);
@ -159,7 +158,7 @@ private:
void export_frame(FfmpegBuffer *buffer); void export_frame(FfmpegBuffer *buffer);
// The following data members will be accessed by the sub-thread. // The following data members will be accessed by the sub-thread.
AVPacket *_packet0, *_packet1; AVPacket *_packet;
int _packet_frame; int _packet_frame;
AVFormatContext *_format_ctx; AVFormatContext *_format_ctx;
AVCodecContext *_video_ctx; AVCodecContext *_video_ctx;