From 4babc68eee3186abba58dc7896c9152fbc2834d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 26 Apr 2019 15:46:12 +0200 Subject: [PATCH] Delete deprecated version of AudioPacketizationCallback::SendData. Followup to https://webrtc-review.googlesource.com/c/src/+/134212 Bug: webrtc:6471 Change-Id: I5f2be134bddf8aada2b9c94b6d986c26a6fd23ad Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134309 Reviewed-by: Oskar Sundbom Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#27797} --- .../include/audio_coding_module.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/audio_coding/include/audio_coding_module.h b/modules/audio_coding/include/audio_coding_module.h index 17ad71d53a..61fa54130b 100644 --- a/modules/audio_coding/include/audio_coding_module.h +++ b/modules/audio_coding/include/audio_coding_module.h @@ -30,7 +30,6 @@ namespace webrtc { class AudioDecoder; class AudioEncoder; class AudioFrame; -class RTPFragmentationHeader; struct RTPHeader; #define WEBRTC_10MS_PCM_AUDIO 960 // 16 bits super wideband 48 kHz @@ -44,23 +43,7 @@ class AudioPacketizationCallback { uint8_t payload_type, uint32_t timestamp, const uint8_t* payload_data, - size_t payload_len_bytes) { - return SendData(frame_type, payload_type, timestamp, payload_data, - payload_len_bytes, nullptr); - } - - // TODO(bugs.webrtc.org/6471) Deprecated, delete as soon as downstream - // implementations are updated. Then make above method pure virtual, and - // delete forward declaration of RTPFragmentationHeader. - virtual int32_t SendData(AudioFrameType frame_type, - uint8_t payload_type, - uint32_t timestamp, - const uint8_t* payload_data, - size_t payload_len_bytes, - const RTPFragmentationHeader* fragmentation) { - return SendData(frame_type, payload_type, timestamp, payload_data, - payload_len_bytes); - } + size_t payload_len_bytes) = 0; }; // Callback class used for reporting VAD decision