Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: webrtc/modules/audio_coding/neteq/decision_logic_normal.cc

Issue 2411183003: Removed RTPHeader from NetEq's Packet struct. (Closed)
Patch Set: Fixed naming of payloadType and sequenceNumber. Updated comments. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4c23fdb780ca52e2efd928fb35e76a0a4af43585 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,10 @@ 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;
+ if (next_packet) {
+ available_timestamp = next_packet->timestamp;
is_cng_packet =
- decoder_database_->IsComfortNoise(packet_header->payloadType);
+ decoder_database_->IsComfortNoise(next_packet->payload_type);
}
if (is_cng_packet) {
@@ -58,7 +58,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);
}

Powered by Google App Engine
This is Rietveld 408576698