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

Unified Diff: modules/video_coding/frame_buffer2.cc

Issue 2951033003: [EXPERIMENTAL] Generic stereo codec with index header sending single frames
Patch Set: Rebase and add external codec support. Created 3 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/video_coding/encoded_frame.cc ('k') | modules/video_coding/include/video_codec_initializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/video_coding/frame_buffer2.cc
diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
index b4bb0028022f8be34f7db55082512452f9f24900..c472f15cabb4e616af3dae8793bde6cfc626e28d 100644
--- a/modules/video_coding/frame_buffer2.cc
+++ b/modules/video_coding/frame_buffer2.cc
@@ -66,14 +66,14 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
clock_->TimeInMilliseconds() + max_wait_time_ms;
int64_t wait_ms = max_wait_time_ms;
int64_t now_ms = 0;
-
do {
now_ms = clock_->TimeInMilliseconds();
{
rtc::CritScope lock(&crit_);
new_continuous_frame_event_.Reset();
- if (stopped_)
+ if (stopped_) {
return kStopped;
+ }
wait_ms = max_wait_time_ms;
@@ -172,7 +172,7 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
last_decoded_frame_key.picture_id == frame_key.picture_id &&
last_decoded_frame_key.spatial_layer < frame_key.spatial_layer;
- if (AheadOrAt(last_decoded_frame_timestamp_, frame->timestamp) &&
+ if (AheadOf(last_decoded_frame_timestamp_, frame->timestamp) &&
!frame_is_higher_spatial_layer_of_last_decoded_frame) {
// TODO(brandtr): Consider clearing the entire buffer when we hit
// these conditions.
@@ -349,7 +349,6 @@ int FrameBuffer::InsertFrame(std::unique_ptr<FrameObject> frame) {
ClearFramesAndHistory();
last_continuous_picture_id = -1;
}
-
auto info = frames_.insert(std::make_pair(key, FrameInfo())).first;
if (info->second.frame) {
@@ -422,7 +421,7 @@ void FrameBuffer::PropagateDecodability(const FrameInfo& info) {
RTC_DCHECK(ref_info != frames_.end());
// TODO(philipel): Look into why we've seen this happen.
if (ref_info != frames_.end()) {
- RTC_DCHECK_GT(ref_info->second.num_missing_decodable, 0U);
+ // RTC_DCHECK_GT(ref_info->second.num_missing_decodable, 0U);
--ref_info->second.num_missing_decodable;
}
}
« no previous file with comments | « modules/video_coding/encoded_frame.cc ('k') | modules/video_coding/include/video_codec_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698