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

Side by Side Diff: webrtc/modules/video_coding/video_coding_impl.cc

Issue 1903193002: Revert of Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 EncodedImageCallbackWrapper() 47 EncodedImageCallbackWrapper()
48 : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {} 48 : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {}
49 49
50 virtual ~EncodedImageCallbackWrapper() {} 50 virtual ~EncodedImageCallbackWrapper() {}
51 51
52 void Register(EncodedImageCallback* callback) { 52 void Register(EncodedImageCallback* callback) {
53 CriticalSectionScoped cs(cs_.get()); 53 CriticalSectionScoped cs(cs_.get());
54 callback_ = callback; 54 callback_ = callback;
55 } 55 }
56 56
57 // TODO(andresp): Change to void as return value is ignored.
57 virtual int32_t Encoded(const EncodedImage& encoded_image, 58 virtual int32_t Encoded(const EncodedImage& encoded_image,
58 const CodecSpecificInfo* codec_specific_info, 59 const CodecSpecificInfo* codec_specific_info,
59 const RTPFragmentationHeader* fragmentation) { 60 const RTPFragmentationHeader* fragmentation) {
60 CriticalSectionScoped cs(cs_.get()); 61 CriticalSectionScoped cs(cs_.get());
61 if (callback_) 62 if (callback_)
62 return callback_->Encoded(encoded_image, codec_specific_info, 63 return callback_->Encoded(encoded_image, codec_specific_info,
63 fragmentation); 64 fragmentation);
64 return 0; 65 return 0;
65 } 66 }
66 67
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 NackSender* nack_sender, 338 NackSender* nack_sender,
338 KeyFrameRequestSender* keyframe_request_sender) { 339 KeyFrameRequestSender* keyframe_request_sender) {
339 assert(clock); 340 assert(clock);
340 assert(event_factory); 341 assert(event_factory);
341 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr, 342 return new VideoCodingModuleImpl(clock, event_factory, false, nullptr,
342 nullptr, nack_sender, 343 nullptr, nack_sender,
343 keyframe_request_sender, nullptr); 344 keyframe_request_sender, nullptr);
344 } 345 }
345 346
346 } // namespace webrtc 347 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_coding_impl.h ('k') | webrtc/modules/video_coding/video_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698