Rename VideoDecoderOutputCallback to VideoFrameOutputCallback

The VideoDecoder and VideoTrackReader share the same callback definition
to send VideoFrames back to JS. This CL updates the name of the callback
to a more generic name usable by both.

Bug: 1080834
Change-Id: I2b5cd5d2ed775abd2adfff582320617fd954b85b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2203217
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Auto-Submit: Thomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771126}

third_party/blink/renderer/bindings/idl_in_modules.gni

@@ -729,7 +729,6 @@ static_idl_files_in_modules = get_path_info(
           "//third_party/blink/renderer/modules/webcodecs/image_frame.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_decoder.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_decoder_init.idl",
-          "//third_party/blink/renderer/modules/webcodecs/video_decoder_output_callback.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_encoder.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_encoder_encode_options.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_encoder_init.idl",
@@ -737,6 +736,7 @@ static_idl_files_in_modules = get_path_info(
           "//third_party/blink/renderer/modules/webcodecs/video_encoder_tune_options.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_frame.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_frame_init.idl",
+          "//third_party/blink/renderer/modules/webcodecs/video_frame_output_callback.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_track_reader.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_track_writer.idl",
           "//third_party/blink/renderer/modules/webcodecs/video_track_writer_parameters.idl",

third_party/blink/renderer/bindings/modules/v8/generated.gni

@@ -164,10 +164,10 @@ generated_modules_callback_function_files = [
   "$bindings_modules_v8_output_dir/v8_storage_quota_callback.h",
   "$bindings_modules_v8_output_dir/v8_storage_usage_callback.cc",
   "$bindings_modules_v8_output_dir/v8_storage_usage_callback.h",
-  "$bindings_modules_v8_output_dir/v8_video_decoder_output_callback.cc",
-  "$bindings_modules_v8_output_dir/v8_video_decoder_output_callback.h",
   "$bindings_modules_v8_output_dir/v8_video_encoder_output_callback.cc",
   "$bindings_modules_v8_output_dir/v8_video_encoder_output_callback.h",
+  "$bindings_modules_v8_output_dir/v8_video_frame_output_callback.cc",
+  "$bindings_modules_v8_output_dir/v8_video_frame_output_callback.h",
   "$bindings_modules_v8_output_dir/v8_video_frame_request_callback.cc",
   "$bindings_modules_v8_output_dir/v8_video_frame_request_callback.h",
   "$bindings_modules_v8_output_dir/v8_web_codecs_error_callback.cc",

third_party/blink/renderer/modules/webcodecs/idls.gni

@@ -13,8 +13,8 @@ modules_idl_files = [
 ]
 
 modules_callback_function_idl_files = [
-  "video_decoder_output_callback.idl",
   "video_encoder_output_callback.idl",
+  "video_frame_output_callback.idl",
   "web_codecs_error_callback.idl",
 ]
 

third_party/blink/renderer/modules/webcodecs/video_decoder.h

@@ -13,7 +13,7 @@
 #include "media/base/video_decoder.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_output_callback.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_video_frame_output_callback.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_web_codecs_error_callback.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
@@ -86,7 +86,7 @@ class MODULES_EXPORT VideoDecoder final : public ScriptWrappable {
   void OnOutput(scoped_refptr<media::VideoFrame>);
 
   Member<ScriptState> script_state_;
-  Member<V8VideoDecoderOutputCallback> output_cb_;
+  Member<V8VideoFrameOutputCallback> output_cb_;
   Member<V8WebCodecsErrorCallback> error_cb_;
 
   HeapDeque<Member<Request>> requests_;

third_party/blink/renderer/modules/webcodecs/video_decoder_init.idl

@@ -5,6 +5,6 @@
 // https://github.com/WICG/web-codecs
 
 dictionary VideoDecoderInit {
-  VideoDecoderOutputCallback output;
+  VideoFrameOutputCallback output;
   WebCodecsErrorCallback error;
 };

third_party/blink/renderer/modules/webcodecs/video_decoder_output_callback.idl → third_party/blink/renderer/modules/webcodecs/video_frame_output_callback.idl

@@ -5,4 +5,4 @@
 // https://github.com/WICG/web-codecs
 
 [RuntimeEnabled=WebCodecs]
-callback VideoDecoderOutputCallback = void(VideoFrame output);
+callback VideoFrameOutputCallback = void(VideoFrame output);

third_party/blink/renderer/modules/webcodecs/video_track_reader.cc

@@ -25,7 +25,7 @@ VideoTrackReader::VideoTrackReader(ScriptState* script_state,
               ->GetTaskRunner(TaskType::kInternalMediaRealTime)),
       track_(track) {}
 
-void VideoTrackReader::start(V8VideoDecoderOutputCallback* callback,
+void VideoTrackReader::start(V8VideoFrameOutputCallback* callback,
                              ExceptionState& exception_state) {
   DCHECK(real_time_media_task_runner_->BelongsToCurrentThread());
 

third_party/blink/renderer/modules/webcodecs/video_track_reader.h

@@ -6,7 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBCODECS_VIDEO_TRACK_READER_H_
 
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h"
-#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_output_callback.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_video_frame_output_callback.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
 #include "third_party/blink/renderer/modules/mediastream/media_stream_track.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
@@ -30,7 +30,7 @@ class MODULES_EXPORT VideoTrackReader final
   VideoTrackReader(ScriptState*, MediaStreamTrack*);
 
   // Connects |this| to |track_| and starts delivering frames via |callback_|.
-  void start(V8VideoDecoderOutputCallback*, ExceptionState&);
+  void start(V8VideoFrameOutputCallback*, ExceptionState&);
 
   // Disconnects from |track_| and clears |callback_|.
   void stop(ExceptionState&);
@@ -62,7 +62,7 @@ class MODULES_EXPORT VideoTrackReader final
 
   const scoped_refptr<base::SingleThreadTaskRunner>
       real_time_media_task_runner_;
-  Member<V8VideoDecoderOutputCallback> callback_;
+  Member<V8VideoFrameOutputCallback> callback_;
   Member<MediaStreamTrack> track_;
 };
 

third_party/blink/renderer/modules/webcodecs/video_track_reader.idl

@@ -12,7 +12,7 @@
   constructor(MediaStreamTrack track);
 
   [RaisesException]
-  void start(VideoDecoderOutputCallback callback);
+  void start(VideoFrameOutputCallback callback);
 
   [RaisesException]
   void stop();

third_party/blink/renderer/modules/webcodecs/video_track_reader_writer_test.cc

@@ -61,8 +61,8 @@ class VideoTrackReaderWriterTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  V8VideoDecoderOutputCallback* GetCallback(MockFunction* function) {
-    return V8VideoDecoderOutputCallback::Create(function->Bind());
+  V8VideoFrameOutputCallback* GetCallback(MockFunction* function) {
+    return V8VideoFrameOutputCallback::Create(function->Bind());
   }
 
  private: