Add FLAC audio codec support

media/base/mime_util_internal.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/mime_util_internal.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 15 matching lines @@
   const char* const codec_id;
   MimeUtil::Codec codec;
 };
 
 // List of codec IDs that provide enough information to determine the
 // codec and profile being requested.
 //
 // The "mp4a" strings come from RFC 6381.
 static const CodecIDMappings kUnambiguousCodecStringMap[] = {
     {"1", MimeUtil::PCM},  // We only allow this for WAV so it isn't ambiguous.
+    {"flac", MimeUtil::FLAC},
     // avc1/avc3.XXXXXX may be unambiguous; handled by ParseAVCCodecId().
     // hev1/hvc1.XXXXXX may be unambiguous; handled by ParseHEVCCodecID().
     // vp9, vp9.0, vp09.xx.xx.xx.xx.xx.xx.xx may be unambiguous; handled by
     // ParseVp9CodecID().
     {"mp3", MimeUtil::MP3},
     // Following is the list of RFC 6381 compliant audio codec strings:
     //   mp4a.66     - MPEG-2 AAC MAIN
     //   mp4a.67     - MPEG-2 AAC LC
     //   mp4a.68     - MPEG-2 AAC SSR
     //   mp4a.69     - MPEG-2 extension to MPEG-1 (MP3)
@@ skipping 313 matching lines @@
 
   CodecSet webm_audio_codecs;
   webm_audio_codecs.insert(OPUS);
   webm_audio_codecs.insert(VORBIS);
   CodecSet webm_video_codecs;
   webm_video_codecs.insert(VP8);
   webm_video_codecs.insert(VP9);
   CodecSet webm_codecs(webm_audio_codecs);
   webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
 
+  CodecSet flac_audio_codecs;
+  flac_audio_codecs.insert(FLAC);
+
 #if defined(USE_PROPRIETARY_CODECS)
   CodecSet mp3_codecs;
   mp3_codecs.insert(MP3);
 
   CodecSet aac;
   aac.insert(MPEG2_AAC);
   aac.insert(MPEG4_AAC);
 
   CodecSet avc_and_aac(aac);
   avc_and_aac.insert(H264);
@@ skipping 23 matching lines @@
   DCHECK(!webm_video_codecs.empty());
   AddContainerWithCodecs("video/webm", webm_codecs, false);
   AddContainerWithCodecs("audio/ogg", ogg_audio_codecs, false);
   // video/ogg is only supported if an appropriate video codec is supported.
   // Note: This assumes such codecs cannot be later excluded.
   if (!ogg_video_codecs.empty())
     AddContainerWithCodecs("video/ogg", ogg_codecs, false);
   // TODO(ddorwin): Should the application type support Opus?
   AddContainerWithCodecs("application/ogg", ogg_codecs, false);
 
+  AddContainerWithCodecs("audio/flac", flac_audio_codecs, false);
+  AddContainerWithCodecs("audio/x-flac", flac_audio_codecs, false);
+  AddContainerWithCodecs("application/x-flac", flac_audio_codecs, false);

[servolk, 2016/09/23 22:17:15]

Firefox supports all 3 mime types
(https://reviewboard.mozilla.org/r/72408/diff/1/?file=2074198#file2074198), so
I've also added all 3 for now.

+
 #if defined(USE_PROPRIETARY_CODECS)
   AddContainerWithCodecs("audio/mpeg", mp3_codecs, true);  // Allow "mp3".
   AddContainerWithCodecs("audio/mp3", implicit_codec, true);
   AddContainerWithCodecs("audio/x-mp3", implicit_codec, true);
   AddContainerWithCodecs("audio/aac", implicit_codec, true);  // AAC / ADTS.
   AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true);
   DCHECK(!mp4_video_codecs.empty());
   AddContainerWithCodecs("video/mp4", mp4_codecs, true);
   // These strings are supported for backwards compatibility only and thus only
   // support the codecs needed for compatibility.
@@ skipping 133 matching lines @@
     case INVALID_CODEC:
     case AC3:
     case EAC3:
     case THEORA:
       return false;
 
     // ----------------------------------------------------------------------
     // The remaining codecs may be supported depending on platform abilities.
     // ----------------------------------------------------------------------
 
+    case FLAC:
     case PCM:
     case MP3:
     case MPEG4_AAC:
     case VORBIS:
       // These codecs are always supported; via a platform decoder (when used
       // with MSE/EME), a software decoder (the unified pipeline), or with
       // MediaPlayer.
       DCHECK(!is_encrypted || platform_info.has_platform_decoders);
       return true;
 
@@ skipping 184 matching lines @@
     case INVALID_CODEC:
     case AC3:
     case EAC3:
     case MP3:
     case MPEG2_AAC:
     case MPEG4_AAC:
     case H264:
     case HEVC:
       return true;
 
+    case FLAC:
     case PCM:
     case VORBIS:
     case OPUS:
     case VP8:
     case VP9:
     case THEORA:
       return false;
   }
 
   return true;
@@ skipping 20 matching lines @@
     const std::string& mime_type_lower_case,
     bool is_encrypted) const {
   Codec default_codec = Codec::INVALID_CODEC;
   if (!GetDefaultCodecLowerCase(mime_type_lower_case, &default_codec))
     return false;
   return IsCodecSupported(default_codec, mime_type_lower_case, is_encrypted);
 }
 
 }  // namespace internal
 }  // namespace media