MediaRecorder: add mime type to recorded blobs

third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.cpp

 // Copyright 2015 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 "modules/mediarecorder/MediaRecorder.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/events/Event.h"
 #include "core/fileapi/Blob.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/EventTargetModules.h"
 #include "modules/mediarecorder/BlobEvent.h"
 #include "platform/ContentType.h"
 #include "platform/blob/BlobData.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
 #include "wtf/PtrUtil.h"
 #include <algorithm>
 
 namespace blink {
 
 namespace {
 
+const char* kDefaultMimeType = "video/webm";
+
 // Boundaries of Opus bitrate from https://www.opus-codec.org/.
 const int kSmallestPossibleOpusBitRate = 6000;
 const int kLargestAutoAllocatedOpusBitRate = 128000;
 
 // Smallest Vpx bitrate that can be requested.
 const int kSmallestPossibleVpxBitRate = 100000;
 
 String stateToString(MediaRecorder::State state)
 {
     switch (state) {
@@ skipping 95 matching lines @@
     recorder->suspendIfNeeded();
 
     return recorder;
 }
 
 MediaRecorder::MediaRecorder(ExecutionContext* context, MediaStream* stream, const MediaRecorderOptions& options, ExceptionState& exceptionState)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(context)
     , m_stream(stream)
     , m_streamAmountOfTracks(stream->getTracks().size())
-    , m_mimeType(options.mimeType())
+    , m_mimeType(options.hasMimeType() ? options.mimeType() : kDefaultMimeType)
     , m_stopped(true)
     , m_ignoreMutedMedia(true)
     , m_audioBitsPerSecond(0)
     , m_videoBitsPerSecond(0)
     , m_state(State::Inactive)
     , m_dispatchScheduledEventRunner(AsyncMethodRunner<MediaRecorder>::create(this, &MediaRecorder::dispatchScheduledEvent))
 {
     DCHECK(m_stream->getTracks().size());
 
     m_recorderHandler = wrapUnique(Platform::current()->createMediaRecorderHandler());
@@ skipping 140 matching lines @@
         m_stopped = false;
         scheduleDispatchEvent(Event::create(EventTypeNames::start));
     }
     if (m_stream && m_streamAmountOfTracks != m_stream->getTracks().size()) {
         m_streamAmountOfTracks = m_stream->getTracks().size();
         onError("Amount of tracks in MediaStream has changed.");
     }
 
     // TODO(mcasas): Act as |m_ignoredMutedMedia| instructs if |m_stream| track(s) is in muted() state.
 
-    if (!m_blobData)
+    if (!m_blobData) {
         m_blobData = BlobData::create();
+        m_blobData->setContentType(m_mimeType);
+    }
     if (data)
         m_blobData->appendBytes(data, length);
 
     if (!lastInSlice)
         return;
 
     // Cache |m_blobData->length()| before release()ng it.
     const long long blobDataLength = m_blobData->length();
     createBlobEvent(Blob::create(BlobDataHandle::create(std::move(m_blobData), blobDataLength)));
 }
@@ skipping 40 matching lines @@
 DEFINE_TRACE(MediaRecorder)
 {
     visitor->trace(m_stream);
     visitor->trace(m_dispatchScheduledEventRunner);
     visitor->trace(m_scheduledEvents);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink