Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes for source code portability. 

Change-Id: I06ebb0bb0cbf16c85eff066e606af5ec9033a206
This commit is contained in:
Thomas Inskip 2015-03-24 15:29:55 -07:00 committed by Gerrit Code Review
parent 7cac9da421
commit 14a1e06542
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/media/base/http_key_fetcher.cc
View File

@ -10,6 +10,8 @@
#include "packager/base/strings/stringprintf.h" #include "packager/base/strings/stringprintf.h"
#include "packager/base/synchronization/lock.h" #include "packager/base/synchronization/lock.h"
namespace edash_packager {
namespace { namespace {
const char kUserAgentString[] = "edash-packager-http_fetcher/1.0"; const char kUserAgentString[] = "edash-packager-http_fetcher/1.0";
@ -64,7 +66,6 @@ class LibCurlInitializer {
} // namespace } // namespace
namespace edash_packager {
namespace media { namespace media {
HttpKeyFetcher::HttpKeyFetcher() : timeout_in_seconds_(0) {} HttpKeyFetcher::HttpKeyFetcher() : timeout_in_seconds_(0) {}

6
packager/media/file/io_cache.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "media/file/io_cache.h" #include "packager/media/file/io_cache.h"
#include <string.h> #include <string.h>
@ -123,13 +123,13 @@ uint64_t IoCache::BytesFree() {
return BytesFreeInternal(); return BytesFreeInternal();
} }
uint64 IoCache::BytesCachedInternal() { uint64_t IoCache::BytesCachedInternal() {
return (r_ptr_ <= w_ptr_) ? return (r_ptr_ <= w_ptr_) ?
w_ptr_ - r_ptr_ : w_ptr_ - r_ptr_ :
(end_ptr_ - r_ptr_) + (w_ptr_ - &circular_buffer_[0]); (end_ptr_ - r_ptr_) + (w_ptr_ - &circular_buffer_[0]);
} }
uint64 IoCache::BytesFreeInternal() { uint64_t IoCache::BytesFreeInternal() {
return cache_size_ - BytesCachedInternal(); return cache_size_ - BytesCachedInternal();
} }