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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix Mac CE Created 3 years, 8 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 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/video/video_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 VideoSendStream::Config config, 619 VideoSendStream::Config config,
620 VideoEncoderConfig encoder_config, 620 VideoEncoderConfig encoder_config,
621 const std::map<uint32_t, RtpState>& suspended_ssrcs) 621 const std::map<uint32_t, RtpState>& suspended_ssrcs)
622 : worker_queue_(worker_queue), 622 : worker_queue_(worker_queue),
623 thread_sync_event_(false /* manual_reset */, false), 623 thread_sync_event_(false /* manual_reset */, false),
624 stats_proxy_(Clock::GetRealTimeClock(), 624 stats_proxy_(Clock::GetRealTimeClock(),
625 config, 625 config,
626 encoder_config.content_type), 626 encoder_config.content_type),
627 config_(std::move(config)), 627 config_(std::move(config)),
628 content_type_(encoder_config.content_type) { 628 content_type_(encoder_config.content_type) {
629 vie_encoder_.reset(new ViEEncoder( 629 vie_encoder_.reset(
630 num_cpu_cores, &stats_proxy_, config_.encoder_settings, 630 new ViEEncoder(num_cpu_cores, &stats_proxy_, config_.encoder_settings,
631 config_.pre_encode_callback, config_.post_encode_callback)); 631 config_.pre_encode_callback, config_.post_encode_callback,
632 content_type_));
632 worker_queue_->PostTask(std::unique_ptr<rtc::QueuedTask>(new ConstructionTask( 633 worker_queue_->PostTask(std::unique_ptr<rtc::QueuedTask>(new ConstructionTask(
633 &send_stream_, &thread_sync_event_, &stats_proxy_, vie_encoder_.get(), 634 &send_stream_, &thread_sync_event_, &stats_proxy_, vie_encoder_.get(),
634 module_process_thread, call_stats, transport, bitrate_allocator, 635 module_process_thread, call_stats, transport, bitrate_allocator,
635 send_delay_stats, remb, event_log, &config_, 636 send_delay_stats, remb, event_log, &config_,
636 encoder_config.max_bitrate_bps, suspended_ssrcs))); 637 encoder_config.max_bitrate_bps, suspended_ssrcs)));
637 638
638 // Wait for ConstructionTask to complete so that |send_stream_| can be used. 639 // Wait for ConstructionTask to complete so that |send_stream_| can be used.
639 // |module_process_thread| must be registered and deregistered on the thread 640 // |module_process_thread| must be registered and deregistered on the thread
640 // it was created on. 641 // it was created on.
641 thread_sync_event_.Wait(rtc::Event::kForever); 642 thread_sync_event_.Wait(rtc::Event::kForever);
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 std::min(config_->rtp.max_packet_size, 1334 std::min(config_->rtp.max_packet_size,
1334 kPathMTU - transport_overhead_bytes_per_packet_); 1335 kPathMTU - transport_overhead_bytes_per_packet_);
1335 1336
1336 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { 1337 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
1337 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size); 1338 rtp_rtcp->SetMaxRtpPacketSize(rtp_packet_size);
1338 } 1339 }
1339 } 1340 }
1340 1341
1341 } // namespace internal 1342 } // namespace internal
1342 } // namespace webrtc 1343 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698