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

Removing a TODO in the FEC: renaming the exisiting packets mask to indicate random mode,

Browse Source 
and refactored and renamed corresponding table file.
Review URL: https://webrtc-codereview.appspot.com/632007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2372 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org 2012-06-06 22:34:38 +00:00
parent cac603f390
commit 5f97232cac
5 changed files with 24534 additions and 25754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25741
src/modules/rtp_rtcp/source/fec_private_tables.h
View File

File diff suppressed because it is too large Load Diff

24523
src/modules/rtp_rtcp/source/fec_private_tables_random.h Normal file
View File

File diff suppressed because it is too large Load Diff

10
src/modules/rtp_rtcp/source/forward_error_correction.h
View File

@ -21,11 +21,11 @@
namespace webrtc {
// Types for the FEC packet masks.
// The type |kFecMaskRandom| selects the mask defined in fec_private_tables.h,
// and is based on a random loss model. The type |kFecMaskBursty| selects the
// mask defined in fec_private_tables_bursty.h, and is based on a bursty loss
// model. Please refer to those files for a more detailed description.
// Types for the FEC packet masks. The type |kFecMaskRandom| selects the mask
// defined in fec_private_tables_random.h, and is based on a random loss model.
// The type |kFecMaskBursty| selects the mask defined in
// fec_private_tables_bursty.h, and is based on a bursty loss model. Please
// refer to those files for a more detailed description.
enum FecMaskType {
kFecMaskRandom,
kFecMaskBursty,

12
src/modules/rtp_rtcp/source/forward_error_correction_internal.cc
View File

@ -13,7 +13,7 @@
#include <cassert>
#include <cstring>
#include "modules/rtp_rtcp/source/fec_private_tables.h"
#include "modules/rtp_rtcp/source/fec_private_tables_random.h"
#include "modules/rtp_rtcp/source/fec_private_tables_bursty.h"
namespace {
@ -169,12 +169,10 @@ PacketMaskTable::PacketMaskTable(FecMaskType fec_mask_type,
FecMaskType PacketMaskTable::InitMaskType(FecMaskType fec_mask_type,
int num_media_packets) {
// The mask should not be bigger than |packetMaskTbl|.
assert(num_media_packets <= static_cast<int>(sizeof(packetMaskTbl) /
sizeof(*packetMaskTbl)));
assert(num_media_packets <= static_cast<int>(sizeof(kPacketMaskRandomTbl) /
sizeof(*kPacketMaskRandomTbl)));
switch (fec_mask_type) {
case kFecMaskRandom: {
// TODO(marpan): in separate CL rename the fec_private_tables.h file and
// its packet masks to indicate "random" loss case.
return kFecMaskRandom;
}
case kFecMaskBursty: {
@ -196,14 +194,14 @@ FecMaskType PacketMaskTable::InitMaskType(FecMaskType fec_mask_type,
const uint8_t*** PacketMaskTable::InitMaskTable(FecMaskType fec_mask_type) {
switch (fec_mask_type) {
case kFecMaskRandom: {
return packetMaskTbl;
return kPacketMaskRandomTbl;
}
case kFecMaskBursty: {
return kPacketMaskBurstyTbl;
}
}
assert(false);
return packetMaskTbl;
return kPacketMaskRandomTbl;
}
// Remaining protection after important (first partition) packet protection

2
src/modules/rtp_rtcp/source/rtp_rtcp.gypi
View File

@ -62,7 +62,7 @@
'rtp_sender_audio.h',
# Video Files
'bwe_defines.h',
'fec_private_tables.h',
'fec_private_tables_random.h',
'fec_private_tables_bursty.h',
'forward_error_correction.cc',
'forward_error_correction.h',