rpitx/librpitx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try ATV interlace

Browse source
This commit is contained in:
F5OEO 2018-12-23 16:35:55 +00:00
parent 34d43bf441
commit 4ee1aa28dd
2 changed files with 72 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/testrpitx.cpp
View file

@ -644,15 +644,45 @@ void SimpleTestAtv(uint64_t Freq)
int SR = 1000000; int SR = 1000000;
int FifoSize = 625*52; int FifoSize = 625*52;
float samples[FifoSize]; float samples[FifoSize];
for(int j=0;j<625;j++) //Frame 0
for(int j=0;j<312;j++)
{ {
for(int i=0;i<52;i++) samples[i+j*52]=i/52.0; if(j<160)
{
for(int i=0;i<52;i++) samples[i+j*52]=i/52.0;
}
else
{
for(int i=0;i<52;i++) samples[i+j*52]=0;
}
} }
//Frame 1
for(int j=0;j<312;j++)
{
if(j<160)
{
for(int i=0;i<52;i++) samples[i+(j+312)*52]=i/52.0;
}
else
{
for(int i=0;i<52;i++) samples[i+(j+312)*52]=0;
}
}
atv atvtest(Freq, SR, 14, 625); atv atvtest(Freq, SR, 14, 625);
int Available = atvtest.GetBufferAvailable();
int Index = atvtest.GetUserMemIndex();
fprintf(stderr,"Available %d Index %d\n",Available,Index);
atvtest.SetTvSamples(samples,FifoSize); atvtest.SetTvSamples(samples,FifoSize);
while(running) while(running)
{ {
usleep(100000); //atvtest.SetTvSamples(samples,FifoSize);
usleep(40000);
} }
} }

62
src/atv.cpp
View file

@ -35,7 +35,7 @@ atv::atv(uint64_t TuneFrequency, uint32_t SR, int Channel, uint32_t Lines) : buf
clkgpio::SetCenterFrequency(TuneFrequency, SampleRate); clkgpio::SetCenterFrequency(TuneFrequency, SampleRate);
clkgpio::SetFrequency(0); clkgpio::SetFrequency(0);
clkgpio::enableclk(4); // GPIO 4 CLK by default clkgpio::enableclk(4); // GPIO 4 CLK by default
syncwithpwm = true; syncwithpwm = false;
if (syncwithpwm) if (syncwithpwm)
{ {
@ -69,16 +69,27 @@ void atv::SetDmaAlgo()
dma_cb_t *cbp = cbarray; dma_cb_t *cbp = cbarray;
int LineResolution = 625; int LineResolution = 625;
uint32_t level0= mem_virt_to_phys(&usermem[(buffersize * registerbysample - 1)]);
uint32_t level1= mem_virt_to_phys(&usermem[(buffersize * registerbysample - 2)]);
int shortsync_0=2;
int shortsync_1=30;
int longsync_0=30;
int longsync_1=2;
int normalsync_0=4;
int normalsync_1=8;
for (int frame = 0; frame < 2; frame++) for (int frame = 0; frame < 2; frame++)
{ {
//32us*5 or 6 //Preegalisation
for (int i = 0; i < 5+frame; i++) for (int i = 0; i < 6/*-frame*/; i++)
{ {
//2us 0,30us 1 //2us 0,30us 1
//@0 //@0
//SYNC preegalisation 2us //SYNC preegalisation 2us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 1)]); //Amp 0 cbp->src = level0; //Amp 0
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -95,14 +106,14 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 2; //2us cbp->length = 4 * shortsync_0; //2us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
//SYNC preegalisation 30us //SYNC preegalisation 30us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 2)]); //Amp 1 cbp->src = level1; //Amp 1
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -119,7 +130,7 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 30; //30us cbp->length = 4 * shortsync_1; //30us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
@ -128,7 +139,7 @@ void atv::SetDmaAlgo()
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 1)]); //Amp 0 27us cbp->src = level0; //Amp 0 27us
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -145,13 +156,13 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 27; //27us cbp->length = 4 * longsync_0; //27us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 2)]); //Amp 1 5us cbp->src = level1; //Amp 1 5us
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -168,19 +179,19 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 5; //5us cbp->length = 4 * longsync_1; //5us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
} }
//postegalisation ; copy paste from preegalisation //postegalisation ; copy paste from preegalisation
for (int i = 0; i < 5; i++) for (int i = 0; i < 5/*-i*/; i++)
{ {
//2us 0,30us 1 //2us 0,30us 1
//@0 //@0
//SYNC preegalisation 2us //SYNC preegalisation 2us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 1)]); //Amp 0 cbp->src = level0; //Amp 0
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -197,14 +208,14 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 2; //2us cbp->length = 4 * shortsync_0; //2us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
//SYNC preegalisation 30us //SYNC preegalisation 30us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 2)]); //Amp 1 cbp->src = level1; //Amp 1
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -221,19 +232,19 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 30; //30us cbp->length = 4 * shortsync_1; //30us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
} }
for (int line = 0; line < 305; line++) for (int line = 0; line < /*305*/304+frame; line++)
{ {
//@0 //@0
//SYNC 0/ 5us //SYNC 0/ 5us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 1)]); //Amp 0 cbp->src = level0; //Amp 0
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -250,7 +261,7 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 4; //5us cbp->length = 4 * normalsync_0; //4us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
@ -258,7 +269,7 @@ void atv::SetDmaAlgo()
//@0 //@0
//SYNC 1/ 5us //SYNC 1/ 5us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[(buffersize * registerbysample - 2)]); //Amp 1 cbp->src = level1; //Amp 1
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -275,7 +286,7 @@ void atv::SetDmaAlgo()
cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE; cbp->dst = 0x7E000000 + (PWM_FIFO << 2) + PWM_BASE;
else else
cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE; cbp->dst = 0x7E000000 + (PCM_FIFO_A << 2) + PCM_BASE;
cbp->length = 4 * 6; //5us; cbp->length = 4 * normalsync_1; //5us;
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
@ -286,7 +297,11 @@ void atv::SetDmaAlgo()
//@0 //@0
//DATA IN / 1us //DATA IN / 1us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
cbp->src = mem_virt_to_phys(&usermem[samplecnt * registerbysample]); //Amp 1 if(line<10) //remove 10 lines
cbp->src=level1;
else
cbp->src = mem_virt_to_phys(&usermem[samplecnt * registerbysample+frame*312*registerbysample]); //Amp 1
cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO; cbp->dst = 0x7E000000 + (PADS_GPIO_0 << 2) + PADS_GPIO;
cbp->length = 4; cbp->length = 4;
cbp->stride = 0; cbp->stride = 0;
@ -308,6 +323,7 @@ void atv::SetDmaAlgo()
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;
} }
/*
//FRONT PORSH //FRONT PORSH
//SYNC 2us //SYNC 2us
cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ; cbp->info = 0; //BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
@ -331,7 +347,7 @@ void atv::SetDmaAlgo()
cbp->length = 4 * 2; //2us cbp->length = 4 * 2; //2us
cbp->stride = 0; cbp->stride = 0;
cbp->next = mem_virt_to_phys(cbp + 1); cbp->next = mem_virt_to_phys(cbp + 1);
cbp++; cbp++;*/
} }
} }
cbp--; cbp--;