Skip to content

GitLab

T
tangled
Commit fd77a968 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot
Browse files
Options

Build media/ with -Wexit-time-destructors. 

Bug: 101600
Change-Id: Ia497c75176cb9d01c40e371f5f8e58ba3f3713a8
Reviewed-on: https://chromium-review.googlesource.com/1246602
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594506}
parent 6f051863
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 53 deletions
media/BUILD.gn
View file @ fd77a968
...@@ -78,7 +78,10 @@ config("subcomponent_config") { ...@@ -78,7 +78,10 @@ config("subcomponent_config") {
visibility += [ "//media/base/mac" ] visibility += [ "//media/base/mac" ]
} }
defines = [ "MEDIA_IMPLEMENTATION" ] defines = [ "MEDIA_IMPLEMENTATION" ]
configs = [ ":media_config" ] configs = [
":media_config",
"//build/config/compiler:wexit_time_destructors",
]
} }
component("media") { component("media") {
......
media/base/android/media_codec_util.cc
View file @ fd77a968
...@@ -157,7 +157,7 @@ bool MediaCodecUtil::IsMediaCodecAvailableFor(int sdk, const char* model) { ...@@ -157,7 +157,7 @@ bool MediaCodecUtil::IsMediaCodecAvailableFor(int sdk, const char* model) {
return model == other.model; return model == other.model;
} }
}; };
static const std::vector<BlacklistEntry> blacklist = { static const BlacklistEntry blacklist[] = {
// crbug.com/653905 // crbug.com/653905
{"LGMS330", SDK_VERSION_LOLLIPOP_MR1}, {"LGMS330", SDK_VERSION_LOLLIPOP_MR1},
...@@ -192,9 +192,9 @@ bool MediaCodecUtil::IsMediaCodecAvailableFor(int sdk, const char* model) { ...@@ -192,9 +192,9 @@ bool MediaCodecUtil::IsMediaCodecAvailableFor(int sdk, const char* model) {
{"GT-I8262B", SDK_VERSION_JELLY_BEAN_MR2}, {"GT-I8262B", SDK_VERSION_JELLY_BEAN_MR2},
}; };
const auto iter = const BlacklistEntry* iter = std::find(
std::find(blacklist.begin(), blacklist.end(), BlacklistEntry(model, 0)); std::begin(blacklist), std::end(blacklist), BlacklistEntry(model, 0));
return iter == blacklist.end() || sdk > iter->last_bad_sdk; return iter == std::end(blacklist) || sdk > iter->last_bad_sdk;
} }
// static // static
......
media/base/media_tracks.cc
View file @ fd77a968
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <memory> #include <memory>
#include "base/bind.h" #include "base/bind.h"
#include "base/no_destructor.h"
#include "media/base/audio_decoder_config.h" #include "media/base/audio_decoder_config.h"
#include "media/base/video_decoder_config.h" #include "media/base/video_decoder_config.h"
...@@ -53,8 +54,8 @@ const AudioDecoderConfig& MediaTracks::getAudioConfig( ...@@ -53,8 +54,8 @@ const AudioDecoderConfig& MediaTracks::getAudioConfig(
auto it = audio_configs_.find(bytestream_track_id); auto it = audio_configs_.find(bytestream_track_id);
if (it != audio_configs_.end()) if (it != audio_configs_.end())
return it->second; return it->second;
static AudioDecoderConfig invalidConfig; static base::NoDestructor<AudioDecoderConfig> invalidConfig;
return invalidConfig; return *invalidConfig;
} }
const VideoDecoderConfig& MediaTracks::getVideoConfig( const VideoDecoderConfig& MediaTracks::getVideoConfig(
...@@ -62,8 +63,8 @@ const VideoDecoderConfig& MediaTracks::getVideoConfig( ...@@ -62,8 +63,8 @@ const VideoDecoderConfig& MediaTracks::getVideoConfig(
auto it = video_configs_.find(bytestream_track_id); auto it = video_configs_.find(bytestream_track_id);
if (it != video_configs_.end()) if (it != video_configs_.end())
return it->second; return it->second;
static VideoDecoderConfig invalidConfig; static base::NoDestructor<VideoDecoderConfig> invalidConfig;
return invalidConfig; return *invalidConfig;
} }
} // namespace media } // namespace media
media/base/mime_util_internal.cc
View file @ fd77a968
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "media/base/mime_util_internal.h" #include "media/base/mime_util_internal.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
...@@ -31,53 +32,58 @@ namespace internal { ...@@ -31,53 +32,58 @@ namespace internal {
// Wrapped to avoid static initializer startup cost. // Wrapped to avoid static initializer startup cost.
const base::flat_map<std::string, MimeUtil::Codec>& GetStringToCodecMap() { const base::flat_map<std::string, MimeUtil::Codec>& GetStringToCodecMap() {
static const base::flat_map<std::string, MimeUtil::Codec> kStringToCodecMap( static const base::NoDestructor<base::flat_map<std::string, MimeUtil::Codec>>
{ kStringToCodecMap(base::flat_map<std::string, MimeUtil::Codec>(
// We only allow this for WAV so it isn't ambiguous. {
{"1", MimeUtil::PCM}, // We only allow this for WAV so it isn't ambiguous.
// avc1/avc3.XXXXXX may be unambiguous; handled by {"1", MimeUtil::PCM},
// ParseAVCCodecId(). hev1/hvc1.XXXXXX may be unambiguous; handled // avc1/avc3.XXXXXX may be unambiguous; handled by
// by ParseHEVCCodecID(). vp9, vp9.0, vp09.xx.xx.xx.xx.xx.xx.xx may // ParseAVCCodecId(). hev1/hvc1.XXXXXX may be unambiguous;
// be unambiguous; handled by ParseVp9CodecID(). // handled by ParseHEVCCodecID(). vp9, vp9.0,
{"mp3", MimeUtil::MP3}, // vp09.xx.xx.xx.xx.xx.xx.xx may be unambiguous; handled by
// Following is the list of RFC 6381 compliant audio codec strings: // ParseVp9CodecID().
// mp4a.66 - MPEG-2 AAC MAIN {"mp3", MimeUtil::MP3},
// mp4a.67 - MPEG-2 AAC LC // Following is the list of RFC 6381 compliant audio codec
// mp4a.68 - MPEG-2 AAC SSR // strings:
// mp4a.69 - MPEG-2 extension to MPEG-1 (MP3) // mp4a.66 - MPEG-2 AAC MAIN
// mp4a.6B - MPEG-1 audio (MP3) // mp4a.67 - MPEG-2 AAC LC
// mp4a.40.2 - MPEG-4 AAC LC // mp4a.68 - MPEG-2 AAC SSR
// mp4a.40.02 - MPEG-4 AAC LC (leading 0 in aud-oti for // mp4a.69 - MPEG-2 extension to MPEG-1 (MP3)
// compatibility) mp4a.40.5 - MPEG-4 HE-AAC v1 (AAC LC + SBR) // mp4a.6B - MPEG-1 audio (MP3)
// mp4a.40.05 - MPEG-4 HE-AAC v1 (AAC LC + SBR) (leading 0 in // mp4a.40.2 - MPEG-4 AAC LC
// aud-oti // mp4a.40.02 - MPEG-4 AAC LC (leading 0 in aud-oti for
// for compatibility) // compatibility)
// mp4a.40.29 - MPEG-4 HE-AAC v2 (AAC LC + SBR + PS) // mp4a.40.5 - MPEG-4 HE-AAC v1 (AAC LC + SBR)
{"mp4a.66", MimeUtil::MPEG2_AAC}, {"mp4a.67", MimeUtil::MPEG2_AAC}, // mp4a.40.05 - MPEG-4 HE-AAC v1 (AAC LC + SBR) (leading 0
{"mp4a.68", MimeUtil::MPEG2_AAC}, {"mp4a.69", MimeUtil::MP3}, // in aud-oti for compatibility)
{"mp4a.6B", MimeUtil::MP3}, {"mp4a.40.2", MimeUtil::MPEG4_AAC}, // mp4a.40.29 - MPEG-4 HE-AAC v2 (AAC LC + SBR + PS)
{"mp4a.40.02", MimeUtil::MPEG4_AAC}, {"mp4a.66", MimeUtil::MPEG2_AAC},
{"mp4a.40.5", MimeUtil::MPEG4_AAC}, {"mp4a.67", MimeUtil::MPEG2_AAC},
{"mp4a.40.05", MimeUtil::MPEG4_AAC}, {"mp4a.68", MimeUtil::MPEG2_AAC}, {"mp4a.69", MimeUtil::MP3},
{"mp4a.40.29", MimeUtil::MPEG4_AAC}, {"mp4a.6B", MimeUtil::MP3}, {"mp4a.40.2", MimeUtil::MPEG4_AAC},
{"mp4a.40.02", MimeUtil::MPEG4_AAC},
{"mp4a.40.5", MimeUtil::MPEG4_AAC},
{"mp4a.40.05", MimeUtil::MPEG4_AAC},
{"mp4a.40.29", MimeUtil::MPEG4_AAC},
#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
// TODO(servolk): Strictly speaking only mp4a.A5 and mp4a.A6 codec // TODO(servolk): Strictly speaking only mp4a.A5 and mp4a.A6
// ids are valid according to RFC 6381 section 3.3, 3.4. Lower-case // codec ids are valid according to RFC 6381 section 3.3, 3.4.
// oti (mp4a.a5 and mp4a.a6) should be rejected. But we used to // Lower-case oti (mp4a.a5 and mp4a.a6) should be rejected. But
// allow those in older versions of Chromecast firmware and some // we used to allow those in older versions of Chromecast
// apps (notably MPL) depend on those codec types being supported, // firmware and some apps (notably MPL) depend on those codec
// so they should be allowed for now (crbug.com/564960). // types being supported, so they should be allowed for now
{"ac-3", MimeUtil::AC3}, {"mp4a.a5", MimeUtil::AC3}, // (crbug.com/564960).
{"mp4a.A5", MimeUtil::AC3}, {"ec-3", MimeUtil::EAC3}, {"ac-3", MimeUtil::AC3}, {"mp4a.a5", MimeUtil::AC3},
{"mp4a.a6", MimeUtil::EAC3}, {"mp4a.A6", MimeUtil::EAC3}, {"mp4a.A5", MimeUtil::AC3}, {"ec-3", MimeUtil::EAC3},
{"mp4a.a6", MimeUtil::EAC3}, {"mp4a.A6", MimeUtil::EAC3},
#endif #endif
{"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS}, {"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS},
{"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8}, {"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA}, {"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA},
}, },
base::KEEP_FIRST_OF_DUPES); base::KEEP_FIRST_OF_DUPES));
return kStringToCodecMap; return *kStringToCodecMap;
} }
static bool ParseVp9CodecID(const std::string& mime_type_lower_case, static bool ParseVp9CodecID(const std::string& mime_type_lower_case,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment