summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server
diff options
context:
space:
mode:
authornaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-05 23:19:43 +0000
committernaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-05 23:19:43 +0000
commit38b6ed03271fe6e183a0f38382854603d60f6355 (patch)
tree591ab9a447eaf7b9dbb71be4893a37309931ca18 /TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server
parentc4974bfdb7ba8dc0dd76652126d78babbc52cd6e (diff)
downloadATCD-38b6ed03271fe6e183a0f38382854603d60f6355.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server')
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h2
4 files changed, 13 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
index 7452f2b953b..342361ad270 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
@@ -341,6 +341,7 @@ Video_Global::SendPacket (int shtag, int gop, int frame, int timeToUse)
if (frame >= this->gopTable[gop].totalFrames)
{
+ ACE_DEBUG ((LM_DEBUG,"(%P|%t)Reached line in %s %d",__FILE__,__LINE__));
this->packet->cmd = htonl (this->cmd);
this->packet->cmdsn = htonl (this->cmdsn);
this->packet->sh = htonl (sh);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
index f2fdea97d63..5e53cd2e9f5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
@@ -101,6 +101,7 @@ Video_Control_State::init_video (const Video_Control::INITvideoPara &init_para,
reply->firstGopFrames = VIDEO_SINGLETON::instance ()->firstGopFrames;
reply->pattern.length (VIDEO_SINGLETON::instance ()->patternSize);
+
// copy the sequence of char..
for ( i = 0; i < VIDEO_SINGLETON::instance ()->patternSize; i++)
reply->pattern [i] = VIDEO_SINGLETON::instance ()->pattern [i];
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
index 4160ba187cc..d16e66689c6 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp
@@ -122,17 +122,20 @@ Video_Control_i::stop (CORBA::Long cmdsn,
return this->state_->stop (cmdsn);
}
-CORBA::Short
+CORBA::UShort
Video_Control_i::set_peer (const char *peer,
CORBA::Environment &_tao_environment)
{
- ACE_DEBUG ((LM_DEBUG,
- "(%P|%t) set_peer called: %s\n",
- peer));
-
- ACE_INET_Addr client_data_addr (peer);
+ ACE_INET_Addr client_data_addr (peer);
// Data (UDP) Address of the client.
+ ACE_DEBUG ((LM_DEBUG,
+ "(%P|%t) set_peer called: %s,%s,%d\n",
+ peer,
+ client_data_addr.get_host_addr (),
+ client_data_addr.get_port_number ()));
+
+
if (VIDEO_SINGLETON::instance ()->dgram.open (client_data_addr) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) UDP open failed: %p\n"),
@@ -158,6 +161,7 @@ Video_Control_i::set_peer (const char *peer,
VIDEO_SINGLETON::instance ()->videoSocket = VIDEO_SINGLETON::instance ()->dgram.get_handle ();
+ ACE_DEBUG ((LM_DEBUG,"(%P|%t) set_peer: server port = %d\n",server_data_addr.get_port_number ()));
return server_data_addr.get_port_number ();
}
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
index b7711d2532d..592ce66fd6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h
@@ -56,7 +56,7 @@ public:
virtual CORBA::Boolean stop (CORBA::Long cmdsn,
CORBA::Environment &_tao_environment);
- virtual CORBA::Short set_peer (const char *peer,
+ virtual CORBA::UShort set_peer (const char *peer,
CORBA::Environment &_tao_environment);
// called by the client to inform us about it's ip and
// udp address.