Mercurial > mplayer.hg

comparison vidix/mach64_vid.c @ 33323:d4af28753ec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused variables.
author reimar
date Sat, 07 May 2011 19:44:05 +0000
parents 0f1b5b68af32
children 958431e2cde0
comparison
equal deleted inserted replaced
33322:99054ecaf3d9 33323:d4af28753ec8
640 OUTREG(OVERLAY_TEST, 0x0); 640 OUTREG(OVERLAY_TEST, 0x0);
641 } 641 }
642 642
643 static void mach64_vid_display_video( void ) 643 static void mach64_vid_display_video( void )
644 { 644 {
645 uint32_t vf;
646 mach64_fifo_wait(14); 645 mach64_fifo_wait(14);
647 646
648 OUTREG(OVERLAY_Y_X_START, besr.y_x_start); 647 OUTREG(OVERLAY_Y_X_START, besr.y_x_start);
649 OUTREG(OVERLAY_Y_X_END, besr.y_x_end); 648 OUTREG(OVERLAY_Y_X_END, besr.y_x_end);
650 OUTREG(OVERLAY_SCALE_INC, besr.scale_inc); 649 OUTREG(OVERLAY_SCALE_INC, besr.scale_inc);
670 // bit 7 nothing visible if set 669 // bit 7 nothing visible if set
671 // bit 8-27 no effect 670 // bit 8-27 no effect
672 // bit 28-31 nothing interresting just crashed my system when i played with them :( 671 // bit 28-31 nothing interresting just crashed my system when i played with them :(
673 672
674 mach64_wait_for_idle(); 673 mach64_wait_for_idle();
675 vf = INREG(VIDEO_FORMAT); 674 INREG(VIDEO_FORMAT);
676 675
677 // Bits 16-19 seem to select the format 676 // Bits 16-19 seem to select the format
678 // 0x0 dunno behaves strange 677 // 0x0 dunno behaves strange
679 // 0x1 dunno behaves strange 678 // 0x1 dunno behaves strange
680 // 0x2 dunno behaves strange 679 // 0x2 dunno behaves strange
716 if(verbosity > VERBOSE_LEVEL) mach64_vid_dump_regs(); 715 if(verbosity > VERBOSE_LEVEL) mach64_vid_dump_regs();
717 } 716 }
718 717
719 static int mach64_vid_init_video( vidix_playback_t *config ) 718 static int mach64_vid_init_video( vidix_playback_t *config )
720 { 719 {
721 uint32_t src_w,src_h,dest_w,dest_h,pitch,h_inc,v_inc,left,leftUV,top,ecp,y_pos; 720 uint32_t src_w,src_h,dest_w,dest_h,pitch,h_inc,v_inc,left,top,ecp,y_pos;
722 int is_420,best_pitch,mpitch; 721 int is_420,best_pitch,mpitch;
723 int src_offset_y, src_offset_u, src_offset_v; 722 int src_offset_y, src_offset_u, src_offset_v;
724 unsigned int i; 723 unsigned int i;
725 724
726 mach64_vid_stop_video(); 725 mach64_vid_stop_video();
835 mach64_buffer_base[i][0]= (mach64_overlay_offset + config->offsets[i] + src_offset_y)&~15; 834 mach64_buffer_base[i][0]= (mach64_overlay_offset + config->offsets[i] + src_offset_y)&~15;
836 mach64_buffer_base[i][1]= (mach64_overlay_offset + config->offsets[i] + src_offset_u)&~15; 835 mach64_buffer_base[i][1]= (mach64_overlay_offset + config->offsets[i] + src_offset_u)&~15;
837 mach64_buffer_base[i][2]= (mach64_overlay_offset + config->offsets[i] + src_offset_v)&~15; 836 mach64_buffer_base[i][2]= (mach64_overlay_offset + config->offsets[i] + src_offset_v)&~15;
838 } 837 }
839 838
840 leftUV = (left >> 17) & 15;
841 left = (left >> 16) & 15; 839 left = (left >> 16) & 15;
842 besr.scale_inc = ( h_inc << 16 ) | v_inc; 840 besr.scale_inc = ( h_inc << 16 ) | v_inc;
843 y_pos = config->dest.y; 841 y_pos = config->dest.y;
844 if(mach64_is_dbl_scan()) y_pos*=2; 842 if(mach64_is_dbl_scan()) y_pos*=2;
845 else 843 else