| Index: webrtc/video/video_receive_stream.h
|
| diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
|
| index ab9fe4ea7bb5f6fb23bdcd6cb118c497e2518c75..146d56255ca687d8c7a97c73b6651d90f453cbbb 100644
|
| --- a/webrtc/video/video_receive_stream.h
|
| +++ b/webrtc/video/video_receive_stream.h
|
| @@ -58,6 +58,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
|
| VieRemb* remb);
|
| ~VideoReceiveStream() override;
|
|
|
| + const Config& config() const { return config_; }
|
| +
|
| void SignalNetworkState(NetworkState state);
|
| bool DeliverRtcp(const uint8_t* packet, size_t length);
|
| bool DeliverRtp(const uint8_t* packet,
|
| @@ -66,42 +68,40 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
|
|
|
| bool OnRecoveredPacket(const uint8_t* packet, size_t length);
|
|
|
| - // webrtc::VideoReceiveStream implementation.
|
| + void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
|
| +
|
| + // Implements webrtc::VideoReceiveStream.
|
| void Start() override;
|
| void Stop() override;
|
|
|
| webrtc::VideoReceiveStream::Stats GetStats() const override;
|
|
|
| - // Overrides rtc::VideoSinkInterface<VideoFrame>.
|
| - void OnFrame(const VideoFrame& video_frame) override;
|
| + // Takes ownership of the file, is responsible for closing it later.
|
| + // Calling this method will close and finalize any current log.
|
| + // Giving rtc::kInvalidPlatformFileValue disables logging.
|
| + // If a frame to be written would make the log too large the write fails and
|
| + // the log is closed and finalized. A |byte_limit| of 0 means no limit.
|
| + void EnableEncodedFrameRecording(rtc::PlatformFile file,
|
| + size_t byte_limit) override;
|
|
|
| - // Implements video_coding::OnCompleteFrameCallback.
|
| - void OnCompleteFrame(
|
| - std::unique_ptr<video_coding::FrameObject> frame) override;
|
| + // Implements rtc::VideoSinkInterface<VideoFrame>.
|
| + void OnFrame(const VideoFrame& video_frame) override;
|
|
|
| - // Overrides EncodedImageCallback.
|
| + // Implements EncodedImageCallback.
|
| EncodedImageCallback::Result OnEncodedImage(
|
| const EncodedImage& encoded_image,
|
| const CodecSpecificInfo* codec_specific_info,
|
| const RTPFragmentationHeader* fragmentation) override;
|
|
|
| - const Config& config() const { return config_; }
|
| -
|
| - void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
|
| -
|
| // Implements NackSender.
|
| void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
|
|
|
| // Implements KeyFrameRequestSender.
|
| void RequestKeyFrame() override;
|
|
|
| - // Takes ownership of the file, is responsible for closing it later.
|
| - // Calling this method will close and finalize any current log.
|
| - // Giving rtc::kInvalidPlatformFileValue disables logging.
|
| - // If a frame to be written would make the log too large the write fails and
|
| - // the log is closed and finalized. A |byte_limit| of 0 means no limit.
|
| - void EnableEncodedFrameRecording(rtc::PlatformFile file,
|
| - size_t byte_limit) override;
|
| + // Implements video_coding::OnCompleteFrameCallback.
|
| + void OnCompleteFrame(
|
| + std::unique_ptr<video_coding::FrameObject> frame) override;
|
|
|
| private:
|
| static bool DecodeThreadFunction(void* ptr);
|
|
|