From c41afd353fae83cac35d49385bd9e7b7786dd704 Mon Sep 17 00:00:00 2001 From: Harm van der Heijden Date: Mon, 24 Dec 2001 19:31:13 +0000 Subject: disabled dxr3_flush command to flush em8300 hardware. We don't really seem to need it, and it'll fix the problem with disappearing stills (menu's, copyright notices) introduced by the still frame change. Needs more testing, obviously. CVS patchset: 1303 CVS date: 2001/12/24 19:31:13 --- src/dxr3/dxr3_decoder.c | 8 +++++--- src/dxr3/dxr3_video_out.c | 7 ++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c index 727669a65..a28a476b9 100644 --- a/src/dxr3/dxr3_decoder.c +++ b/src/dxr3/dxr3_decoder.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: dxr3_decoder.c,v 1.52 2001/12/24 16:31:57 hrm Exp $ + * $Id: dxr3_decoder.c,v 1.53 2001/12/24 19:31:13 hrm Exp $ * * dxr3 video and spu decoder plugin. Accepts the video and spu data * from XINE and sends it directly to the corresponding dxr3 devices. @@ -440,8 +440,10 @@ static int get_duration(int framecode, int repeat_first_field) static void dxr3_flush (video_decoder_t *this_gen) { dxr3_decoder_t *this = (dxr3_decoder_t *) this_gen; - printf("dxr3_decoder: flushing\n"); - dxr3_mvcommand(this->fd_control, 0x11); + /* Don't flush, causes still images to disappear. We don't seem + * to need it anyway... */ + printf("dxr3_decoder: flush requested, disabled for the moment.\n"); + /* dxr3_mvcommand(this->fd_control, 0x11); */ this->have_header_info = 0; if (this->fd_video >= 0) fsync(this->fd_video); diff --git a/src/dxr3/dxr3_video_out.c b/src/dxr3/dxr3_video_out.c index 7fa424b0a..6084bcb96 100644 --- a/src/dxr3/dxr3_video_out.c +++ b/src/dxr3/dxr3_video_out.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: dxr3_video_out.c,v 1.3 2001/12/24 16:31:57 hrm Exp $ + * $Id: dxr3_video_out.c,v 1.4 2001/12/24 19:31:13 hrm Exp $ * * mpeg1 encoding video out plugin for the dxr3. * @@ -250,6 +250,9 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen, } } else { + /* FIXME: Disable reset of mpeg_source + * video_out.c can call us without the DXR3_VO_UPDATE_FLAG in + * the still frames code. Needs a better fix... */ /* this->mpeg_source = 0; */ } @@ -466,6 +469,8 @@ void dxr3_exit (vo_driver_t *this_gen) if (this->enc && this->enc->on_close) this->enc->on_close(this); + printf("dxr3: vo exit called\n"); + this->mpeg_source = 0; if(this->overlay_enabled) dxr3_overlay_set_mode(&this->overlay, EM8300_OVERLAY_MODE_OFF); -- cgit v1.2.3