Skip to content

L
libdvbpsi
Commit 63f9c0fc authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Added bytes transferred and bitrates between two PCR's to the verbose output.

parent 2da20ad2
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 23 deletions
examples/decode_mpeg.c
View file @ 63f9c0fc
...@@ -170,6 +170,8 @@ int ReadPacketFromSocket( int i_socket, uint8_t* p_dst, size_t i_size) ...@@ -170,6 +170,8 @@ int ReadPacketFromSocket( int i_socket, uint8_t* p_dst, size_t i_size)
memset( p_dst, 0, i_size ); memset( p_dst, 0, i_size );
i_rc = read( i_socket, p_dst, i_size ); i_rc = read( i_socket, p_dst, i_size );
if( i_rc < 0 ) printf( "READ INTERRUPTED BY SIGNAL\n" );
if( i_rc == 0 ) printf( "READ RETURNS 0\n" );
return (i_rc <= i_size ) ? 1 : 0; return (i_rc <= i_size ) ? 1 : 0;
} }
#endif #endif
...@@ -417,12 +419,13 @@ int main(int i_argc, char* pa_argv[]) ...@@ -417,12 +419,13 @@ int main(int i_argc, char* pa_argv[])
int i_fd = -1; int i_fd = -1;
int i_mtu = 1316; /* (7 * 188) = 1316 < 1500 network MTU */ int i_mtu = 1316; /* (7 * 188) = 1316 < 1500 network MTU */
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
int i_port = 0; int i_port = 0;
char *ipaddress = NULL; char * ipaddress = NULL;
time_t time_prev = 0; time_t time_prev = 0;
int i_old_cc = -1; int i_old_cc = -1;
mtime_t i_prev_pcr = 0; /* 33 bits */ mtime_t i_prev_pcr = 0; /* 33 bits */
#endif #endif
uint32_t i_bytes = 0; /* bytes transmitted between PCR's */
char *filename = NULL; char *filename = NULL;
uint8_t *p_data = NULL; uint8_t *p_data = NULL;
...@@ -446,6 +449,7 @@ int main(int i_argc, char* pa_argv[]) ...@@ -446,6 +449,7 @@ int main(int i_argc, char* pa_argv[])
case 'm': case 'm':
i_mtu = atoi( optarg ); i_mtu = atoi( optarg );
if( i_mtu < 0 ) i_mtu = 1316; if( i_mtu < 0 ) i_mtu = 1316;
else i_mtu = (i_mtu / 188) * 188;
break; break;
case 'p': case 'p':
i_port = atoi( optarg ); i_port = atoi( optarg );
...@@ -465,6 +469,12 @@ int main(int i_argc, char* pa_argv[]) ...@@ -465,6 +469,12 @@ int main(int i_argc, char* pa_argv[])
} }
} while( next_option != -1 ); } while( next_option != -1 );
#ifdef HAVE_SYS_SOCKET_H
if( b_verbose )
{
printf( "set mtu to %d\n", i_mtu );
}
#endif
/* initialize */ /* initialize */
if( filename ) if( filename )
{ {
...@@ -489,18 +499,23 @@ int main(int i_argc, char* pa_argv[]) ...@@ -489,18 +499,23 @@ int main(int i_argc, char* pa_argv[])
/* Read first packet */ /* Read first packet */
if( filename ) if( filename )
{
b_ok = ReadPacket( i_fd, p_data); b_ok = ReadPacket( i_fd, p_data);
i_bytes += 188;
}
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
else else
{
b_ok = ReadPacketFromSocket( i_fd, p_data, i_mtu ); b_ok = ReadPacketFromSocket( i_fd, p_data, i_mtu );
i_bytes += i_mtu;
}
if( b_verbose ) if( b_verbose )
printf( "seqno, network (ms), PCR value (ms), PCR prev (ms), delta (ms)\n" ); printf( "seqno, network (ms), PCR value (ms), PCR prev (ms), delta (ms), bytes, bitrate (bytes/delta)\n" );
#endif #endif
/* Enter infinite loop */ /* Enter infinite loop */
p_stream->pat.handle = dvbpsi_AttachPAT( DumpPAT, p_stream ); p_stream->pat.handle = dvbpsi_AttachPAT( DumpPAT, p_stream );
while(b_ok) while( b_ok )
{ {
int i = 0; int i = 0;
...@@ -537,7 +552,7 @@ int main(int i_argc, char* pa_argv[]) ...@@ -537,7 +552,7 @@ int main(int i_argc, char* pa_argv[])
i_old_cc = p_stream->pid[i_pid].i_cc; i_old_cc = p_stream->pid[i_pid].i_cc;
p_stream->pid[i_pid].i_cc = i_cc; p_stream->pid[i_pid].i_cc = i_cc;
} }
/* Other adaptation field */ /* Other adaptation field */
if( b_adaptation ) if( b_adaptation )
{ {
...@@ -554,8 +569,7 @@ int main(int i_argc, char* pa_argv[]) ...@@ -554,8 +569,7 @@ int main(int i_argc, char* pa_argv[])
if( b_pcr && (p_tmp[4] >= 7) ) if( b_pcr && (p_tmp[4] >= 7) )
{ {
mtime_t i_pcr; /* 33 bits */ mtime_t i_pcr; /* 33 bits */
mtime_t i_delta = 0; mtime_t i_delta = 0;
struct timeval tv;
i_pcr = ( ( (mtime_t)p_tmp[6] << 25 ) | i_pcr = ( ( (mtime_t)p_tmp[6] << 25 ) |
( (mtime_t)p_tmp[7] << 17 ) | ( (mtime_t)p_tmp[7] << 17 ) |
...@@ -571,24 +585,38 @@ int main(int i_argc, char* pa_argv[]) ...@@ -571,24 +585,38 @@ int main(int i_argc, char* pa_argv[])
{ {
time_t time_current; time_t time_current;
time_t tv_delta; time_t tv_delta;
struct timeval tv;
gettimeofday( &tv, NULL ); gettimeofday( &tv, NULL );
time_current = (tv.tv_sec*1000) + (tv.tv_usec/1000); time_current = (tv.tv_sec*1000) + (tv.tv_usec/1000);
tv_delta = time_current - time_prev; if( time_prev == 0 ) /* probably the first one */
printf( "arrival %.2ld, ", (long)tv_delta ); printf( "arrival -, " );
else
{
tv_delta = time_current - time_prev;
printf( "arrival %.2lld, ", (long long int)tv_delta );
}
time_prev = time_current; time_prev = time_current;
} }
if( i_delta < 0 ) if( i_delta <= 0 )
printf( "value %lld, previous %lld, delta %lld\n", printf( "value %lld, previous %lld, delta %lld, bytes %u, ",
(long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr, (long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr,
(long long int)i_delta ); (long long int)i_delta, i_bytes );
else if( b_verbose ) else if( b_verbose )
printf( "value %lld, previous %lld, delta %lld\n", printf( "value %lld, previous %lld, delta %lld, bytes %u, ",
(long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr, (long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr,
(long long int)i_delta ); (long long int)i_delta, i_bytes );
if( (i_delta > 0) )
printf( "%lld Kbps", ((i_bytes*8)/i_delta) );
else
printf( "-" );
if( (i_delta <= 0) || b_verbose )
printf( "\n" );
i_bytes = 0;
} }
} }
/* Handle discontinuities if they occured, /* Handle discontinuities if they occured,
* according to ISO/IEC 13818-1: DIS pages 20-22 */ * according to ISO/IEC 13818-1: DIS pages 20-22 */
if( b_adaptation ) if( b_adaptation )
...@@ -599,9 +627,26 @@ int main(int i_argc, char* pa_argv[]) ...@@ -599,9 +627,26 @@ int main(int i_argc, char* pa_argv[])
if( b_discontinuity_indicator ) if( b_discontinuity_indicator )
{ {
if( b_pcr ) if( b_pcr )
printf( "New PCR pid %d value %lld (previous %lld, delta %lld)\n", i_pid, {
(long long int)p_stream->pid[i_pid].i_pcr, (long long int)i_prev_pcr, mtime_t i_delta;
(long long int)p_stream->pid[i_pid].i_pcr - (long long int)i_prev_pcr ); struct timeval tv;
i_delta = (long long int)p_stream->pid[i_pid].i_pcr - (long long int)i_prev_pcr;
printf( "New PCR pid %d, value %lld, previous %lld, delta %lld, bytes %u, ",
i_pid,
(long long int)p_stream->pid[i_pid].i_pcr,
(long long int)i_prev_pcr,
i_delta,
i_bytes );
if( i_delta > 0 )
printf( "%lld", (i_bytes*8)/(i_delta/1000) );
printf( "\n" );
/* Initialize the arrival time */
gettimeofday( &tv, NULL );
time_prev = (tv.tv_sec*1000) + (tv.tv_usec/1000);
i_bytes = 0;
}
if( b_discontinuity_seen ) if( b_discontinuity_seen )
{ {
/* cc discontinuity is expected */ /* cc discontinuity is expected */
...@@ -621,10 +666,16 @@ int main(int i_argc, char* pa_argv[]) ...@@ -621,10 +666,16 @@ int main(int i_argc, char* pa_argv[])
} }
/* Read next packet */ /* Read next packet */
if( filename ) if( filename )
{
b_ok = ReadPacket( i_fd, p_data); b_ok = ReadPacket( i_fd, p_data);
i_bytes += 188;
}
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
else else
{
b_ok = ReadPacketFromSocket( i_fd, p_data, i_mtu ); b_ok = ReadPacketFromSocket( i_fd, p_data, i_mtu );
i_bytes += i_mtu;
}
#endif #endif
} }
dvbpsi_DetachPMT( p_stream->pmt.handle ); dvbpsi_DetachPMT( p_stream->pmt.handle );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment