diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 866f24f1122..dd3f44afa2b 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 @@ -61,11 +61,11 @@ Video_Control_State::init_video (const Video_Control::INITvideoPara &init_para, VIDEO_SINGLETON::instance ()->pattern[0] = 'I'; VIDEO_SINGLETON::instance ()->pattern[1] = 0; VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->verticalSize * VIDEO_SINGLETON::instance ()->horizontalSize * 3; - VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)ACE_OS::malloc (sizeof (VideoMessage) + sizeof (VideoPacket) + + VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) + VIDEO_SINGLETON::instance ()->packetBufSize); if (VIDEO_SINGLETON::instance ()->packet == NULL) { - perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->packet buffer"); + perror ("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer"); exit (1); } VIDEO_SINGLETON::instance ()->packet = (VideoPacket *) ((char *)VIDEO_SINGLETON::instance ()->packet + sizeof (VideoMessage)); @@ -426,7 +426,7 @@ Video_Control_Play_State::speed (const Video_Control::SPEEDpara ¶) for (int i=0; i<para.sendPattern.length (); i++) VIDEO_SINGLETON::instance ()->sendPattern [i] = para.sendPattern [i]; - // ACE_OS::memcpy (VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE); + // memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE); Video_Timer_Global::TimerSpeed (); VIDEO_SINGLETON::instance ()->play_send (); |