zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Send absolute capture time through audio coding module."

Browse Source 
This reverts commit 48655cfdbfd99e0b6331e59201bcb8514f8b2a0a.

Reason for revert: failing upstream tests

Original change's description:
> Send absolute capture time through audio coding module.
> 
> Bug: webrtc:10739
> Change-Id: I44e0305be7c84b253172511c2977b1d700e40c1b
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167067
> Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Chen Xing <chxg@google.com>
> Commit-Queue: Minyue Li <minyue@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30363}

TBR=danilchap@webrtc.org,ossu@webrtc.org,minyue@webrtc.org,chxg@google.com

Change-Id: Ia36b9ae899563c9afd8612ffd83871b8a5778a2b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10739
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167212
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30364}
This commit is contained in:
Minyue Li
2020-01-23 16:20:52 +00:00
committed by Commit Bot
parent 48655cfdbf
commit 4175914f41
17 changed files with 30 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/audio_coding/test/Channel.cc
View File

@ -23,8 +23,7 @@ int32_t Channel::SendData(AudioFrameType frameType,
uint8_t payloadType,
uint32_t timeStamp,
const uint8_t* payloadData,
size_t payloadSize,
int64_t absolute_capture_timestamp_ms) {
size_t payloadSize) {
RTPHeader rtp_header;
int32_t status;
size_t payloadDataSize = payloadSize;

3
modules/audio_coding/test/Channel.h
View File

@ -51,8 +51,7 @@ class Channel : public AudioPacketizationCallback {
uint8_t payloadType,
uint32_t timeStamp,
const uint8_t* payloadData,
size_t payloadSize,
int64_t absolute_capture_timestamp_ms) override;
size_t payloadSize) override;
void RegisterReceiverACM(AudioCodingModule* acm);

3
modules/audio_coding/test/EncodeDecodeTest.cc
View File

@ -33,8 +33,7 @@ int32_t TestPacketization::SendData(const AudioFrameType /* frameType */,
const uint8_t payloadType,
const uint32_t timeStamp,
const uint8_t* payloadData,
const size_t payloadSize,
int64_t absolute_capture_timestamp_ms) {
const size_t payloadSize) {
_rtpStream->Write(payloadType, timeStamp, _seqNo++, payloadData, payloadSize,
_frequency);
return 1;

3
modules/audio_coding/test/EncodeDecodeTest.h
View File

@ -32,8 +32,7 @@ class TestPacketization : public AudioPacketizationCallback {
const uint8_t payloadType,
const uint32_t timeStamp,
const uint8_t* payloadData,
const size_t payloadSize,
int64_t absolute_capture_timestamp_ms) override;
const size_t payloadSize) override;
private:
static void MakeRTPheader(uint8_t* rtpHeader,

3
modules/audio_coding/test/TestAllCodecs.cc
View File

@ -64,8 +64,7 @@ int32_t TestPack::SendData(AudioFrameType frame_type,
uint8_t payload_type,
uint32_t timestamp,
const uint8_t* payload_data,
size_t payload_size,
int64_t absolute_capture_timestamp_ms) {
size_t payload_size) {
RTPHeader rtp_header;
int32_t status;

3
modules/audio_coding/test/TestAllCodecs.h
View File

@ -29,8 +29,7 @@ class TestPack : public AudioPacketizationCallback {
uint8_t payload_type,
uint32_t timestamp,
const uint8_t* payload_data,
size_t payload_size,
int64_t absolute_capture_timestamp_ms) override;
size_t payload_size) override;
size_t payload_size();
uint32_t timestamp_diff();

3
modules/audio_coding/test/TestStereo.cc
View File

@ -44,8 +44,7 @@ int32_t TestPackStereo::SendData(const AudioFrameType frame_type,
const uint8_t payload_type,
const uint32_t timestamp,
const uint8_t* payload_data,
const size_t payload_size,
int64_t absolute_capture_timestamp_ms) {
const size_t payload_size) {
RTPHeader rtp_header;
int32_t status = 0;

3
modules/audio_coding/test/TestStereo.h
View File

@ -35,8 +35,7 @@ class TestPackStereo : public AudioPacketizationCallback {
const uint8_t payload_type,
const uint32_t timestamp,
const uint8_t* payload_data,
const size_t payload_size,
int64_t absolute_capture_timestamp_ms) override;
const size_t payload_size) override;
uint16_t payload_size();
uint32_t timestamp_diff();

2
modules/audio_coding/test/opus_test.cc
View File

@ -337,7 +337,7 @@ void OpusTest::Run(TestPackStereo* channel,
// Send data to the channel. "channel" will handle the loss simulation.
channel->SendData(AudioFrameType::kAudioFrameSpeech, payload_type_,
rtp_timestamp_, bitstream, bitstream_len_byte, 0);
rtp_timestamp_, bitstream, bitstream_len_byte);
if (first_packet) {
first_packet = false;
start_time_stamp = rtp_timestamp_;