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

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: Addressed stefan's comments 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
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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 // the first frame to know that you gave a bad codec parameter could make 334 // the first frame to know that you gave a bad codec parameter could make
335 // debugging hard). 335 // debugging hard).
336 // TODO(pbos): Consider setting up encoders lazily. 336 // TODO(pbos): Consider setting up encoders lazily.
337 Dimensions() : width(176), height(144), is_screencast(false) {} 337 Dimensions() : width(176), height(144), is_screencast(false) {}
338 int width; 338 int width;
339 int height; 339 int height;
340 bool is_screencast; 340 bool is_screencast;
341 }; 341 };
342 342
343 union VideoEncoderSettings { 343 union VideoEncoderSettings {
344 webrtc::VideoCodecH264 h264;
344 webrtc::VideoCodecVP8 vp8; 345 webrtc::VideoCodecVP8 vp8;
345 webrtc::VideoCodecVP9 vp9; 346 webrtc::VideoCodecVP9 vp9;
346 }; 347 };
347 348
348 static std::vector<webrtc::VideoStream> CreateVideoStreams( 349 static std::vector<webrtc::VideoStream> CreateVideoStreams(
349 const VideoCodec& codec, 350 const VideoCodec& codec,
350 const VideoOptions& options, 351 const VideoOptions& options,
351 int max_bitrate_bps, 352 int max_bitrate_bps,
352 size_t num_streams); 353 size_t num_streams);
353 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams( 354 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams(
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 WebRtcVideoDecoderFactory* const external_decoder_factory_; 540 WebRtcVideoDecoderFactory* const external_decoder_factory_;
540 std::vector<VideoCodecSettings> recv_codecs_; 541 std::vector<VideoCodecSettings> recv_codecs_;
541 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 542 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
542 webrtc::Call::Config::BitrateConfig bitrate_config_; 543 webrtc::Call::Config::BitrateConfig bitrate_config_;
543 VideoOptions options_; 544 VideoOptions options_;
544 }; 545 };
545 546
546 } // namespace cricket 547 } // namespace cricket
547 548
548 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 549 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698