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

Side by Side Diff: webrtc/test/configurable_frame_size_encoder.cc

Issue 2479643002: Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp (Closed)
Patch Set: Created 4 years, 1 month 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 | « webrtc/modules/video_coding/video_receiver.cc ('k') | webrtc/test/fake_encoder.cc » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 buffer_.get(), current_frame_size_, max_frame_size_); 45 buffer_.get(), current_frame_size_, max_frame_size_);
46 encodedImage._completeFrame = true; 46 encodedImage._completeFrame = true;
47 encodedImage._encodedHeight = inputImage.height(); 47 encodedImage._encodedHeight = inputImage.height();
48 encodedImage._encodedWidth = inputImage.width(); 48 encodedImage._encodedWidth = inputImage.width();
49 encodedImage._frameType = kVideoFrameKey; 49 encodedImage._frameType = kVideoFrameKey;
50 encodedImage._timeStamp = inputImage.timestamp(); 50 encodedImage._timeStamp = inputImage.timestamp();
51 encodedImage.capture_time_ms_ = inputImage.render_time_ms(); 51 encodedImage.capture_time_ms_ = inputImage.render_time_ms();
52 RTPFragmentationHeader* fragmentation = NULL; 52 RTPFragmentationHeader* fragmentation = NULL;
53 CodecSpecificInfo specific; 53 CodecSpecificInfo specific;
54 memset(&specific, 0, sizeof(specific)); 54 memset(&specific, 0, sizeof(specific));
55 callback_->OnEncodedImage(encodedImage, &specific, fragmentation); 55 callback_->Encoded(encodedImage, &specific, fragmentation);
56 56
57 return WEBRTC_VIDEO_CODEC_OK; 57 return WEBRTC_VIDEO_CODEC_OK;
58 } 58 }
59 59
60 int32_t ConfigurableFrameSizeEncoder::RegisterEncodeCompleteCallback( 60 int32_t ConfigurableFrameSizeEncoder::RegisterEncodeCompleteCallback(
61 EncodedImageCallback* callback) { 61 EncodedImageCallback* callback) {
62 callback_ = callback; 62 callback_ = callback;
63 return WEBRTC_VIDEO_CODEC_OK; 63 return WEBRTC_VIDEO_CODEC_OK;
64 } 64 }
65 65
(...skipping 16 matching lines...) Expand all
82 } 82 }
83 83
84 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) { 84 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
85 assert(size <= max_frame_size_); 85 assert(size <= max_frame_size_);
86 current_frame_size_ = size; 86 current_frame_size_ = size;
87 return WEBRTC_VIDEO_CODEC_OK; 87 return WEBRTC_VIDEO_CODEC_OK;
88 } 88 }
89 89
90 } // namespace test 90 } // namespace test
91 } // namespace webrtc 91 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_receiver.cc ('k') | webrtc/test/fake_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698