video_encode_accelerator.mojom: Remove deprecated functions and structures

BUG=chromium:895230
TEST=CtsMediaTestCases

Change-Id: If928fa30cf6800809242b467c472b4549926f3d0
Reviewed-on: https://chromium-review.googlesource.com/c/1325584Reviewed-by: Pawel Osciak <posciak@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607116}

components/arc/common/video_encode_accelerator.mojom

@@ -64,39 +64,9 @@ struct VideoEncodeAcceleratorConfig {
   [MinVersion=1] VideoFrameStorageType storage_type;
 };
 
-
-// The encoder parameter set which matches to
-// media::VideoEncodeAccelerator::Config.
-//  |input_format| is the pixel format of the input frames.
-//  |input_visible_size| is the resolution of the input frames.
-//  |output_profile| is the codec profile of the encoded output stream.
-//  |initial_bitrate| is the initial bitrate of the encoded output stream,
-//  in bits per second.
-//  |initial_framerate| is the initial requested framerate. It is optional, only
-//  valid when |has_initial_framerate| is true.
-//  |h264_output_level| is H264 level of encoded output stream. It is optional,
-//  only valid when |has_h264_output_level| is true.
-struct VideoEncodeAcceleratorConfigDeprecated {
-  VideoPixelFormat input_format;
-  Size input_visible_size;
-  VideoCodecProfile output_profile;
-  uint32 initial_bitrate;
-  uint32 initial_framerate;
-  bool has_initial_framerate;
-  uint8 h264_output_level;
-  bool has_h264_output_level;
-};
-
 // Video encoder IPC interface.
 // Next Method ID: 8
 interface VideoEncodeAccelerator {
-  // The input buffer storage type.
-  [Extensible]
-  enum StorageTypeDeprecated {
-    SHARED_MEMORY,
-    DMABUF,
-  };
-
   // Enumeration of potential errors generated by the API.
   [Extensible]
   enum Error {
@@ -129,20 +99,6 @@ interface VideoEncodeAccelerator {
   Initialize@7(VideoEncodeAcceleratorConfig config,
                VideoEncodeClient client) => (bool success);
 
-  // Initializes the video encoder with specific configuration.  Called once per
-  // encoder construction.
-  // Parameters:
-  //  |config| is the parameter set for encoder initialization.
-  //  |input_storage| the type of the input buffer.
-  //  |client| is the client of this video encoder. The client must be valid
-  //  during the lifetime of this accelerator.
-  // Callback:
-  //  Called with true iff initialization is successful. The client should not
-  //  invoke any other methods before the callback.
-  InitializeDeprecated@6(VideoEncodeAcceleratorConfigDeprecated config,
-                         StorageTypeDeprecated input_storage,
-                         VideoEncodeClient client) => (bool success);
-
   // Encodes the given frame.
   // Parameters:
   //  |frame_fd| is the handle of the video frame buffer. This could be the

components/arc/common/video_encode_accelerator.typemap

@@ -22,5 +22,4 @@ type_mappings = [
   "arc.mojom.VideoPixelFormat=media::VideoPixelFormat",
   "arc.mojom.VideoEncodeProfile=media::VideoEncodeAccelerator::SupportedProfile",
   "arc.mojom.VideoEncodeAcceleratorConfig=media::VideoEncodeAccelerator::Config",
-  "arc.mojom.VideoEncodeAcceleratorConfigDeprecated=media::VideoEncodeAccelerator::Config",
 ]

components/arc/common/video_encode_accelerator_struct_traits.cc

@@ -147,37 +147,4 @@ bool StructTraits<arc::mojom::VideoEncodeAcceleratorConfigDataView,
   return true;
 }
 
-// static
-bool StructTraits<arc::mojom::VideoEncodeAcceleratorConfigDeprecatedDataView,
-                  media::VideoEncodeAccelerator::Config>::
-    Read(arc::mojom::VideoEncodeAcceleratorConfigDeprecatedDataView input,
-         media::VideoEncodeAccelerator::Config* output) {
-  media::VideoPixelFormat input_format;
-  if (!input.ReadInputFormat(&input_format))
-    return false;
-
-  gfx::Size input_visible_size;
-  if (!input.ReadInputVisibleSize(&input_visible_size))
-    return false;
-
-  media::VideoCodecProfile output_profile;
-  if (!input.ReadOutputProfile(&output_profile))
-    return false;
-
-  base::Optional<uint32_t> initial_framerate;
-  if (input.has_initial_framerate()) {
-    initial_framerate = input.initial_framerate();
-  }
-
-  base::Optional<uint8_t> h264_output_level;
-  if (input.has_h264_output_level()) {
-    h264_output_level = input.h264_output_level();
-  }
-
-  *output = media::VideoEncodeAccelerator::Config(
-      input_format, input_visible_size, output_profile, input.initial_bitrate(),
-      initial_framerate, h264_output_level);
-  return true;
-}
-
 }  // namespace mojo

components/arc/common/video_encode_accelerator_struct_traits.h

@@ -124,54 +124,6 @@ struct StructTraits<arc::mojom::VideoEncodeAcceleratorConfigDataView,
                    media::VideoEncodeAccelerator::Config* output);
 };
 
