diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 23:58:38 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 23:58:38 +0000 |
| commit | 8731c62812c4b2eda8fcd4847218098e24a9418d (patch) | |
| tree | 27bb116a2e98497fb6ef020bc8870451bca83824 /remoting | |
| parent | 9300f81845cc5d3bb2b5fe6c6b8797d6c733d4f5 (diff) | |
| download | chromium_src-8731c62812c4b2eda8fcd4847218098e24a9418d.zip chromium_src-8731c62812c4b2eda8fcd4847218098e24a9418d.tar.gz chromium_src-8731c62812c4b2eda8fcd4847218098e24a9418d.tar.bz2 | |
Fix VideoScheduler to set client_sequence_number in video packets.
Not setting client_sequence_number breaks latency calculation. Previously
the scheduler was setting sequence_number filed instead.
BUG=247863
Review URL: https://chromiumcodereview.appspot.com/15994021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/video_scheduler.cc | 8 | ||||
| -rw-r--r-- | remoting/host/video_scheduler.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc index f051363b..d16042b 100644 --- a/remoting/host/video_scheduler.cc +++ b/remoting/host/video_scheduler.cc @@ -280,14 +280,14 @@ void VideoScheduler::SendCursorShape( void VideoScheduler::EncodeFrame( scoped_ptr<webrtc::DesktopFrame> frame, - int sequence_number) { + int64 sequence_number) { DCHECK(encode_task_runner_->BelongsToCurrentThread()); // If there is nothing to encode then send an empty keep-alive packet. if (!frame || frame->updated_region().is_empty()) { scoped_ptr<VideoPacket> packet(new VideoPacket()); packet->set_flags(VideoPacket::LAST_PARTITION); - packet->set_sequence_number(sequence_number); + packet->set_client_sequence_number(sequence_number); network_task_runner_->PostTask( FROM_HERE, base::Bind(&VideoScheduler::SendVideoPacket, this, base::Passed(&packet))); @@ -302,11 +302,11 @@ void VideoScheduler::EncodeFrame( } void VideoScheduler::EncodedDataAvailableCallback( - int sequence_number, + int64 sequence_number, scoped_ptr<VideoPacket> packet) { DCHECK(encode_task_runner_->BelongsToCurrentThread()); - packet->set_sequence_number(sequence_number); + packet->set_client_sequence_number(sequence_number); bool last = (packet->flags() & VideoPacket::LAST_PACKET) != 0; if (last) { diff --git a/remoting/host/video_scheduler.h b/remoting/host/video_scheduler.h index aecc207..21512fb 100644 --- a/remoting/host/video_scheduler.h +++ b/remoting/host/video_scheduler.h @@ -150,9 +150,9 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>, // Encode a frame, passing generated VideoPackets to SendVideoPacket(). void EncodeFrame(scoped_ptr<webrtc::DesktopFrame> frame, - int sequence_number); + int64 sequence_number); - void EncodedDataAvailableCallback(int sequence_number, + void EncodedDataAvailableCallback(int64 sequence_number, scoped_ptr<VideoPacket> packet); // Task runners used by this class. |