MediaRecorder: make sure ondataavailable+onstop events are fired before onerror

content/renderer/media/recorder/media_recorder_handler.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RECORDER_MEDIA_RECORDER_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RECORDER_MEDIA_RECORDER_HANDLER_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
@@ skipping 56 matching lines @@
 
   void OnEncodedVideo(const media::WebmMuxer::VideoParameters& params,
                       std::unique_ptr<std::string> encoded_data,
                       base::TimeTicks timestamp,
                       bool is_key_frame);
   void OnEncodedAudio(const media::AudioParameters& params,
                       std::unique_ptr<std::string> encoded_data,
                       base::TimeTicks timestamp);
   void WriteData(base::StringPiece data);
 
+  // Updates |media_stream_num_tracks_| and returns true if it has changed.
+  bool CheckAndUpdateAmountOfTracks();
+
   void OnVideoFrameForTesting(const scoped_refptr<media::VideoFrame>& frame,
                               const base::TimeTicks& timestamp);
   void OnAudioBusForTesting(const media::AudioBus& audio_bus,
                             const base::TimeTicks& timestamp);
   void SetAudioFormatForTesting(const media::AudioParameters& params);
 
   // Bound to the main render thread.
   base::ThreadChecker main_render_thread_checker_;
 
   // Sanitized video and audio bitrate settings passed on initialize().
   int32_t video_bits_per_second_;
   int32_t audio_bits_per_second_;
 
   // Video Codec, VP8 is used by default.
   VideoTrackRecorder::CodecId codec_id_;
 
   // |client_| has no notion of time, thus may configure us via start(timeslice)
   // to notify it after a certain |timeslice_| has passed. We use a moving
   // |slice_origin_timestamp_| to track those time chunks.
   base::TimeDelta timeslice_;
   base::TimeTicks slice_origin_timestamp_;
 
   bool recording_;
   blink::WebMediaStream media_stream_;  // The MediaStream being recorded.
+  size_t media_stream_num_tracks_;
 
   // |client_| is a weak pointer, and is valid for the lifetime of this object.
   blink::WebMediaRecorderHandlerClient* client_;
 
   std::vector<std::unique_ptr<VideoTrackRecorder>> video_recorders_;
   std::vector<std::unique_ptr<AudioTrackRecorder>> audio_recorders_;
 
   // Worker class doing the actual Webm Muxing work.
   std::unique_ptr<media::WebmMuxer> webm_muxer_;
 
   base::WeakPtrFactory<MediaRecorderHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRecorderHandler);
 };
 
 }  // namespace content
 #endif  // CONTENT_RENDERER_MEDIA_RECORDER_MEDIA_RECORDER_HANDLER_H_