-template <>
-struct StructTraits<arc::mojom::VideoEncodeAcceleratorConfigDeprecatedDataView,
-                    media::VideoEncodeAccelerator::Config> {
-  static media::VideoPixelFormat input_format(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.input_format;
-  }
-
-  static const gfx::Size& input_visible_size(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.input_visible_size;
-  }
-
-  static media::VideoCodecProfile output_profile(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.output_profile;
-  }
-
-  static uint32_t initial_bitrate(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.initial_bitrate;
-  }
-
-  static uint32_t initial_framerate(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.initial_framerate.value_or(0);
-  }
-
-  static bool has_initial_framerate(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.initial_framerate.has_value();
-  }
-
-  static uint8_t h264_output_level(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.h264_output_level.value_or(0);
-  }
-
-  static bool has_h264_output_level(
-      const media::VideoEncodeAccelerator::Config& input) {
-    return input.h264_output_level.has_value();
-  }
-
-  static bool Read(
-      arc::mojom::VideoEncodeAcceleratorConfigDeprecatedDataView input,
-      media::VideoEncodeAccelerator::Config* output);
-};
-
 }  // namespace mojo
 
 #endif  // COMPONENTS_ARC_COMMON_VIDEO_ENCODE_ACCELERATOR_STRUCT_TRAITS_H_

components/arc/video_accelerator/gpu_arc_video_encode_accelerator.cc

@@ -99,15 +99,6 @@ void GpuArcVideoEncodeAccelerator::Initialize(
   std::move(callback).Run(true);
 }
 
-void GpuArcVideoEncodeAccelerator::InitializeDeprecated(
-    const media::VideoEncodeAccelerator::Config& config,
-    VideoEncodeAccelerator::StorageTypeDeprecated input_storage,
-    VideoEncodeClientPtr client,
-    InitializeCallback callback) {
-  // Intentionally ignore input_storage. It has never been used since now.
-  Initialize(config, std::move(client), std::move(callback));
-}
-
 static void DropShareMemoryAndVideoFrameDoneNotifier(
     std::unique_ptr<base::SharedMemory> shm,
     std::unique_ptr<VideoFrameDoneNotifier> notifier) {

components/arc/video_accelerator/gpu_arc_video_encode_accelerator.h

@@ -48,11 +48,6 @@ class GpuArcVideoEncodeAccelerator
   void Initialize(const media::VideoEncodeAccelerator::Config& config,
                   VideoEncodeClientPtr client,
                   InitializeCallback callback) override;
-  void InitializeDeprecated(
-      const media::VideoEncodeAccelerator::Config& config,
-      VideoEncodeAccelerator::StorageTypeDeprecated input_storage,
-      VideoEncodeClientPtr client,
-      InitializeCallback callback) override;
   void Encode(mojo::ScopedHandle fd,
               std::vector<::arc::VideoFramePlane> planes,
               int64_t timestamp,