Chromium Code Reviews| Index: extensions/renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc |
| diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc |
| index 8a5839b3d2762bbc9367b0ace62b81300fab4961..eae5c270f914dec31a34b05eda9766c940046c3e 100644 |
| --- a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc |
| +++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc |
| @@ -169,7 +169,8 @@ class FakeTransportStreamPacketizer |
| }; |
| struct ProgramClockReference { |
| - enum { kInvalidBase = ~static_cast<uint64_t>(0u) }; |
|
e_hakkinen
2016/04/28 12:45:32
Causes signedness errors. kInvalidBase might resul
|
| + static const uint64_t kInvalidBase = ~static_cast<uint64_t>(0u); |
| + |
| uint64_t base; |
| uint16_t extension; |
| }; |
| @@ -560,14 +561,13 @@ TEST_P(WiFiDisplayElementaryStreamUnitPacketizationTest, |
| ? WiFiDisplayElementaryStreamPacketizer::kFirstVideoStreamId |
| : WiFiDisplayElementaryStreamPacketizer::kFirstAudioStreamId; |
| - WiFiDisplayElementaryStreamPacketizer packetizer; |
|
e_hakkinen
2016/04/28 12:45:32
Object not used for anything but calling a static
|
| uint8_t unit_header_data[kMaxUnitHeaderSize]; |
| for (size_t unit_header_size = 0u; unit_header_size <= kMaxUnitHeaderSize; |
| ++unit_header_size) { |
| WiFiDisplayElementaryStreamPacket packet = |
| - packetizer.EncodeElementaryStreamUnit(stream_id, unit_header_data, |
| - unit_header_size, unit_.data(), |
| - unit_.size(), pts_, dts_); |
| + WiFiDisplayElementaryStreamPacketizer::EncodeElementaryStreamUnit( |
| + stream_id, unit_header_data, unit_header_size, unit_.data(), |
| + unit_.size(), pts_, dts_); |
| CheckElementaryStreamPacketHeader(packet, stream_id); |
| CheckElementaryStreamPacketUnitHeader(packet, unit_header_data, |
| unit_header_size); |
| @@ -672,7 +672,6 @@ TEST_P(WiFiDisplayElementaryStreamUnitPacketizationTest, |
| stream_infos.emplace_back(WiFiDisplayElementaryStreamInfo::AUDIO_LPCM, |
| std::move(lpcm_descriptors)); |
| stream_infos.emplace_back(WiFiDisplayElementaryStreamInfo::AUDIO_AAC); |
| - WiFiDisplayElementaryStreamPacketizer elementary_stream_packetizer; |
|
e_hakkinen
2016/04/28 12:45:32
Ditto.
|
| FakeTransportStreamPacketizer packetizer( |
| base::TimeDelta::FromMilliseconds(200), stream_infos); |
| @@ -696,7 +695,7 @@ TEST_P(WiFiDisplayElementaryStreamUnitPacketizationTest, |
| auto normalized_dts = dts_; |
| packetizer.NormalizeUnitTimeStamps(&normalized_pts, &normalized_dts); |
| WiFiDisplayElementaryStreamPacket elementary_stream_packet = |
| - elementary_stream_packetizer.EncodeElementaryStreamUnit( |
| + WiFiDisplayElementaryStreamPacketizer::EncodeElementaryStreamUnit( |
| kStreamIds[stream_index], unit_header_data, unit_header_size, |
| unit_.data(), unit_.size(), normalized_pts, normalized_dts); |
| @@ -783,7 +782,7 @@ TEST(WiFiDisplayTransportStreamPacketizationTest, EncodeToMediaDatagramPacket) { |
| // Check datagram packets. |
| ProgramClockReference pcr = {ProgramClockReference::kInvalidBase, 0u}; |
| - uint16_t sequence_number; |
|
e_hakkinen
2016/04/28 12:45:32
MSVC thinks that the variable is used without init
|
| + uint16_t sequence_number = 0u; |
| uint32_t synchronization_source_identifier; |
| auto transport_stream_packet_it = transport_stream_packets.cbegin(); |
| for (const auto& packet : packets) { |