generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switching to stl instead of WebRTC wrappers.

Browse Source 
BUG=C-10436, C-10437, C-10438

Review URL: https://webrtc-codereview.appspot.com/343012

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1468 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2012-01-19 12:48:53 +00:00
parent 8e50693736
commit 70111e69bf
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_engine/test/auto_test/interface/tb_external_transport.h
View File

@ -15,8 +15,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_EXTERNAL_TRANSPORT_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_EXTERNAL_TRANSPORT_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_EXTERNAL_TRANSPORT_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_EXTERNAL_TRANSPORT_H_
#include <list>
#include "common_types.h" #include "common_types.h"
#include "list_wrapper.h"
namespace webrtc namespace webrtc
{ {
@ -85,8 +86,8 @@ private:
WebRtc_Word32 _rtcpCount; WebRtc_Word32 _rtcpCount;
WebRtc_Word32 _dropCount; WebRtc_Word32 _dropCount;
webrtc::ListWrapper _rtpPackets; std::list<VideoPacket*> _rtpPackets;
webrtc::ListWrapper _rtcpPackets; std::list<VideoPacket*> _rtcpPackets;
unsigned char _temporalLayers; unsigned char _temporalLayers;
unsigned short _seqNum; unsigned short _seqNum;

18
src/video_engine/test/auto_test/source/tb_external_transport.cc
View File

@ -48,8 +48,6 @@ TbExternalTransport::TbExternalTransport(webrtc::ViENetwork& vieNetwork) :
_rtpCount(0), _rtpCount(0),
_rtcpCount(0), _rtcpCount(0),
_dropCount(0), _dropCount(0),
_rtpPackets(),
_rtcpPackets(),
_temporalLayers(0), _temporalLayers(0),
_seqNum(0), _seqNum(0),
_sendPID(0), _sendPID(0),
@ -196,7 +194,7 @@ int TbExternalTransport::SendPacket(int channel, const void *data, int len)
_crit.Enter(); _crit.Enter();
newPacket->receiveTime = NowMs() + _networkDelayMs; newPacket->receiveTime = NowMs() + _networkDelayMs;
_rtpPackets.PushBack(newPacket); _rtpPackets.push_back(newPacket);
_event.Set(); _event.Set();
_crit.Leave(); _crit.Leave();
return len; return len;
@ -221,7 +219,7 @@ int TbExternalTransport::SendRTCPPacket(int channel, const void *data, int len)
_crit.Enter(); _crit.Enter();
newPacket->receiveTime = NowMs() + _networkDelayMs; newPacket->receiveTime = NowMs() + _networkDelayMs;
_rtcpPackets.PushBack(newPacket); _rtcpPackets.push_back(newPacket);
_event.Set(); _event.Set();
_crit.Leave(); _crit.Leave();
return len; return len;
@ -300,11 +298,11 @@ bool TbExternalTransport::ViEExternalTransportProcess()
VideoPacket* packet = NULL; VideoPacket* packet = NULL;
while (!_rtpPackets.Empty()) while (!_rtpPackets.empty())
{ {
// Take first packet in queue // Take first packet in queue
_crit.Enter(); _crit.Enter();
packet = static_cast<VideoPacket*> ((_rtpPackets.First())->GetItem()); packet = _rtpPackets.front();
WebRtc_Word64 timeToReceive = packet->receiveTime - NowMs(); WebRtc_Word64 timeToReceive = packet->receiveTime - NowMs();
if (timeToReceive > 0) if (timeToReceive > 0)
{ {
@ -316,7 +314,7 @@ bool TbExternalTransport::ViEExternalTransportProcess()
_crit.Leave(); _crit.Leave();
break; break;
} }
_rtpPackets.PopFront(); _rtpPackets.pop_front();
_crit.Leave(); _crit.Leave();
// Send to ViE // Send to ViE
@ -347,11 +345,11 @@ bool TbExternalTransport::ViEExternalTransportProcess()
packet = NULL; packet = NULL;
} }
} }
while (!_rtcpPackets.Empty()) while (!_rtcpPackets.empty())
{ {
// Take first packet in queue // Take first packet in queue
_crit.Enter(); _crit.Enter();
packet = static_cast<VideoPacket*> ((_rtcpPackets.First())->GetItem()); packet = _rtcpPackets.front();
WebRtc_Word64 timeToReceive = packet->receiveTime - NowMs(); WebRtc_Word64 timeToReceive = packet->receiveTime - NowMs();
if (timeToReceive > 0) if (timeToReceive > 0)
{ {
@ -363,7 +361,7 @@ bool TbExternalTransport::ViEExternalTransportProcess()
_crit.Leave(); _crit.Leave();
break; break;
} }
_rtcpPackets.PopFront(); _rtcpPackets.pop_front();
_crit.Leave(); _crit.Leave();
// Send to ViE // Send to ViE

35
src/video_engine/vie_file_player.cc
View File

@ -270,8 +270,12 @@ int ViEFilePlayer::StopPlay() {
int ViEFilePlayer::StopPlayAudio() { int ViEFilePlayer::StopPlayAudio() {
// Stop sending audio. // Stop sending audio.
while (MapItem* audio_item = audio_channels_sending_.First()) {
StopSendAudioOnChannel(audio_item->GetId()); std::set<int>::iterator it = audio_channels_sending_.begin();
while (it != audio_channels_sending_.end()) {
StopSendAudioOnChannel(*it);
// StopSendAudioOnChannel erases the item from the map.
it = audio_channels_sending_.begin();
} }
// Stop local audio playback. // Stop local audio playback.
@ -279,10 +283,7 @@ int ViEFilePlayer::StopPlayAudio() {
StopPlayAudioLocally(local_audio_channel_); StopPlayAudioLocally(local_audio_channel_);
} }
local_audio_channel_ = -1; local_audio_channel_ = -1;
while (audio_channel_buffers_.PopFront() != -1) { audio_channel_buffers_.clear();
}
while (audio_channels_sending_.Erase(audio_channels_sending_.First()) != -1) {
}
audio_clients_ = 0; audio_clients_ = 0;
return 0; return 0;
} }
@ -300,8 +301,8 @@ int ViEFilePlayer::Read(void* buf, int len) {
} }
// 2 bytes per sample. // 2 bytes per sample.
decoded_audio_length_ *= 2; decoded_audio_length_ *= 2;
if (buf != 0) { if (buf) {
audio_channel_buffers_.PushBack(buf); audio_channel_buffers_.push_back(buf);
} }
} else { } else {
// No need for new audiobuffer from file, ie the buffer read from file has // No need for new audiobuffer from file, ie the buffer read from file has
@ -315,16 +316,16 @@ int ViEFilePlayer::Read(void* buf, int len) {
bool ViEFilePlayer::NeedsAudioFromFile(void* buf) { bool ViEFilePlayer::NeedsAudioFromFile(void* buf) {
bool needs_new_audio = false; bool needs_new_audio = false;
if (audio_channel_buffers_.GetSize() == 0) { if (audio_channel_buffers_.size() == 0) {
return true; return true;
} }
// Check if we the buf already have read the current audio. // Check if we the buf already have read the current audio.
for (ListItem* item = audio_channel_buffers_.First(); item != NULL; for (std::list<void*>::iterator it = audio_channel_buffers_.begin();
item = audio_channel_buffers_.Next(item)) { it != audio_channel_buffers_.end(); ++it) {
if (item->GetItem() == buf) { if (*it == buf) {
needs_new_audio = true; needs_new_audio = true;
audio_channel_buffers_.Erase(item); audio_channel_buffers_.erase(it);
break; break;
} }
} }
@ -381,7 +382,7 @@ int ViEFilePlayer::SendAudioOnChannel(const int audio_channel,
audio_channel, mix_microphone, volume_scaling); audio_channel, mix_microphone, volume_scaling);
return -1; return -1;
} }
audio_channels_sending_.Insert(audio_channel, NULL); audio_channels_sending_.insert(audio_channel);
CriticalSectionScoped lock(*audio_cs_); CriticalSectionScoped lock(*audio_cs_);
audio_clients_++; audio_clients_++;
@ -390,8 +391,8 @@ int ViEFilePlayer::SendAudioOnChannel(const int audio_channel,
int ViEFilePlayer::StopSendAudioOnChannel(const int audio_channel) { int ViEFilePlayer::StopSendAudioOnChannel(const int audio_channel) {
int result = 0; int result = 0;
MapItem* audio_item = audio_channels_sending_.Find(audio_channel); std::set<int>::iterator it = audio_channels_sending_.find(audio_channel);
if (!audio_item) { if (it == audio_channels_sending_.end()) {
WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, id_), WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(engine_id_, id_),
"ViEFilePlayer::StopSendAudioOnChannel AudioChannel %d not " "ViEFilePlayer::StopSendAudioOnChannel AudioChannel %d not "
"sending", audio_channel); "sending", audio_channel);
@ -404,7 +405,7 @@ int ViEFilePlayer::StopSendAudioOnChannel(const int audio_channel) {
"VE_StopPlayingFileAsMicrophone failed. audio_channel %d", "VE_StopPlayingFileAsMicrophone failed. audio_channel %d",
audio_channel); audio_channel);
} }
audio_channels_sending_.Erase(audio_item); audio_channels_sending_.erase(audio_channel);
CriticalSectionScoped lock(*audio_cs_); CriticalSectionScoped lock(*audio_cs_);
audio_clients_--; audio_clients_--;
assert(audio_clients_ >= 0); assert(audio_clients_ >= 0);

8
src/video_engine/vie_file_player.h
View File

@ -11,10 +11,12 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_ #ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
#define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_ #define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
#include <list>
#include <set>
#include "common_types.h" #include "common_types.h"
#include "modules/media_file/interface/media_file_defines.h" #include "modules/media_file/interface/media_file_defines.h"
#include "system_wrappers/interface/file_wrapper.h" #include "system_wrappers/interface/file_wrapper.h"
#include "system_wrappers/interface/list_wrapper.h"
#include "typedefs.h" #include "typedefs.h"
#include "video_engine/vie_frame_provider_base.h" #include "video_engine/vie_frame_provider_base.h"
@ -124,10 +126,10 @@ class ViEFilePlayer
// Trick - list containing VoE buffer reading this file. Used if multiple // Trick - list containing VoE buffer reading this file. Used if multiple
// audio channels are sending. // audio channels are sending.
ListWrapper audio_channel_buffers_; std::list<void*> audio_channel_buffers_;
// AudioChannels sending audio from this file. // AudioChannels sending audio from this file.
MapWrapper audio_channels_sending_; std::set<int> audio_channels_sending_;
// Frame receiving decoded video from file. // Frame receiving decoded video from file.
VideoFrame decoded_video_; VideoFrame decoded_video_;