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

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

Issue 2411183003: Removed RTPHeader from NetEq's Packet struct. (Closed)
Patch Set: 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_fax.cc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
index aace402a7de91e26555f83c1ed24e8181d4120a4..917a141422e65c8a33e3d01d0933ad455aea418a 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc
@@ -23,7 +23,7 @@ Operations DecisionLogicFax::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,
@@ -32,10 +32,9 @@ Operations DecisionLogicFax::GetDecisionSpecialized(
uint32_t target_timestamp = sync_buffer.end_timestamp();
uint32_t available_timestamp = 0;
int is_cng_packet = 0;
- 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) {
if (static_cast<int32_t>((generated_noise_samples + target_timestamp)
@@ -47,7 +46,7 @@ Operations DecisionLogicFax::GetDecisionSpecialized(
return kRfc3389CngNoPacket;
}
}
- if (!packet_header) {
+ if (!next_packet) {
// No packet. If in CNG mode, play as usual. Otherwise, use other method to
// generate data.
if (cng_state_ == kCngRfc3389On) {

Powered by Google App Engine
This is Rietveld 408576698