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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Re-enable H264 in video_loopback and screenshare_loopback after rebase (video_quality_test) 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 unified diff | Download patch
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | webrtc/build/common.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 // the first frame to know that you gave a bad codec parameter could make 314 // the first frame to know that you gave a bad codec parameter could make
315 // debugging hard). 315 // debugging hard).
316 // TODO(pbos): Consider setting up encoders lazily. 316 // TODO(pbos): Consider setting up encoders lazily.
317 Dimensions() : width(176), height(144), is_screencast(false) {} 317 Dimensions() : width(176), height(144), is_screencast(false) {}
318 int width; 318 int width;
319 int height; 319 int height;
320 bool is_screencast; 320 bool is_screencast;
321 }; 321 };
322 322
323 union VideoEncoderSettings { 323 union VideoEncoderSettings {
324 webrtc::VideoCodecH264 h264;
324 webrtc::VideoCodecVP8 vp8; 325 webrtc::VideoCodecVP8 vp8;
325 webrtc::VideoCodecVP9 vp9; 326 webrtc::VideoCodecVP9 vp9;
326 }; 327 };
327 328
328 static std::vector<webrtc::VideoStream> CreateVideoStreams( 329 static std::vector<webrtc::VideoStream> CreateVideoStreams(
329 const VideoCodec& codec, 330 const VideoCodec& codec,
330 const VideoOptions& options, 331 const VideoOptions& options,
331 int max_bitrate_bps, 332 int max_bitrate_bps,
332 size_t num_streams); 333 size_t num_streams);
333 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams( 334 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams(
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 WebRtcVideoDecoderFactory* const external_decoder_factory_; 517 WebRtcVideoDecoderFactory* const external_decoder_factory_;
517 std::vector<VideoCodecSettings> recv_codecs_; 518 std::vector<VideoCodecSettings> recv_codecs_;
518 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 519 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
519 webrtc::Call::Config::BitrateConfig bitrate_config_; 520 webrtc::Call::Config::BitrateConfig bitrate_config_;
520 VideoOptions options_; 521 VideoOptions options_;
521 }; 522 };
522 523
523 } // namespace cricket 524 } // namespace cricket
524 525
525 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 526 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | webrtc/build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698