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

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

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

« webrtc/modules/rtp_rtcp/source/rtp_sender.cc ('K') | « webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h ('k') | webrtc/modules/video_coding/codecs/i420/main/interface/i420.h » ('j') | webrtc/modules/video_coding/main/source/generic_encoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fec32261b767635b20f88e4337aa72d66fc31c80..bb9af8a7f2379d37eeedca7c43823153b77c03c1 100644

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

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

@@ -242,7 +242,7 @@ int H264VideoToolboxEncoder::InitEncode(const VideoCodec* codec_settings,

int H264VideoToolboxEncoder::Encode(

const VideoFrame& input_image,

const CodecSpecificInfo* codec_specific_info,

- const std::vector<VideoFrameType>* frame_types) {

+ const std::vector<FrameType>* frame_types) {

if (input_image.IsZeroSize()) {

// It's possible to get zero sizes as a signal to produce keyframes (this

// happens for internal sources). But this shouldn't happen in