Moved codec-specific audio packet splitting into decoders.

webrtc/modules/audio_coding/neteq/neteq_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
 
 #include <assert.h>
 #include <memory.h>  // memset
 
 #include <algorithm>
+#include <utility>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/sanitizer.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 #include "webrtc/modules/audio_coding/neteq/accelerate.h"
@@ skipping 596 matching lines @@
   if (ret != PayloadSplitter::kOK) {
     PacketBuffer::DeleteAllPackets(&packet_list);
     switch (ret) {
       case PayloadSplitter::kUnknownPayloadType:
         return kUnknownRtpPayloadType;
       default:
         return kOtherError;
     }
   }
 
-  // Split payloads into smaller chunks. This also verifies that all payloads
-  // are of a known payload type.
-  ret = payload_splitter_->SplitAudio(&packet_list, *decoder_database_);
-  if (ret != PayloadSplitter::kOK) {
-    PacketBuffer::DeleteAllPackets(&packet_list);
-    switch (ret) {
-      case PayloadSplitter::kUnknownPayloadType:
-        return kUnknownRtpPayloadType;
-      case PayloadSplitter::kFrameSplitError:
-        return kFrameSplitError;
-      default:
-        return kOtherError;
-    }
-  }
-
   // Update bandwidth estimate, if the packet is not comfort noise.
   if (!packet_list.empty() &&
       !decoder_database_->IsComfortNoise(main_header.payloadType)) {
     // The list can be empty here if we got nothing but DTMF payloads.
     AudioDecoder* decoder =
         decoder_database_->GetDecoder(main_header.payloadType);
     assert(decoder);  // Should always get a valid object, since we have
     // already checked that the payload types are known.
     decoder->IncomingPacket(packet_list.front()->payload.data(),
                             packet_list.front()->payload.size(),
@@ skipping 17 matching lines @@
       // Carry comfort noise packets along.
       parsed_packet_list.push_back(packet.release());
     } else {
       std::vector<AudioDecoder::ParseResult> results =
           info->GetDecoder()->ParsePayload(std::move(packet->payload),
                                            packet->header.timestamp,
                                            packet->primary);
       const RTPHeader& original_header = packet->header;
       for (auto& result : results) {
         RTC_DCHECK(result.frame);
         // Reuse the packet if possible

[kwiberg-webrtc, 2016/09/16 00:48:08]

End comment with "." Or, for a less minimalist tone, 

  // Reuse the packet if possible! :-P

[ossu, 2016/09/16 11:46:00]

Monoton und minimal.

         if (!packet) {
           packet.reset(new Packet);
           packet->header = original_header;
         }

[kwiberg-webrtc, 2016/09/16 00:48:08]

Again, should packet->payload (moved from on line 665) be cleared?

[ossu, 2016/09/16 11:46:00]

I think it's probably best if it's not: once moved from, payload should not be
touched. Since we have checks in place for that in Buffer (at least in debug
builds), I think it's preferable if they fire when we mess up.

[kwiberg-webrtc, 2016/09/16 12:07:39]

Acknowledged.

         packet->header.timestamp = result.timestamp;
         // TODO(ossu): Move from primary to some sort of priority level.
         packet->primary = result.primary;
         packet->frame = std::move(result.frame);
         parsed_packet_list.push_back(packet.release());
       }
     }
   }
 
   if (nack_enabled_) {
@@ skipping 1398 matching lines @@
   }
 }
 
 void NetEqImpl::CreateDecisionLogic() {
   decision_logic_.reset(DecisionLogic::Create(
       fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(),
       *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(),
       tick_timer_.get()));
 }
 }  // namespace webrtc