Index: webrtc/modules/audio_coding/neteq/decision_logic_normal.cc |
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc |
index 37a75d7f5ad61714d9aa9c1a4708c7608f1cd983..59ba49dd84d991588f3fac19c10f42fd58c11385 100644 |
--- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc |
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc |
@@ -28,7 +28,7 @@ Operations DecisionLogicNormal::GetDecisionSpecialized( |
const SyncBuffer& sync_buffer, |
const Expand& expand, |
size_t decoder_frame_length, |
- const RTPHeader* packet_header, |
+ const Packet* next_packet, |
Modes prev_mode, |
bool play_dtmf, |
bool* reset_decoder, |
@@ -36,7 +36,7 @@ Operations DecisionLogicNormal::GetDecisionSpecialized( |
assert(playout_mode_ == kPlayoutOn || playout_mode_ == kPlayoutStreaming); |
// Guard for errors, to avoid getting stuck in error mode. |
if (prev_mode == kModeError) { |
- if (!packet_header) { |
+ if (!next_packet) { |
return kExpand; |
} else { |
return kUndefined; // Use kUndefined to flag for a reset. |
@@ -46,10 +46,9 @@ Operations DecisionLogicNormal::GetDecisionSpecialized( |
uint32_t target_timestamp = sync_buffer.end_timestamp(); |
uint32_t available_timestamp = 0; |
bool is_cng_packet = false; |
- if (packet_header) { |
- available_timestamp = packet_header->timestamp; |
- is_cng_packet = |
- decoder_database_->IsComfortNoise(packet_header->payloadType); |
+ if (next_packet) { |
+ available_timestamp = next_packet->timestamp; |
+ is_cng_packet = decoder_database_->IsComfortNoise(next_packet->payloadType); |
} |
if (is_cng_packet) { |
@@ -58,7 +57,7 @@ Operations DecisionLogicNormal::GetDecisionSpecialized( |
} |
// Handle the case with no packet at all available (except maybe DTMF). |
- if (!packet_header) { |
+ if (!next_packet) { |
return NoPacket(play_dtmf); |
} |