author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Fri, 08 Apr 2016 16:42:32 +0200 | |
changeset 292352 | e9251880e1764e985fe6f069caa24b994354ffea |
parent 292351 | 6975c0a487de4accdde0ae923f960286106d2d32 |
child 292353 | 20e4eb3f40057b6a8eb0bbb6bf94494d55a25ee4 |
push id | 74826 |
push user | cbook@mozilla.com |
push date | Fri, 08 Apr 2016 14:43:41 +0000 |
treeherder | mozilla-inbound@56b78db445e3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1248861 |
milestone | 48.0a1 |
backs out | 8f981dd66bee23242dc578c68e746bc28a9329f4 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
dom/media/MediaInfo.cpp | file | annotate | diff | comparison | revisions | |
dom/media/MediaInfo.h | file | annotate | diff | comparison | revisions |
--- a/dom/media/MediaInfo.cpp +++ b/dom/media/MediaInfo.cpp @@ -94,38 +94,16 @@ AudioConfig::ChannelLayout::SMPTEDefault static const Channel config[] = { CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_CENTER, CHANNEL_LFE, CHANNEL_RLS, CHANNEL_RRS, CHANNEL_LS, CHANNEL_RS }; return config; } default: return nullptr; } } -bool -AudioConfig::ChannelLayout::MappingTable(const ChannelLayout& aOther, - uint8_t* aMap) const -{ - if (!IsValid() || !aOther.IsValid() || - Map() != aOther.Map()) { - return false; - } - if (!aMap) { - return true; - } - for (uint32_t i = 0; i < Count(); i++) { - for (uint32_t j = 0; j < Count(); j++) { - if (aOther[j] == mChannels[i]) { - aMap[j] = i; - break; - } - } - } - return true; -} - /** * AudioConfig::ChannelConfig */ /* static */ const char* AudioConfig::FormatToString(AudioConfig::SampleFormat aFormat) { switch (aFormat) {
--- a/dom/media/MediaInfo.h +++ b/dom/media/MediaInfo.h @@ -522,26 +522,16 @@ public: uint32_t Count() const { return mChannels.Length(); } uint32_t Map() const { return mChannelMap; } - // Calculate the mapping table from the current layout to aOther such that - // one can easily go from one layout to the other by doing: - // out[channel] = in[map[channel]]. - // Returns true if the reordering is possible or false otherwise. - // If true, then aMap, if set, will be updated to contain the mapping table - // allowing conversion from the current layout to aOther. - // If aMap is nullptr, then MappingTable can be used to simply determine if - // the current layout can be easily reordered to aOther. - // aMap must be an array of size MAX_AUDIO_CHANNELS. - bool MappingTable(const ChannelLayout& aOther, uint8_t* aMap = nullptr) const; bool IsValid() const { return mValid; } bool HasChannel(Channel aChannel) const { return mChannelMap & (1 << aChannel); } private: