[ppapi] Remove PPB_AudioEncoder API

- UMA shows this interface has no usage. This is a Dev API at 0.1. Change-Id: I98aef1dcaf38c9203030526bbdf4e4e51b0e9497 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574487 Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Raymes Khoury <raymes@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: Bill Budge <bbudge@chromium.org> Cr-Commit-Position: refs/heads/master@{#814695}
Denger-Network · Oct 7, 2020 · f7d8dd2 · f7d8dd2
1 parent b30ac1e
commit f7d8dd2
Show file tree

Hide file tree

Showing 36 changed files with 2 additions and 2,121 deletions.
diff --git a/chrome/common/ppapi_utils.cc b/chrome/common/ppapi_utils.cc
@@ -29,7 +29,6 @@
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/c/ppb_audio_config.h"
-#include "ppapi/c/ppb_audio_encoder.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_file_io.h"

diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1960,11 +1960,6 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
   RUN_AUDIO_CONFIG_SUBTESTS;
 }
 
-// Flaky on Windows https://crbug.com/1059468#c18
-#if !defined(OS_WIN) || !defined(ARCH_CPU_32_BITS)
-TEST_PPAPI_NACL(AudioEncoder)
-#endif
-
 // PPB_Audio tests.
 #define RUN_AUDIO_SUBTESTS \
   RunTestViaHTTP( \

diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
@@ -470,8 +470,6 @@ target(link_target_type, "renderer") {
       "pepper/message_channel.h",
       "pepper/pepper_audio_controller.cc",
       "pepper/pepper_audio_controller.h",
-      "pepper/pepper_audio_encoder_host.cc",
-      "pepper/pepper_audio_encoder_host.h",
       "pepper/pepper_audio_input_host.cc",
       "pepper/pepper_audio_input_host.h",
       "pepper/pepper_audio_output_host.cc",

diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -14,7 +14,6 @@
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/pepper/pepper_audio_encoder_host.h"
 #include "content/renderer/pepper/pepper_audio_input_host.h"
 #include "content/renderer/pepper/pepper_audio_output_host.h"
 #include "content/renderer/pepper/pepper_camera_device_host.h"
@@ -156,9 +155,6 @@ ContentRendererPepperHostFactory::CreateResourceHost(
   // Dev interfaces.
   if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) {
     switch (message.type()) {
-      case PpapiHostMsg_AudioEncoder_Create::ID:
-        return std::make_unique<PepperAudioEncoderHost>(host_, instance,
-                                                        resource);
       case PpapiHostMsg_AudioInput_Create::ID:
         return std::make_unique<PepperAudioInputHost>(host_, instance,
                                                       resource);

diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
@@ -62,7 +62,6 @@
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/c/ppb_audio_config.h"
-#include "ppapi/c/ppb_audio_encoder.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_file_io.h"

diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc
@@ -64,10 +64,6 @@ PP_Resource ResourceCreationImpl::CreateAudioTrusted(PP_Instance instance) {
   return (new PPB_Audio_Impl(instance))->GetReference();
 }
 
-PP_Resource ResourceCreationImpl::CreateAudioEncoder(PP_Instance instance) {
-  return 0;  // Not supported in-process.
-}
-
 PP_Resource ResourceCreationImpl::CreateAudioInput(PP_Instance instance) {
   return 0;  // Not supported in-process.
 }

diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h
@@ -33,7 +33,6 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI {
                           PP_Resource config_id,
                           PPB_Audio_Callback audio_callback,
                           void* user_data) override;
-  PP_Resource CreateAudioEncoder(PP_Instance instance) override;
   PP_Resource CreateAudioTrusted(PP_Instance instance) override;
   PP_Resource CreateAudioConfig(PP_Instance instance,
                                 PP_AudioSampleRate sample_rate,

diff --git a/native_client_sdk/src/libraries/ppapi/library.dsc b/native_client_sdk/src/libraries/ppapi/library.dsc
@@ -21,7 +21,6 @@
         'pp_array_output.h',
         'ppb_audio_buffer.h',
         'ppb_audio_config.h',
-        'ppb_audio_encoder.h',
         'ppb_audio.h',
         'ppb_console.h',
         'ppb_core.h',

diff --git a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
@@ -17,7 +17,6 @@
         'audio.cc',
         'audio_buffer.cc',
         'audio_config.cc',
-        'audio_encoder.cc',
         'core.cc',
         'directory_entry.cc',
         'file_io.cc',
@@ -89,7 +88,6 @@
         'array_output.h',
         'audio_buffer.h',
         'audio_config.h',
-        'audio_encoder.h',
         'audio.h',
         'completion_callback.h',
         'core.h',

diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
@@ -32,8 +32,6 @@ test_common_source_files = [
   "tests/test_audio.h",
   "tests/test_audio_config.cc",
   "tests/test_audio_config.h",
-  "tests/test_audio_encoder.cc",
-  "tests/test_audio_encoder.h",
   "tests/test_case.cc",
   "tests/test_case.h",
   "tests/test_console.cc",

diff --git a/ppapi/api/pp_codecs.idl b/ppapi/api/pp_codecs.idl
@@ -23,14 +23,6 @@ enum PP_VideoProfile {
   PP_VIDEOPROFILE_MAX = PP_VIDEOPROFILE_VP9_ANY
 };
 
-/**
- * Audio profiles.
- */
-enum PP_AudioProfile {
-  PP_AUDIOPROFILE_OPUS = 0,
-  PP_AUDIOPROFILE_MAX = PP_AUDIOPROFILE_OPUS
-};
-
 /**
  * Hardware acceleration options.
  */
@@ -187,37 +179,6 @@ struct PP_VideoProfileDescription_0_1 {
   PP_HardwareAcceleration acceleration;
 };
 
-/**
- * Supported audio profile information. See the PPB_AudioEncoder function
- * GetSupportedProfiles() for more details.
- */
-struct PP_AudioProfileDescription {
-  /**
-   * The codec profile.
-   */
-  PP_AudioProfile profile;
-
-  /**
-   * Maximum number of channels that can be encoded.
-   */
-  uint32_t max_channels;
-
-  /**
-   * Sample size.
-   */
-  uint32_t sample_size;
-
-  /**
-   * Sampling rate that can be encoded
-   */
-  uint32_t sample_rate;
-
-  /**
-   * Whether the profile is hardware accelerated.
-   */
-  PP_Bool hardware_accelerated;
-};
-
 /**
  * Struct describing a bitstream buffer.
  */

diff --git a/ppapi/api/ppb_audio_encoder.idl b/ppapi/api/ppb_audio_encoder.idl
diff --git a/ppapi/c/BUILD.gn b/ppapi/c/BUILD.gn
@@ -29,7 +29,6 @@ source_set("c") {
     "ppb_audio.h",
     "ppb_audio_buffer.h",
     "ppb_audio_config.h",
-    "ppb_audio_encoder.h",
     "ppb_console.h",
     "ppb_core.h",
     "ppb_file_io.h",