generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webm2pes: Silence sign compare warnings.

Browse Source 
Change-Id: Ie6ce68507c35b8ec4888fe87c042e3b8371d534a
This commit is contained in:
Tom Finegan
2016-02-25 09:45:24 -08:00
parent 599e4e8bd2
commit 0fbefefb36
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webm2pes.cc
View File

@@ -37,9 +37,9 @@ bool GetPacketPayloadRanges(const libwebm::PesHeader& header,
for (std::size_t pos = 0; pos < kBytesToPacketize; for (std::size_t pos = 0; pos < kBytesToPacketize;
pos += packet_payload_length) { pos += packet_payload_length) {
packet_payload_length = packet_payload_length =
(frame_range.length - pos < kMaxPacketPayloadSize) (frame_range.length - pos < kMaxPacketPayloadSize) ?
? frame_range.length - pos frame_range.length - pos :
: kMaxPacketPayloadSize; kMaxPacketPayloadSize;
packet_payload_ranges->push_back( packet_payload_ranges->push_back(
libwebm::Range(frame_range.offset + pos, packet_payload_length)); libwebm::Range(frame_range.offset + pos, packet_payload_length));
} }
@@ -112,7 +112,7 @@ bool PesOptionalHeader::Write(bool write_pts, PacketDataBuffer* buffer) const {
return false; return false;
} }
const std::size_t kHeaderSize = 9; const int kHeaderSize = 9;
std::uint8_t header[kHeaderSize] = {0}; std::uint8_t header[kHeaderSize] = {0};
std::uint8_t* byte = header; std::uint8_t* byte = header;
@@ -179,11 +179,11 @@ bool BCMVHeader::Write(PacketDataBuffer* buffer) const {
std::fprintf(stderr, "Webm2Pes: nullptr for buffer in BCMV Write.\n"); std::fprintf(stderr, "Webm2Pes: nullptr for buffer in BCMV Write.\n");
return false; return false;
} }
const std::size_t kBcmvSize = 4; const int kBcmvSize = 4;
for (int i = 0; i < kBcmvSize; ++i) for (int i = 0; i < kBcmvSize; ++i)
buffer->push_back(bcmv[i]); buffer->push_back(bcmv[i]);
const std::size_t kRemainingBytes = 6; const int kRemainingBytes = 6;
const uint8_t bcmv_buffer[kRemainingBytes] = { const uint8_t bcmv_buffer[kRemainingBytes] = {
static_cast<std::uint8_t>((length >> 24) & 0xff), static_cast<std::uint8_t>((length >> 24) & 0xff),
static_cast<std::uint8_t>((length >> 16) & 0xff), static_cast<std::uint8_t>((length >> 16) & 0xff),
@@ -191,7 +191,7 @@ bool BCMVHeader::Write(PacketDataBuffer* buffer) const {
static_cast<std::uint8_t>(length & 0xff), static_cast<std::uint8_t>(length & 0xff),
0, 0,
0 /* 2 bytes 0 padding */}; 0 /* 2 bytes 0 padding */};
for (std::int8_t i = 0; i < kRemainingBytes; ++i) for (int i = 0; i < kRemainingBytes; ++i)
buffer->push_back(bcmv_buffer[i]); buffer->push_back(bcmv_buffer[i]);
return true; return true;
@@ -210,7 +210,7 @@ bool PesHeader::Write(bool write_pts, PacketDataBuffer* buffer) const {
} }
// Write |start_code|. // Write |start_code|.
const std::size_t kStartCodeLength = 4; const int kStartCodeLength = 4;
for (int i = 0; i < kStartCodeLength; ++i) for (int i = 0; i < kStartCodeLength; ++i)
buffer->push_back(start_code[i]); buffer->push_back(start_code[i]);
@@ -393,7 +393,8 @@ bool Webm2Pes::InitWebmParser() {
input_file_name_.c_str()); input_file_name_.c_str());
return false; return false;
} }
for (int track_index = 0; track_index < tracks->GetTracksCount(); for (int track_index = 0;
track_index < static_cast<int>(tracks->GetTracksCount());
++track_index) { ++track_index) {
const mkvparser::Track* track = tracks->GetTrackByIndex(track_index); const mkvparser::Track* track = tracks->GetTrackByIndex(track_index);
if (track && track->GetType() == mkvparser::Track::kVideo) { if (track && track->GetType() == mkvparser::Track::kVideo) {