Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 578 assert(layer_id.spatial_layer_id == 0); | 578 assert(layer_id.spatial_layer_id == 0); |
| 579 vp9_info->spatial_idx = kNoSpatialIdx; | 579 vp9_info->spatial_idx = kNoSpatialIdx; |
| 580 } else { | 580 } else { |
| 581 vp9_info->spatial_idx = layer_id.spatial_layer_id; | 581 vp9_info->spatial_idx = layer_id.spatial_layer_id; |
| 582 } | 582 } |
| 583 if (layer_id.spatial_layer_id != 0) { | 583 if (layer_id.spatial_layer_id != 0) { |
| 584 vp9_info->ss_data_available = false; | 584 vp9_info->ss_data_available = false; |
| 585 } | 585 } |
| 586 | 586 |
| 587 // TODO(asapersson): this info has to be obtained from the encoder. | 587 // TODO(asapersson): this info has to be obtained from the encoder. |
| 588 vp9_info->temporal_up_switch = true; | 588 vp9_info->temporal_up_switch = false; |
|
stefan-webrtc
2015/11/17 23:49:04
I assume it's still a todo to set this properly?
åsapersson
2015/11/18 09:52:02
Right leaving the todo.
| |
| 589 | 589 |
| 590 bool is_first_frame = false; | 590 bool is_first_frame = false; |
| 591 if (is_flexible_mode_) { | 591 if (is_flexible_mode_) { |
| 592 is_first_frame = | 592 is_first_frame = |
| 593 layer_id.spatial_layer_id == spatial_layer_->GetStartLayer(); | 593 layer_id.spatial_layer_id == spatial_layer_->GetStartLayer(); |
| 594 } else { | 594 } else { |
| 595 is_first_frame = layer_id.spatial_layer_id == 0; | 595 is_first_frame = layer_id.spatial_layer_id == 0; |
| 596 } | 596 } |
| 597 | 597 |
| 598 if (is_first_frame) { | 598 if (is_first_frame) { |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 978 decoder_ = NULL; | 978 decoder_ = NULL; |
| 979 } | 979 } |
| 980 // Releases buffers from the pool. Any buffers not in use are deleted. Buffers | 980 // Releases buffers from the pool. Any buffers not in use are deleted. Buffers |
| 981 // still referenced externally are deleted once fully released, not returning | 981 // still referenced externally are deleted once fully released, not returning |
| 982 // to the pool. | 982 // to the pool. |
| 983 frame_buffer_pool_.ClearPool(); | 983 frame_buffer_pool_.ClearPool(); |
| 984 inited_ = false; | 984 inited_ = false; |
| 985 return WEBRTC_VIDEO_CODEC_OK; | 985 return WEBRTC_VIDEO_CODEC_OK; |
| 986 } | 986 } |
| 987 } // namespace webrtc | 987 } // namespace webrtc |
| OLD | NEW |