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

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

Issue 2089773002: 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 27 matching lines...) Expand all
38 _latestMs = _clock->TimeInMilliseconds(); 38 _latestMs = _clock->TimeInMilliseconds();
39 } 39 }
40 } // namespace vcm 40 } // namespace vcm
41 41
42 namespace { 42 namespace {
43 // This wrapper provides a way to modify the callback without the need to expose 43 // This wrapper provides a way to modify the callback without the need to expose
44 // a register method all the way down to the function calling it. 44 // a register method all the way down to the function calling it.
45 class EncodedImageCallbackWrapper : public EncodedImageCallback { 45 class EncodedImageCallbackWrapper : public EncodedImageCallback {
46 public: 46 public:
47 EncodedImageCallbackWrapper() 47 EncodedImageCallbackWrapper()
48 : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {} 48 : cs_(CriticalSectionWrapper::CreateCriticalSection()),
49 callback_(nullptr) {}
49 50
50 virtual ~EncodedImageCallbackWrapper() {} 51 virtual ~EncodedImageCallbackWrapper() {}
51 52
52 void Register(EncodedImageCallback* callback) { 53 void Register(EncodedImageCallback* callback) {
53 CriticalSectionScoped cs(cs_.get()); 54 CriticalSectionScoped cs(cs_.get());
54 callback_ = callback; 55 callback_ = callback;
55 } 56 }
56 57
57 virtual int32_t Encoded(const EncodedImage& encoded_image, 58 virtual Result OnEncodedImage(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_->OnEncodedImage(encoded_image, codec_specific_info,
63 fragmentation); 64 fragmentation);
64 return 0; 65 }
66 return Result(Result::ERROR_SEND_FAILED);
65 } 67 }
66 68
67 private: 69 private:
68 std::unique_ptr<CriticalSectionWrapper> cs_; 70 std::unique_ptr<CriticalSectionWrapper> cs_;
69 EncodedImageCallback* callback_ GUARDED_BY(cs_); 71 EncodedImageCallback* callback_ GUARDED_BY(cs_);
70 }; 72 };
71 73
72 class VideoCodingModuleImpl : public VideoCodingModule { 74 class VideoCodingModuleImpl : public VideoCodingModule {
73 public: 75 public:
74 VideoCodingModuleImpl(Clock* clock, 76 VideoCodingModuleImpl(Clock* clock,
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 EventFactory* event_factory, 291 EventFactory* event_factory,
290 NackSender* nack_sender, 292 NackSender* nack_sender,
291 KeyFrameRequestSender* keyframe_request_sender) { 293 KeyFrameRequestSender* keyframe_request_sender) {
292 assert(clock); 294 assert(clock);
293 assert(event_factory); 295 assert(event_factory);
294 return new VideoCodingModuleImpl(clock, event_factory, nack_sender, 296 return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
295 keyframe_request_sender, nullptr); 297 keyframe_request_sender, nullptr);
296 } 298 }
297 299
298 } // namespace webrtc 300 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698