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

Some misc cleanups 

Put everything inside edash_packager namespace.

Change-Id: Iade763d5d3c99a4cca28975a40465459ff2ad86c
This commit is contained in:
KongQun Yang 2014-09-30 14:43:40 -07:00
parent fd35084722
commit 7e6cd6e853
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/base/aes_encryptor.cc
View File

@ -11,7 +11,6 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/rand_util.h"
namespace { namespace {

5
media/base/muxer.h
View File

@ -13,13 +13,10 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/time/clock.h"
#include "media/base/muxer_options.h" #include "media/base/muxer_options.h"
#include "media/base/status.h" #include "media/base/status.h"
namespace base {
class Clock;
}
namespace edash_packager { namespace edash_packager {
namespace media { namespace media {

2
media/base/muxer_util.cc
View File

@ -16,6 +16,7 @@
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
namespace edash_packager {
namespace { namespace {
bool ValidateFormatTag(const std::string& format_tag) { bool ValidateFormatTag(const std::string& format_tag) {
DCHECK(!format_tag.empty()); DCHECK(!format_tag.empty());
@ -32,7 +33,6 @@ bool ValidateFormatTag(const std::string& format_tag) {
} }
} // namespace } // namespace
namespace edash_packager {
namespace media { namespace media {
bool ValidateSegmentTemplate(const std::string& segment_template) { bool ValidateSegmentTemplate(const std::string& segment_template) {

2
media/base/widevine_key_source.cc
View File

@ -24,6 +24,7 @@
} \ } \
} while (0) } while (0)
namespace edash_packager {
namespace { namespace {
const bool kEnableKeyRotation = true; const bool kEnableKeyRotation = true;
@ -110,7 +111,6 @@ bool GetPsshDataFromTrack(const base::DictionaryValue& track_dict,
} // namespace } // namespace
namespace edash_packager {
namespace media { namespace media {
// A ref counted wrapper for EncryptionKeyMap. // A ref counted wrapper for EncryptionKeyMap.