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

Remove traces of deprecated WebRtc_Word types.

Browse Source 
BUG=314
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1385004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3933 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-05-02 09:11:20 +00:00
parent 3c48f31e5b
commit 265a5d298a
7 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_coding/main/test/receiver_tests.h
View File

@ -26,9 +26,9 @@ class RtpDataCallback : public webrtc::RtpData {
RtpDataCallback(webrtc::VideoCodingModule* vcm) : vcm_(vcm) {}
virtual ~RtpDataCallback() {}
virtual WebRtc_Word32 OnReceivedPayloadData(
const WebRtc_UWord8* payload_data,
const WebRtc_UWord16 payload_size,
virtual int32_t OnReceivedPayloadData(
const uint8_t* payload_data,
const uint16_t payload_size,
const webrtc::WebRtcRTPHeader* rtp_header) {
return vcm_->IncomingPacket(payload_data, payload_size, *rtp_header);
}

2
webrtc/modules/video_coding/main/test/test_util.cc
View File

@ -111,7 +111,7 @@ FileOutputFrameReceiver::~FileOutputFrameReceiver() {
}
}
WebRtc_Word32 FileOutputFrameReceiver::FrameToRender(
int32_t FileOutputFrameReceiver::FrameToRender(
webrtc::I420VideoFrame& video_frame) {
if (timing_file_ == NULL) {
std::string basename;

2
webrtc/modules/video_coding/main/test/test_util.h
View File

@ -87,7 +87,7 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
virtual ~FileOutputFrameReceiver();
// VCMReceiveCallback
virtual WebRtc_Word32 FrameToRender(webrtc::I420VideoFrame& video_frame);
virtual int32_t FrameToRender(webrtc::I420VideoFrame& video_frame);
private:
std::string out_filename_;

11
webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
View File

@ -60,21 +60,22 @@ class VcmPayloadSinkFactory::VcmPayloadSink
}
// PayloadSinkInterface
virtual WebRtc_Word32 OnReceivedPayloadData(const WebRtc_UWord8* payload_data,
const WebRtc_UWord16 payload_size,
virtual int32_t OnReceivedPayloadData(
const uint8_t* payload_data,
const uint16_t payload_size,
const WebRtcRTPHeader* rtp_header) {
return vcm_->IncomingPacket(payload_data, payload_size, *rtp_header);
}
// VCMPacketRequestCallback
virtual WebRtc_Word32 ResendPackets(const WebRtc_UWord16* sequence_numbers,
WebRtc_UWord16 length) {
virtual int32_t ResendPackets(const uint16_t* sequence_numbers,
uint16_t length) {
stream_->ResendPackets(sequence_numbers, length);
return 0;
}
// VCMFrameStorageCallback
virtual WebRtc_Word32 StoreReceivedFrame(
virtual int32_t StoreReceivedFrame(
const EncodedVideoData& frame_to_store) {
vcm_playback_->DecodeFromStorage(frame_to_store);
return VCM_OK;