webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h - Issue 1371043003: Unify FrameType and VideoFrameType.

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 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 2 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:

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 c00d8fb80a07da071532681cc3932105763fe7b2..afec024abc4db8904fa500a0f4c75604dd3bca56 100644

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

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

@@ -42,7 +42,7 @@ class SimulcastEncoderAdapter : public VP8Encoder {

size_t max_payload_size) override;

int Encode(const VideoFrame& input_image,

const CodecSpecificInfo* codec_specific_info,

- const std::vector<VideoFrameType>* frame_types) override;

+ const std::vector<FrameType>* frame_types) override;

int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;

int SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;

int SetRates(uint32_t new_bitrate_kbit, uint32_t new_framerate) override;