webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h - Issue 2203233002: Revert of Add EncodedImageCallback::OnEncodedImage().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

Issue 2203233002: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/video_coding/codecs/test/videoprocessor.cc ('k') | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

index be6aa59b6c6651a67c4193be40ba798a3ef86190..fca16df6fad4bd61b0f17f9b618076c8005308c1 100644

--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

@@ -51,11 +51,10 @@

// Eventual handler for the contained encoders' EncodedImageCallbacks, but

// called from an internal helper that also knows the correct stream

// index.

- EncodedImageCallback::Result OnEncodedImage(

- size_t stream_idx,

- const EncodedImage& encoded_image,

- const CodecSpecificInfo* codec_specific_info,

- const RTPFragmentationHeader* fragmentation);

+ int32_t Encoded(size_t stream_idx,

+ const EncodedImage& encodedImage,

+ const CodecSpecificInfo* codecSpecificInfo = NULL,

+ const RTPFragmentationHeader* fragmentation = NULL);

void OnDroppedFrame() override;