OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 | 10 |
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1557 memset(video_frame->buffer(webrtc::kUPlane), 128, | 1557 memset(video_frame->buffer(webrtc::kUPlane), 128, |
1558 video_frame->allocated_size(webrtc::kUPlane)); | 1558 video_frame->allocated_size(webrtc::kUPlane)); |
1559 memset(video_frame->buffer(webrtc::kVPlane), 128, | 1559 memset(video_frame->buffer(webrtc::kVPlane), 128, |
1560 video_frame->allocated_size(webrtc::kVPlane)); | 1560 video_frame->allocated_size(webrtc::kVPlane)); |
1561 video_frame->set_rotation(rotation); | 1561 video_frame->set_rotation(rotation); |
1562 } | 1562 } |
1563 | 1563 |
1564 void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame( | 1564 void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame( |
1565 const VideoFrame& frame) { | 1565 const VideoFrame& frame) { |
1566 TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::OnFrame"); | 1566 TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::OnFrame"); |
1567 webrtc::VideoFrame video_frame(frame.GetVideoFrameBuffer(), 0, 0, | 1567 webrtc::VideoFrame video_frame(frame.video_frame_buffer(), 0, 0, |
1568 frame.GetVideoRotation()); | 1568 frame.rotation()); |
1569 rtc::CritScope cs(&lock_); | 1569 rtc::CritScope cs(&lock_); |
1570 if (stream_ == NULL) { | 1570 if (stream_ == NULL) { |
1571 // Frame input before send codecs are configured, dropping frame. | 1571 // Frame input before send codecs are configured, dropping frame. |
1572 return; | 1572 return; |
1573 } | 1573 } |
1574 | 1574 |
1575 int64_t frame_delta_ms = frame.GetTimeStamp() / rtc::kNumNanosecsPerMillisec; | 1575 int64_t frame_delta_ms = frame.GetTimeStamp() / rtc::kNumNanosecsPerMillisec; |
1576 // frame->GetTimeStamp() is essentially a delta, align to webrtc time | 1576 // frame->GetTimeStamp() is essentially a delta, align to webrtc time |
1577 if (first_frame_timestamp_ms_ == 0) { | 1577 if (first_frame_timestamp_ms_ == 0) { |
1578 first_frame_timestamp_ms_ = rtc::Time() - frame_delta_ms; | 1578 first_frame_timestamp_ms_ = rtc::Time() - frame_delta_ms; |
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2567 rtx_mapping[video_codecs[i].codec.id] != | 2567 rtx_mapping[video_codecs[i].codec.id] != |
2568 fec_settings.red_payload_type) { | 2568 fec_settings.red_payload_type) { |
2569 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2569 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2570 } | 2570 } |
2571 } | 2571 } |
2572 | 2572 |
2573 return video_codecs; | 2573 return video_codecs; |
2574 } | 2574 } |
2575 | 2575 |
2576 } // namespace cricket | 2576 } // namespace cricket |
OLD | NEW |