webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.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/h264/h264_video_toolbox_encoder.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

index 28cd63ed29ab762700e6268f1d35a6f9b452c4f3..f4fb86fa0470e58791a133b577ca8934748338e7 100644

--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

@@ -38,7 +38,7 @@ class H264VideoToolboxEncoder : public H264Encoder {

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;