diff options
| -rw-r--r-- | src/libmpeg2/decode.c | 8 | ||||
| -rw-r--r-- | src/xine-engine/metronom.c | 14 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 6e0a3e7f0..48f5bf42c 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -104,6 +104,12 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, picture->current_frame->bFrameBad |= mpeg2dec->drop_frame; +#if 0 +fprintf (stderr, "type %s: %s\n", + picture->picture_coding_type == I_TYPE ? "I" : + picture->picture_coding_type == P_TYPE ? "P" : "B", + picture->current_frame->bFrameBad ? "BAD" : "good"); +#endif if (picture->picture_coding_type == B_TYPE) { if (picture->mpeg1) picture->current_frame->PTS = 0; @@ -459,6 +465,8 @@ void mpeg2_find_sequence_header (mpeg2dec_t * mpeg2dec, VO_PREDICTION_FLAG | VO_BOTH_FIELDS); picture->backward_reference_frame->PTS = 0; picture->backward_reference_frame->bFrameBad = 1; + picture->frame_width = picture->coded_picture_width; + picture->frame_height = picture->coded_picture_height; } } else if (code == 0xb5) { /* extension_start_code */ diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index 8069552ea..9dd08d922 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.26 2001/09/12 22:18:47 guenter Exp $ + * $Id: metronom.c,v 1.27 2001/09/22 13:28:41 mshopf Exp $ */ #ifdef HAVE_CONFIG_H @@ -32,6 +32,7 @@ #include <math.h> #include <string.h> #include <errno.h> +#include <assert.h> #include "monitor.h" #include "xine_internal.h" @@ -47,6 +48,7 @@ #define MAX_NUM_WRAP_DIFF 100 #define MAX_SCR_PROVIDERS 10 #define REALTIME_PTS 90000.0 +#define PREBUFFER_PTS_OFFSET 30000 /* * **************************************** @@ -238,7 +240,7 @@ static void metronom_video_stream_start (metronom_t *this) { this->pts_per_frame = 3000; - this->video_vpts = 0; + this->video_vpts = PREBUFFER_PTS_OFFSET; this->video_pts_delta = 0; @@ -307,7 +309,7 @@ static void metronom_audio_stream_start (metronom_t *this) { return; } - this->audio_vpts = 0; + this->audio_vpts = PREBUFFER_PTS_OFFSET; this->audio_pts_delta = 0; @@ -426,7 +428,8 @@ static uint32_t metronom_got_video_frame (metronom_t *this, uint32_t pts) { if (this->video_stream_starting) { this->video_stream_starting = 0; - this->video_wrap_offset = -1 * pts; + this->video_wrap_offset = this->video_vpts + this->pts_per_frame - pts; + assert (this->video_pts_delta == 0); if (this->audio_wrap_offset) { if (this->audio_wrap_offset>this->video_wrap_offset) @@ -547,7 +550,8 @@ static uint32_t metronom_got_audio_samples (metronom_t *this, uint32_t pts, uint if (this->audio_stream_starting) { this->audio_stream_starting = 0; - this->audio_wrap_offset = -1 * pts; + this->audio_wrap_offset = this->audio_vpts + (nsamples * this->pts_per_smpls) / AUDIO_SAMPLE_NUM - pts; + assert (this->audio_pts_delta == 0); if (this->video_wrap_offset) { if (this->audio_wrap_offset>this->video_wrap_offset) |