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

Side by Side Diff: webrtc/modules/video_coding/codecs/test/videoprocessor.cc

Issue 2206743002: Revert of Add EncodedImageCallback::OnEncodedImage(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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
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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 return "ULPFEC"; 403 return "ULPFEC";
404 case kVideoCodecUnknown: 404 case kVideoCodecUnknown:
405 return "Unknown"; 405 return "Unknown";
406 default: 406 default:
407 assert(false); 407 assert(false);
408 return "Unknown"; 408 return "Unknown";
409 } 409 }
410 } 410 }
411 411
412 // Callbacks 412 // Callbacks
413 EncodedImageCallback::Result 413 int32_t VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::Encoded(
414 VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::OnEncodedImage(
415 const EncodedImage& encoded_image, 414 const EncodedImage& encoded_image,
416 const webrtc::CodecSpecificInfo* codec_specific_info, 415 const webrtc::CodecSpecificInfo* codec_specific_info,
417 const webrtc::RTPFragmentationHeader* fragmentation) { 416 const webrtc::RTPFragmentationHeader* fragmentation) {
418 // Forward to parent class. 417 // Forward to parent class.
419 RTC_CHECK(codec_specific_info); 418 RTC_CHECK(codec_specific_info);
420 video_processor_->FrameEncoded(codec_specific_info->codecType, 419 video_processor_->FrameEncoded(codec_specific_info->codecType,
421 encoded_image, 420 encoded_image,
422 fragmentation); 421 fragmentation);
423 return Result(Result::OK, 0); 422 return 0;
424 } 423 }
425 int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded( 424 int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded(
426 VideoFrame& image) { 425 VideoFrame& image) {
427 // Forward to parent class. 426 // Forward to parent class.
428 video_processor_->FrameDecoded(image); 427 video_processor_->FrameDecoded(image);
429 return 0; 428 return 0;
430 } 429 }
431 430
432 } // namespace test 431 } // namespace test
433 } // namespace webrtc 432 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698