Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: webrtc/video/video_stream_decoder.h

Issue 2652043005: Reland of Make the new jitter buffer the default jitter buffer. (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // Implements VCMReceiveCallback. 62 // Implements VCMReceiveCallback.
63 int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT 63 int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT
64 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; 64 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
65 void OnIncomingPayloadType(int payload_type) override; 65 void OnIncomingPayloadType(int payload_type) override;
66 void OnDecoderImplementationName(const char* implementation_name) override; 66 void OnDecoderImplementationName(const char* implementation_name) override;
67 67
68 // Implements VCMReceiveStatisticsCallback. 68 // Implements VCMReceiveStatisticsCallback.
69 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; 69 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
70 void OnDiscardedPacketsUpdated(int discarded_packets) override; 70 void OnDiscardedPacketsUpdated(int discarded_packets) override;
71 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; 71 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
72 void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override;
73 void OnFrameBufferTimingsUpdated(int decode_ms,
74 int max_decode_ms,
75 int current_delay_ms,
76 int target_delay_ms,
77 int jitter_buffer_ms,
78 int min_playout_delay_ms,
79 int render_delay_ms) override;
72 80
73 // Implements VCMDecoderTimingCallback. 81 // Implements VCMDecoderTimingCallback.
74 void OnDecoderTiming(int decode_ms, 82 void OnDecoderTiming(int decode_ms,
75 int max_decode_ms, 83 int max_decode_ms,
76 int current_delay_ms, 84 int current_delay_ms,
77 int target_delay_ms, 85 int target_delay_ms,
78 int jitter_buffer_ms, 86 int jitter_buffer_ms,
79 int min_playout_delay_ms, 87 int min_playout_delay_ms,
80 int render_delay_ms) override; 88 int render_delay_ms) override;
81 89
(...skipping 15 matching lines...) Expand all
97 // TODO(tommi): This callback is basically the same thing as the one above. 105 // TODO(tommi): This callback is basically the same thing as the one above.
98 // We shouldn't need to support both. 106 // We shouldn't need to support both.
99 I420FrameCallback* const pre_render_callback_; 107 I420FrameCallback* const pre_render_callback_;
100 108
101 int64_t last_rtt_ms_ GUARDED_BY(crit_); 109 int64_t last_rtt_ms_ GUARDED_BY(crit_);
102 }; 110 };
103 111
104 } // namespace webrtc 112 } // namespace webrtc
105 113
106 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ 114 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698