OLD | NEW |
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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
414 return WEBRTC_VIDEO_CODEC_ERROR; | 414 return WEBRTC_VIDEO_CODEC_ERROR; |
415 } | 415 } |
416 // setting the time base of the codec | 416 // setting the time base of the codec |
417 configurations_[0].g_timebase.num = 1; | 417 configurations_[0].g_timebase.num = 1; |
418 configurations_[0].g_timebase.den = 90000; | 418 configurations_[0].g_timebase.den = 90000; |
419 configurations_[0].g_lag_in_frames = 0; // 0- no frame lagging | 419 configurations_[0].g_lag_in_frames = 0; // 0- no frame lagging |
420 | 420 |
421 // Set the error resilience mode according to user settings. | 421 // Set the error resilience mode according to user settings. |
422 switch (inst->VP8().resilience) { | 422 switch (inst->VP8().resilience) { |
423 case kResilienceOff: | 423 case kResilienceOff: |
424 // TODO(marpan): We should set keep error resilience off for this mode, | 424 configurations_[0].g_error_resilient = 0; |
425 // independent of temporal layer settings, and make sure we set | |
426 // |codecSpecific.VP8.resilience| = |kResilientStream| at higher level | |
427 // code if we want to get error resilience on. | |
428 configurations_[0].g_error_resilient = 1; | |
429 break; | 425 break; |
430 case kResilientStream: | 426 case kResilientStream: |
431 configurations_[0].g_error_resilient = 1; // TODO(holmer): Replace with | 427 configurations_[0].g_error_resilient = 1; // TODO(holmer): Replace with |
432 // VPX_ERROR_RESILIENT_DEFAULT when we | 428 // VPX_ERROR_RESILIENT_DEFAULT when we |
433 // drop support for libvpx 9.6.0. | 429 // drop support for libvpx 9.6.0. |
434 break; | 430 break; |
435 case kResilientFrames: | 431 case kResilientFrames: |
436 return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported | 432 return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported |
437 } | 433 } |
438 | 434 |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1326 return -1; | 1322 return -1; |
1327 } | 1323 } |
1328 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) != | 1324 if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) != |
1329 VPX_CODEC_OK) { | 1325 VPX_CODEC_OK) { |
1330 return -1; | 1326 return -1; |
1331 } | 1327 } |
1332 return 0; | 1328 return 0; |
1333 } | 1329 } |
1334 | 1330 |
1335 } // namespace webrtc | 1331 } // namespace webrtc |
OLD | NEW |