Index: webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h |
diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h |
index 938e39e2e69a5d3fcb2a34cf91080a432d2ad7c7..7624f7f45d352f181216f1c8d823cd05e91e68e0 100644 |
--- a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h |
+++ b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h |
@@ -44,10 +44,8 @@ class AcmSendTestOldApi : public AudioPacketizationCallback, |
// Registers an external send codec. Returns true on success, false otherwise. |
bool RegisterExternalCodec(AudioEncoder* external_speech_encoder); |
- // Returns the next encoded packet. Returns NULL if the test duration was |
- // exceeded. Ownership of the packet is handed over to the caller. |
// Inherited from PacketSource. |
- Packet* NextPacket() override; |
+ std::unique_ptr<Packet> NextPacket() override; |
// Inherited from AudioPacketizationCallback. |
int32_t SendData(FrameType frame_type, |
@@ -65,7 +63,7 @@ class AcmSendTestOldApi : public AudioPacketizationCallback, |
// Creates a Packet object from the last packet produced by ACM (and received |
// through the SendData method as a callback). Ownership of the new Packet |
// object is transferred to the caller. |
kwiberg-webrtc
2016/05/24 09:04:56
The last sentence is no longer needed.
hlundin-webrtc
2016/05/24 10:59:15
Done.
|
- Packet* CreatePacket(); |
+ std::unique_ptr<Packet> CreatePacket(); |
SimulatedClock clock_; |
std::unique_ptr<AudioCodingModule> acm_; |