[xiph-commits] r10550 - in experimental/j/Elphel333: common http
rtp/daemon shout
giles at svn.xiph.org
giles at svn.xiph.org
Tue Dec 6 03:58:12 PST 2005
Author: giles
Date: 2005-12-06 03:58:11 -0800 (Tue, 06 Dec 2005)
New Revision: 10550
Modified:
experimental/j/Elphel333/common/oggtheora.c
experimental/j/Elphel333/common/oggtheora.h
experimental/j/Elphel333/http/TheoraHTTP.c
experimental/j/Elphel333/rtp/daemon/TheoraStrm.c
experimental/j/Elphel333/shout/TheoraShout.c
Log:
Remove the time_slow parameter. This was just a hack to cope with slow
playback on hosts and isn't meaningful in streaming contexts.
Modified: experimental/j/Elphel333/common/oggtheora.c
===================================================================
--- experimental/j/Elphel333/common/oggtheora.c 2005-12-06 11:50:34 UTC (rev 10549)
+++ experimental/j/Elphel333/common/oggtheora.c 2005-12-06 11:58:11 UTC (rev 10550)
@@ -1671,12 +1671,10 @@
nframes_inter_full: number of INTER frames (full) after each INTRA
nframes_inter_masked: number of INTER frames (masked) after each INTER full
(not tested yet)
- time_slow: reduce reported fps by this
Return: 0 on success, or a negative value on error.*/
int setup_tbl_FPGA( int nframes_total,
int nframes_inter_full,
- int nframes_inter_masked,
- int time_slow) {
+ int nframes_inter_masked) {
char headers_filename[]="/tmp/headers";
char parameters_filename[]="/etc/oggtheora_params";
@@ -1771,7 +1769,7 @@
{fprintf(stderr,"error opening file %s for reading - error = %d (%s)\n",controlfn,errno,strerror(errno)); return -1;}
nstx=ioctl(devfd, _CCCMD( CCAM_RPARS , P_ACTUAL_WIDTH), 0)>>7;
nsty=ioctl(devfd, _CCCMD( CCAM_RPARS , P_ACTUAL_HEIGHT), 0)>>6;
- frn=(ioctl(devfd, _CCCMD( CCAM_RPARS , P_FP100S), 0)*10000)/time_slow;
+ frn=(ioctl(devfd, _CCCMD( CCAM_RPARS , P_FP100S), 0)*10000);
qis[1]=qis[0]=(ioctl(devfd, _CCCMD( CCAM_RPARS , P_QUALITY), 0)*63)/100;
fprintf(stderr,"fps=%d/1000000\r\n",frn);
close (devfd);
Modified: experimental/j/Elphel333/common/oggtheora.h
===================================================================
--- experimental/j/Elphel333/common/oggtheora.h 2005-12-06 11:50:34 UTC (rev 10549)
+++ experimental/j/Elphel333/common/oggtheora.h 2005-12-06 11:58:11 UTC (rev 10550)
@@ -161,8 +161,7 @@
char * fnegets(FILE* fin, char * s);
int setup_tbl_FPGA( int nframes_total,
int nframes_inter_full, // number of INTER frames (full) after each INTRA
- int nframes_inter_masked, // number of INTER frames (masked) after each INTER full (not tested yet)
- int time_slow); // reduce reported fps by this
+ int nframes_inter_masked); // number of INTER frames (masked) after each INTER full (not tested yet)
#if defined(__cplusplus)
}
Modified: experimental/j/Elphel333/http/TheoraHTTP.c
===================================================================
--- experimental/j/Elphel333/http/TheoraHTTP.c 2005-12-06 11:50:34 UTC (rev 10549)
+++ experimental/j/Elphel333/http/TheoraHTTP.c 2005-12-06 11:58:11 UTC (rev 10550)
@@ -125,7 +125,6 @@
int devfd, i;
int acq_data;
int nframes_total, nframes_inter_full, nframes_inter_masked;
- int time_slow;
uint8_t *ccam_dma, *dp = NULL;
uint8_t *dp_prev = NULL;
uint32_t *ccam_dma_index;
@@ -197,9 +196,7 @@
nframes_total = 0; // unlimited
nframes_inter_full = 128;
nframes_inter_masked = 0;
- time_slow = (int)(100./strm_data_par.fps);
- time_slow = 1;
- fprintf(stderr,"fps =%f time_slow %d\n",strm_data_par.fps,time_slow);
+ fprintf(stderr,"fps =%f\n",strm_data_par.fps);
acq_data = ((nframes_total)<<16 )
| (((nframes_inter_full > 255)?
255:
@@ -209,7 +206,7 @@
((nframes_inter_masked < 0)?0:nframes_inter_masked));
if(setup_tbl_FPGA( nframes_total, nframes_inter_full,
- nframes_inter_masked, time_slow)<0)
+ nframes_inter_masked)<0)
return;
// Ogg Header this should go in its own function: ogg_send_header
Modified: experimental/j/Elphel333/rtp/daemon/TheoraStrm.c
===================================================================
--- experimental/j/Elphel333/rtp/daemon/TheoraStrm.c 2005-12-06 11:50:34 UTC (rev 10549)
+++ experimental/j/Elphel333/rtp/daemon/TheoraStrm.c 2005-12-06 11:58:11 UTC (rev 10550)
@@ -328,7 +328,7 @@
int devfd, i;
int acq_data, nframes_total, nframes_inter_full,
- nframes_inter_masked, time_slow;
+ nframes_inter_masked;
uint8_t *ccam_dma, *dp = NULL;
uint32_t *ccam_dma_index;
int circindex_fd;
@@ -386,15 +386,14 @@
nframes_total = 0; // unlimited
nframes_inter_full = 128;
nframes_inter_masked = 0;
- time_slow = (int)(100./strm_data_par.fps);
- fprintf(stderr,"fps =%f time_slow %d\n",strm_data_par.fps,time_slow);
+ fprintf(stderr,"fps =%f\n",strm_data_par.fps);
acq_data = ((nframes_total)<<16 ) |
(((nframes_inter_full > 255)? 255:((nframes_inter_full < 0)?0:nframes_inter_full )) << 8) |
((nframes_inter_masked > 255)? 255:((nframes_inter_masked < 0)?0:nframes_inter_masked));
if(setup_tbl_FPGA( nframes_total, nframes_inter_full,
- nframes_inter_masked, time_slow)<0) return;
+ nframes_inter_masked)<0) return;
if(make_OggTheoraHdrs(headers_filename)<0) {
fprintf(stderr,"Error prepare headers while parsing %s\n",headers_filename);
Modified: experimental/j/Elphel333/shout/TheoraShout.c
===================================================================
--- experimental/j/Elphel333/shout/TheoraShout.c 2005-12-06 11:50:34 UTC (rev 10549)
+++ experimental/j/Elphel333/shout/TheoraShout.c 2005-12-06 11:58:11 UTC (rev 10550)
@@ -307,7 +307,6 @@
int devfd, i;
int acq_data;
int nframes_total, nframes_inter_full, nframes_inter_masked;
- int time_slow;
uint8_t *ccam_dma, *dp = NULL;
uint32_t *ccam_dma_index;
int circindex_fd;
@@ -366,8 +365,7 @@
nframes_total = 0; // unlimited
nframes_inter_full = 128;
nframes_inter_masked = 0;
- time_slow = (int)(100./strm_data_par.fps);
- fprintf(stderr,"fps =%f time_slow %d\n",strm_data_par.fps,time_slow);
+ fprintf(stderr,"fps =%f\n",strm_data_par.fps);
acq_data = ((nframes_total)<<16 )
| (((nframes_inter_full > 255)?
255:
@@ -377,7 +375,7 @@
((nframes_inter_masked < 0)?0:nframes_inter_masked));
if(setup_tbl_FPGA( nframes_total, nframes_inter_full,
- nframes_inter_masked, time_slow)<0)
+ nframes_inter_masked)<0)
return;
if(make_OggTheoraHdrs(headers_filename)<0) {
More information about the commits
mailing list