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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

Issue 2493893003: Turn off error resilience for vp8 for no temporal layers if nack is enabled. (Closed)
Patch Set: address comments Created 4 years 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 | « no previous file | webrtc/modules/video_coding/include/video_codec_initializer.h » ('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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 return WEBRTC_VIDEO_CODEC_ERROR; 394 return WEBRTC_VIDEO_CODEC_ERROR;
395 } 395 }
396 // setting the time base of the codec 396 // setting the time base of the codec
397 configurations_[0].g_timebase.num = 1; 397 configurations_[0].g_timebase.num = 1;
398 configurations_[0].g_timebase.den = 90000; 398 configurations_[0].g_timebase.den = 90000;
399 configurations_[0].g_lag_in_frames = 0; // 0- no frame lagging 399 configurations_[0].g_lag_in_frames = 0; // 0- no frame lagging
400 400
401 // Set the error resilience mode according to user settings. 401 // Set the error resilience mode according to user settings.
402 switch (inst->VP8().resilience) { 402 switch (inst->VP8().resilience) {
403 case kResilienceOff: 403 case kResilienceOff:
404 // TODO(marpan): We should set keep error resilience off for this mode, 404 configurations_[0].g_error_resilient = 0;
405 // independent of temporal layer settings, and make sure we set
406 // |codecSpecific.VP8.resilience| = |kResilientStream| at higher level
407 // code if we want to get error resilience on.
408 configurations_[0].g_error_resilient = 1;
409 break; 405 break;
410 case kResilientStream: 406 case kResilientStream:
411 configurations_[0].g_error_resilient = 1; // TODO(holmer): Replace with 407 configurations_[0].g_error_resilient = 1; // TODO(holmer): Replace with
412 // VPX_ERROR_RESILIENT_DEFAULT when we 408 // VPX_ERROR_RESILIENT_DEFAULT when we
413 // drop support for libvpx 9.6.0. 409 // drop support for libvpx 9.6.0.
414 break; 410 break;
415 case kResilientFrames: 411 case kResilientFrames:
416 return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported 412 return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported
417 } 413 }
418 414
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 return -1; 1308 return -1;
1313 } 1309 }
1314 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) != 1310 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) !=
1315 VPX_CODEC_OK) { 1311 VPX_CODEC_OK) {
1316 return -1; 1312 return -1;
1317 } 1313 }
1318 return 0; 1314 return 0;
1319 } 1315 }
1320 1316
1321 } // namespace webrtc 1317 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/include/video_codec_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698