Merge 58: Handle HW encoder errors in VideoTrackRecorder

content/renderer/media_recorder/video_track_recorder.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_VIDEO_TRACK_RECORDER_H_
 #define CONTENT_RENDERER_MEDIA_RECORDER_VIDEO_TRACK_RECORDER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 35 matching lines @@
 #endif
     LAST
   };
   class Encoder;
 
   using OnEncodedVideoCB =
       base::Callback<void(const media::WebmMuxer::VideoParameters& params,
                           std::unique_ptr<std::string> encoded_data,
                           base::TimeTicks capture_timestamp,
                           bool is_key_frame)>;
+  using OnErrorCB = base::Closure;
 
   static CodecId GetPreferredCodecId();
 
   VideoTrackRecorder(CodecId codec,
                      const blink::WebMediaStreamTrack& track,
                      const OnEncodedVideoCB& on_encoded_video_cb,
                      int32_t bits_per_second);
   ~VideoTrackRecorder() override;
 
   void Pause();
   void Resume();
 
   void OnVideoFrameForTesting(const scoped_refptr<media::VideoFrame>& frame,
                               base::TimeTicks capture_time);
  private:
   friend class VideoTrackRecorderTest;
 
   void InitializeEncoder(CodecId codec,
                          const OnEncodedVideoCB& on_encoded_video_callback,
                          int32_t bits_per_second,
+                         bool allow_vea_encoder,
                          const scoped_refptr<media::VideoFrame>& frame,
                          base::TimeTicks capture_time);
+  void OnError();
 
   // Used to check that we are destroyed on the same thread we were created.
   base::ThreadChecker main_render_thread_checker_;
 
   // We need to hold on to the Blink track to remove ourselves on dtor.
   blink::WebMediaStreamTrack track_;
 
   // Inner class to encode using whichever codec is configured.
   scoped_refptr<Encoder> encoder_;
 
-  base::Callback<void(const scoped_refptr<media::VideoFrame>& frame,
+  base::Callback<void(bool allow_vea_encoder,
+                      const scoped_refptr<media::VideoFrame>& frame,
                       base::TimeTicks capture_time)>
       initialize_encoder_callback_;
 
   // Used to track the paused state during the initialization process.
   bool paused_before_init_;
 
   base::WeakPtrFactory<VideoTrackRecorder> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoTrackRecorder);
 };
 
 }  // namespace content
 #endif  // CONTENT_RENDERER_MEDIA_RECORDER_VIDEO_TRACK_RECORDER_H_