atixv.c.diff2

linux TV 源码

<     } else
<       {
< 	adapt->type = XvWindowMask | XvInputMask | XvImageMask;
< 	adapt->nEncodings = 1;
< 	adapt->pEncodings =  &DummyEncoding;
<       }
---
>     ATIResetVideo(pScrn);
>     
>     if(pATI->VBIOS!=NULL){
>     	xfree(pATI->VBIOS);
> 	pATI->VBIOS=NULL;
>     	}
1330,1367c1319
<   adapt->nFormats = NUM_FORMATS;
<   adapt->pFormats = Formats;
<   adapt->nPorts = 1;
<   if(pPriv->MM_TABLE_valid && (pATI->Chip == ATI_CHIP_264GTDVD))
<     {
<       adapt->nAttributes = NUM_ATTRIBUTES-1;
<       adapt->pAttributes = AIWClassicAttributes;
<     } else
<       {
< 	adapt->nAttributes = NUM_ATTRIBUTES;
< 	adapt->pAttributes = Attributes;
<       }
<   adapt->nImages = NUM_IMAGES;
<   adapt->pImages = Images;
<   adapt->PutVideo = ATIPutVideo;
<   adapt->PutStill = NULL;
<   adapt->GetVideo = NULL;
<   adapt->GetStill = NULL;
<   adapt->StopVideo = ATIStopVideo;
<   adapt->SetPortAttribute = ATISetPortAttribute;
<   adapt->GetPortAttribute = ATIGetPortAttribute;
<   adapt->QueryBestSize = ATIQueryBestSize;
<   adapt->PutImage = ATIPutImage;
<   adapt->QueryImageAttributes = ATIQueryImageAttributes;
<   
<   
<   pATI->adaptor = adapt;
<   
<   REGION_INIT(pScreen, &(pPriv->clip), NullBox, 0);
<   
<   ATIResetVideo(pScrn);
<   
<   if(pATI->VBIOS!=NULL){
<     xfree(pATI->VBIOS);
<     pATI->VBIOS=NULL;
<   }
<   
<   return adapt;
---
>     return adapt;
2167,2221c2119,2173
<   xf86_MSP3430SetVolume(pPriv->msp3430, MSP3430_FAST_MUTE);
<   switch(pPriv->encoding){
<   case 1:
<     pPriv->msp3430->standard = MSP3430_PAL;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
<     break;
<   case 2:
<     pPriv->msp3430->standard = MSP3430_PAL;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
<     break;
<   case 3:
<     pPriv->msp3430->standard = MSP3430_PAL;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
<     break;
<   case 4:
<     pPriv->msp3430->standard = MSP3430_NTSC;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
<     break;
<   case 5:
<     pPriv->msp3430->standard = MSP3430_NTSC;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
<     break;
<   case 6:
<     pPriv->msp3430->standard = MSP3430_NTSC;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
<     break;
<   case 7:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
<     break;
<   case 8:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
<     break;
<   case 9:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
<     break;
<   case 10:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
<     break;
<   case 11:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
<     break;
<   case 12:
<     pPriv->msp3430->standard = MSP3430_SECAM;
<     pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
<     break;
<   default:
<     return;
<   }	
<   xf86_InitMSP3430(pPriv->msp3430);
<   xf86_MSP3430SetVolume(pPriv->msp3430, pPriv->mute ? MSP3430_FAST_MUTE : pPriv->volume);
---
> xf86_MSP3430SetVolume(pPriv->msp3430, MSP3430_FAST_MUTE);
> switch(pPriv->encoding){
> 	case 1:
> 		pPriv->msp3430->standard = MSP3430_PAL;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
> 		break;
> 	case 2:
> 		pPriv->msp3430->standard = MSP3430_PAL;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
> 		break;
> 	case 3:
> 		pPriv->msp3430->standard = MSP3430_PAL;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
> 		break;
> 	case 4:
> 		pPriv->msp3430->standard = MSP3430_NTSC;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
> 		break;
> 	case 5:
> 		pPriv->msp3430->standard = MSP3430_NTSC;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
> 		break;
> 	case 6:
> 		pPriv->msp3430->standard = MSP3430_NTSC;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
> 		break;
> 	case 7:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
> 		break;
> 	case 8:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
> 		break;
> 	case 9:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
> 		break;
> 	case 10:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_3;
> 		break;
> 	case 11:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_1;
> 		break;
> 	case 12:
> 		pPriv->msp3430->standard = MSP3430_SECAM;
> 		pPriv->msp3430->connector = MSP3430_CONNECTOR_2;
> 		break;
> 	default:
> 		return;
> 	}	
> xf86_InitMSP3430(pPriv->msp3430);
> xf86_MSP3430SetVolume(pPriv->msp3430, pPriv->mute ? MSP3430_FAST_MUTE : pPriv->volume);
2226,2291c2178,2243
<   ATIPtr pATI = ATIPTR(pScrn);
<   int width, height;
<   switch(pPriv->encoding){
<   case 1:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
<     pPriv->v=24;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
<     break;
<   case 2:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
<     pPriv->v=24;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
<     break;
<   case 3:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
<     pPriv->v=24;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
<     break;
<   case 4:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
<     pPriv->v=23;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
<     break;
<   case 5:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
<     pPriv->v=23;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
<     break;
<   case 6:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
<     pPriv->v=23;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
<     break;
<   case 7:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
<     pPriv->v=25;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
<     break;
<   case 8:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
<     pPriv->v=25;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
<     break;
<   case 9:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
<     pPriv->v=25;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
<     break;
<   default:
<     xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
<     pPriv->v=23;
<     xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
<     return;
<   }	
<   if(pATI->Chip>=ATI_CHIP_264GTPRO){
<     width = RagePro_InputVideoEncodings[pPriv->encoding].width;
<     height = RagePro_InputVideoEncodings[pPriv->encoding].height; 
<   } else {
<     width = VT_GT_InputVideoEncodings[pPriv->encoding].width;
<     height = VT_GT_InputVideoEncodings[pPriv->encoding].height; 
<   }
<   xf86_bt829_SetCaptSize(pPriv->bt829, width, height*2);
<   if(pPriv->tda9850!=NULL){
<     pPriv->tda9850->mux = pPriv->bt829->mux;
<     xf86_tda9850_setaudio(pPriv->tda9850);
<   }
---
> ATIPtr pATI = ATIPTR(pScrn);
> int width, height;
> switch(pPriv->encoding){
> 	case 1:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
> 		pPriv->v=24;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
> 		break;
> 	case 2:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
> 		pPriv->v=24;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
> 		break;
> 	case 3:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
> 		pPriv->v=24;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_PAL);
> 		break;
> 	case 4:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
> 		pPriv->v=23;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
> 		break;
> 	case 5:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
> 		pPriv->v=23;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
> 		break;
> 	case 6:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
> 		pPriv->v=23;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
> 		break;
> 	case 7:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
> 		pPriv->v=25;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
> 		break;
> 	case 8:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX0);
> 		pPriv->v=25;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
> 		break;
> 	case 9:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX1);
> 		pPriv->v=25;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_SECAM);
> 		break;
> 	default:
>                 xf86_bt829_SetMux(pPriv->bt829, BT829_MUX2);
> 		pPriv->v=23;
> 	        xf86_bt829_SetFormat(pPriv->bt829, BT829_NTSC);
> 		return;
> 	}	
> if(pATI->Chip>=ATI_CHIP_264GTPRO){
> 	      width = RagePro_InputVideoEncodings[pPriv->encoding].width;
>       	      height = RagePro_InputVideoEncodings[pPriv->encoding].height; 
> 	      } else {
> 	      width = VT_GT_InputVideoEncodings[pPriv->encoding].width;
>       	      height = VT_GT_InputVideoEncodings[pPriv->encoding].height; 
> 	      }
> xf86_bt829_SetCaptSize(pPriv->bt829, width, height*2);
> if(pPriv->tda9850!=NULL){
> 	pPriv->tda9850->mux = pPriv->bt829->mux;
> 	xf86_tda9850_setaudio(pPriv->tda9850);
> 	}
2306,2307c2258,2259
<   #define ENABLE_ATI_CAPTURE_WEAVE (0x1C000005L | (BUF_MODE_SINGLE <<7) | (BUF_TYPE_FRAME << 4) |  (0) | (1<<29))
<   #define ENABLE_ATI_CAPTURE_BOB (0x1C000005L | (BUF_MODE_SINGLE <<7) | (BUF_TYPE_ALTERNATING << 4) | (0) | (0<<15) | (1<<29))
---
> #define ENABLE_ATI_CAPTURE_WEAVE (0x1C000005L | (BUF_MODE_SINGLE <<7) | (BUF_TYPE_FRAME << 4) |  (0) | (1<<29))
> #define ENABLE_ATI_CAPTURE_BOB (0x1C000005L | (BUF_MODE_SINGLE <<7) | (BUF_TYPE_ALTERNATING << 4) | (0) | (0<<15) | (1<<29))
2311a2264
> 
2314,2363c2267,2316
< 	    ScrnInfoPtr pScrn,
< 	    short src_x, short src_y,
< 	    short drw_x, short drw_y,
< 	    short src_w, short src_h,
< 	    short drw_w, short drw_h,
< 	    RegionPtr clipBoxes, pointer data
< 	    ){
<   ATIPtr pATI = ATIPTR(pScrn);
<   ATIPortPrivPtr pPriv = (ATIPortPrivPtr)data;
<   INT32 xa, xb, ya, yb, top;
<   int pitch, new_size, offset1, offset2, s2offset, s3offset;
<   int srcPitch, srcPitch2, dstPitch;
<   int bpp;
<   BoxRec dstBox;
<   CARD32 id;
<   int width, height;
< 
<   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "PutVideo\n");
<   /*
<    * s2offset, s3offset - byte offsets into U and V plane of the
<    *                      source where copying starts.  Y plane is
<    *                      done by editing "buf".
<    *
<    * offset - byte offset to the first line of the destination.
<    *
<    * dst_start - byte address to the first displayed pel.
<    *
<    */
<