cebf50ff75
This is a reland of 5faf36ef3c582350fba5ef97a3549e440d81a283 The issue in Chrome has been fixed and this should be safe to reland. TBR=deadbeef Original change's description: > Implement RtpParameters.transaction_id for PC RtpSenderInterface > > The transaction_id field should be refreshed for every getParameters() > call and checked at each setParameters() call. > This also checks that getParameters() was ever called to return a proper > error code. > > Bug: webrtc:7580 > Change-Id: I6c6fe289542e486fc422cdc61577982b0529d4c1 > Reviewed-on: https://webrtc-review.googlesource.com/70820 > Commit-Queue: Florent Castelli <orphis@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org> > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23120} Bug: webrtc:7580 Change-Id: Iabd41fb21afdf452c039d5513824ae334f8d1d3f Reviewed-on: https://webrtc-review.googlesource.com/76980 Commit-Queue: Florent Castelli <orphis@webrtc.org> Reviewed-by: Florent Castelli <orphis@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23247}
48 lines
1.7 KiB
C++
48 lines
1.7 KiB
C++
/*
|
|
* Copyright 2016 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.
|
|
*/
|
|
|
|
#ifndef PC_TEST_MOCK_RTPSENDERINTERNAL_H_
|
|
#define PC_TEST_MOCK_RTPSENDERINTERNAL_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "pc/rtpsender.h"
|
|
#include "test/gmock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The definition of MockRtpSender is copied in to avoid multiple inheritance.
|
|
class MockRtpSenderInternal : public RtpSenderInternal {
|
|
public:
|
|
// RtpSenderInterface methods.
|
|
MOCK_METHOD1(SetTrack, bool(MediaStreamTrackInterface*));
|
|
MOCK_CONST_METHOD0(track, rtc::scoped_refptr<MediaStreamTrackInterface>());
|
|
MOCK_CONST_METHOD0(ssrc, uint32_t());
|
|
MOCK_CONST_METHOD0(media_type, cricket::MediaType());
|
|
MOCK_CONST_METHOD0(id, std::string());
|
|
MOCK_CONST_METHOD0(stream_ids, std::vector<std::string>());
|
|
MOCK_METHOD0(GetParameters, RtpParameters());
|
|
MOCK_METHOD1(SetParameters, RTCError(const RtpParameters&));
|
|
MOCK_CONST_METHOD0(GetDtmfSender, rtc::scoped_refptr<DtmfSenderInterface>());
|
|
|
|
// RtpSenderInternal methods.
|
|
MOCK_METHOD1(SetVoiceMediaChannel, void(cricket::VoiceMediaChannel*));
|
|
MOCK_METHOD1(SetVideoMediaChannel, void(cricket::VideoMediaChannel*));
|
|
MOCK_METHOD1(SetSsrc, void(uint32_t));
|
|
MOCK_METHOD1(set_stream_ids, void(const std::vector<std::string>&));
|
|
MOCK_METHOD0(Stop, void());
|
|
MOCK_CONST_METHOD0(AttachmentId, int());
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_TEST_MOCK_RTPSENDERINTERNAL_H_
|