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

Side by Side Diff: media/cast/sender/fake_software_video_encoder.cc

Issue 1515433002: Replace uses of raw uint32's with a type-checked RtpTimeTicks data type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/sender/fake_software_video_encoder.h" 5 #include "media/cast/sender/fake_software_video_encoder.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "media/base/video_frame.h" 9 #include "media/base/video_frame.h"
10 #include "media/cast/cast_defines.h" 10 #include "media/cast/common/rtp_time.h"
11 #include "media/cast/constants.h" 11 #include "media/cast/constants.h"
12 12
13 #ifndef OFFICIAL_BUILD 13 #ifndef OFFICIAL_BUILD
14 14
15 namespace media { 15 namespace media {
16 namespace cast { 16 namespace cast {
17 17
18 FakeSoftwareVideoEncoder::FakeSoftwareVideoEncoder( 18 FakeSoftwareVideoEncoder::FakeSoftwareVideoEncoder(
19 const VideoSenderConfig& video_config) 19 const VideoSenderConfig& video_config)
20 : video_config_(video_config), 20 : video_config_(video_config),
(...skipping 20 matching lines...) Expand all
41 encoded_frame->frame_id = frame_id_++; 41 encoded_frame->frame_id = frame_id_++;
42 if (next_frame_is_key_) { 42 if (next_frame_is_key_) {
43 encoded_frame->dependency = EncodedFrame::KEY; 43 encoded_frame->dependency = EncodedFrame::KEY;
44 encoded_frame->referenced_frame_id = encoded_frame->frame_id; 44 encoded_frame->referenced_frame_id = encoded_frame->frame_id;
45 next_frame_is_key_ = false; 45 next_frame_is_key_ = false;
46 } else { 46 } else {
47 encoded_frame->dependency = EncodedFrame::DEPENDENT; 47 encoded_frame->dependency = EncodedFrame::DEPENDENT;
48 encoded_frame->referenced_frame_id = encoded_frame->frame_id - 1; 48 encoded_frame->referenced_frame_id = encoded_frame->frame_id - 1;
49 } 49 }
50 encoded_frame->rtp_timestamp = 50 encoded_frame->rtp_timestamp =
51 TimeDeltaToRtpDelta(video_frame->timestamp(), kVideoFrequency); 51 RtpTimeTicks::FromTimeDelta(video_frame->timestamp(), kVideoFrequency);
52 encoded_frame->reference_time = reference_time; 52 encoded_frame->reference_time = reference_time;
53 53
54 base::DictionaryValue values; 54 base::DictionaryValue values;
55 values.SetBoolean("key", 55 values.SetBoolean("key",
56 encoded_frame->dependency == EncodedFrame::KEY); 56 encoded_frame->dependency == EncodedFrame::KEY);
57 values.SetInteger("ref", encoded_frame->referenced_frame_id); 57 values.SetInteger("ref", encoded_frame->referenced_frame_id);
58 values.SetInteger("id", encoded_frame->frame_id); 58 values.SetInteger("id", encoded_frame->frame_id);
59 values.SetInteger("size", frame_size_); 59 values.SetInteger("size", frame_size_);
60 base::JSONWriter::Write(values, &encoded_frame->data); 60 base::JSONWriter::Write(values, &encoded_frame->data);
61 encoded_frame->data.resize( 61 encoded_frame->data.resize(
(...skipping 13 matching lines...) Expand all
75 } 75 }
76 76
77 void FakeSoftwareVideoEncoder::GenerateKeyFrame() { 77 void FakeSoftwareVideoEncoder::GenerateKeyFrame() {
78 next_frame_is_key_ = true; 78 next_frame_is_key_ = true;
79 } 79 }
80 80
81 } // namespace cast 81 } // namespace cast
82 } // namespace media 82 } // namespace media
83 83
84 #endif 84 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698