Commit 885d0ac3 authored by Matt Wolenetz's avatar Matt Wolenetz Committed by Commit Bot

[webcodecs] Rename EncodedAudioConfig to AudioDecoderConfig

BUG=1149601

Change-Id: I6a38cd899ed4a862489616b5e1c7dfe608ea04a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541668
Commit-Queue: Matthew Wolenetz <wolenetz@chromium.org>
Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828041}
parent 513535c0
...@@ -115,6 +115,8 @@ generated_dictionary_sources_in_modules = [ ...@@ -115,6 +115,8 @@ generated_dictionary_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_configuration.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_configuration.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_context_options.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_context_options.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_context_options.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_context_options.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_frame_init.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_audio_frame_init.cc",
...@@ -259,8 +261,6 @@ generated_dictionary_sources_in_modules = [ ...@@ -259,8 +261,6 @@ generated_dictionary_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_dynamics_compressor_options.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_dynamics_compressor_options.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.h", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_event_source_init.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_event_source_init.cc",
......
...@@ -732,6 +732,7 @@ static_idl_files_in_modules = get_path_info( ...@@ -732,6 +732,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/webaudio/wave_shaper_node.idl", "//third_party/blink/renderer/modules/webaudio/wave_shaper_node.idl",
"//third_party/blink/renderer/modules/webaudio/wave_shaper_options.idl", "//third_party/blink/renderer/modules/webaudio/wave_shaper_options.idl",
"//third_party/blink/renderer/modules/webcodecs/audio_decoder.idl", "//third_party/blink/renderer/modules/webcodecs/audio_decoder.idl",
"//third_party/blink/renderer/modules/webcodecs/audio_decoder_config.idl",
"//third_party/blink/renderer/modules/webcodecs/audio_decoder_init.idl", "//third_party/blink/renderer/modules/webcodecs/audio_decoder_init.idl",
"//third_party/blink/renderer/modules/webcodecs/audio_frame.idl", "//third_party/blink/renderer/modules/webcodecs/audio_frame.idl",
"//third_party/blink/renderer/modules/webcodecs/audio_frame_init.idl", "//third_party/blink/renderer/modules/webcodecs/audio_frame_init.idl",
...@@ -739,7 +740,6 @@ static_idl_files_in_modules = get_path_info( ...@@ -739,7 +740,6 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/webcodecs/codec_state.idl", "//third_party/blink/renderer/modules/webcodecs/codec_state.idl",
"//third_party/blink/renderer/modules/webcodecs/encoded_audio_chunk.idl", "//third_party/blink/renderer/modules/webcodecs/encoded_audio_chunk.idl",
"//third_party/blink/renderer/modules/webcodecs/encoded_audio_chunk_init.idl", "//third_party/blink/renderer/modules/webcodecs/encoded_audio_chunk_init.idl",
"//third_party/blink/renderer/modules/webcodecs/encoded_audio_config.idl",
"//third_party/blink/renderer/modules/webcodecs/encoded_video_chunk.idl", "//third_party/blink/renderer/modules/webcodecs/encoded_video_chunk.idl",
"//third_party/blink/renderer/modules/webcodecs/encoded_video_chunk_init.idl", "//third_party/blink/renderer/modules/webcodecs/encoded_video_chunk_init.idl",
"//third_party/blink/renderer/modules/webcodecs/image_decoder.idl", "//third_party/blink/renderer/modules/webcodecs/image_decoder.idl",
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "media/base/supported_types.h" #include "media/base/supported_types.h"
#include "media/base/waiting.h" #include "media/base/waiting.h"
#include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h" #include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h"
#include "third_party/blink/renderer/modules/webcodecs/audio_decoder_broker.h" #include "third_party/blink/renderer/modules/webcodecs/audio_decoder_broker.h"
#include "third_party/blink/renderer/modules/webcodecs/codec_config_eval.h" #include "third_party/blink/renderer/modules/webcodecs/codec_config_eval.h"
#include "third_party/blink/renderer/platform/instrumentation/use_counter.h" #include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
......
...@@ -33,9 +33,9 @@ class MediaLog; ...@@ -33,9 +33,9 @@ class MediaLog;
namespace blink { namespace blink {
class AudioDecoderConfig;
class AudioFrame; class AudioFrame;
class EncodedAudioChunk; class EncodedAudioChunk;
class EncodedAudioConfig;
class ExceptionState; class ExceptionState;
class AudioDecoderInit; class AudioDecoderInit;
class V8AudioFrameOutputCallback; class V8AudioFrameOutputCallback;
...@@ -47,7 +47,7 @@ class MODULES_EXPORT AudioDecoderTraits { ...@@ -47,7 +47,7 @@ class MODULES_EXPORT AudioDecoderTraits {
using MediaOutputType = media::AudioBuffer; using MediaOutputType = media::AudioBuffer;
using MediaDecoderType = media::AudioDecoder; using MediaDecoderType = media::AudioDecoder;
using OutputCallbackType = V8AudioFrameOutputCallback; using OutputCallbackType = V8AudioFrameOutputCallback;
using ConfigType = EncodedAudioConfig; using ConfigType = AudioDecoderConfig;
using MediaConfigType = media::AudioDecoderConfig; using MediaConfigType = media::AudioDecoderConfig;
using InputType = EncodedAudioChunk; using InputType = EncodedAudioChunk;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
// The next decode request must be for a keyframe. // The next decode request must be for a keyframe.
// //
// TODO(chcunningham): Move the keyframe rule into the bytestream registry. // TODO(chcunningham): Move the keyframe rule into the bytestream registry.
[RaisesException] void configure(EncodedAudioConfig config); [RaisesException] void configure(AudioDecoderConfig config);
// Request decoding of an input chunk. // Request decoding of an input chunk.
// //
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// https://github.com/WICG/web-codecs // https://github.com/WICG/web-codecs
dictionary EncodedAudioConfig { dictionary AudioDecoderConfig {
// TODO(chcunningham): reference spec registry. // TODO(chcunningham): reference spec registry.
required DOMString codec; required DOMString codec;
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "testing/libfuzzer/proto/lpm_interface.h" #include "testing/libfuzzer/proto/lpm_interface.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h" #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_frame_output_callback.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_frame_output_callback.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_web_codecs_error_callback.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_web_codecs_error_callback.h"
#include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/frame/settings.h" #include "third_party/blink/renderer/core/frame/settings.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "third_party/blink/renderer/bindings/core/v8/script_function.h" #include "third_party/blink/renderer/bindings/core/v8/script_function.h"
#include "third_party/blink/renderer/bindings/core/v8/script_value.h" #include "third_party/blink/renderer/bindings/core/v8/script_value.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_image_bitmap_options.h" #include "third_party/blink/renderer/bindings/core/v8/v8_image_bitmap_options.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_chunk_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_video_chunk_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h"
...@@ -56,9 +56,9 @@ VideoDecoderConfig* MakeVideoDecoderConfig( ...@@ -56,9 +56,9 @@ VideoDecoderConfig* MakeVideoDecoderConfig(
return config; return config;
} }
EncodedAudioConfig* MakeAudioDecoderConfig( AudioDecoderConfig* MakeAudioDecoderConfig(
const wc_fuzzer::ConfigureAudioDecoder& proto) { const wc_fuzzer::ConfigureAudioDecoder& proto) {
EncodedAudioConfig* config = EncodedAudioConfig::Create(); AudioDecoderConfig* config = AudioDecoderConfig::Create();
config->setCodec(proto.codec().c_str()); config->setCodec(proto.codec().c_str());
config->setSampleRate(proto.sample_rate()); config->setSampleRate(proto.sample_rate());
config->setNumberOfChannels(proto.number_of_channels()); config->setNumberOfChannels(proto.number_of_channels());
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "third_party/blink/renderer/bindings/core/v8/script_function.h" #include "third_party/blink/renderer/bindings/core/v8/script_function.h"
#include "third_party/blink/renderer/bindings/core/v8/script_value.h" #include "third_party/blink/renderer/bindings/core/v8/script_value.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_encoded_audio_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_config.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_decoder_init.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_encoder_config.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_encoder_config.h"
...@@ -40,7 +40,7 @@ class FakeFunction : public ScriptFunction { ...@@ -40,7 +40,7 @@ class FakeFunction : public ScriptFunction {
VideoDecoderConfig* MakeVideoDecoderConfig( VideoDecoderConfig* MakeVideoDecoderConfig(
const wc_fuzzer::ConfigureVideoDecoder& proto); const wc_fuzzer::ConfigureVideoDecoder& proto);
EncodedAudioConfig* MakeAudioDecoderConfig( AudioDecoderConfig* MakeAudioDecoderConfig(
const wc_fuzzer::ConfigureAudioDecoder& proto); const wc_fuzzer::ConfigureAudioDecoder& proto);
VideoEncoderConfig* MakeEncoderConfig( VideoEncoderConfig* MakeEncoderConfig(
......
...@@ -23,9 +23,9 @@ modules_callback_function_idl_files = [ ...@@ -23,9 +23,9 @@ modules_callback_function_idl_files = [
] ]
modules_dictionary_idl_files = [ modules_dictionary_idl_files = [
"audio_decoder_config.idl",
"audio_decoder_init.idl", "audio_decoder_init.idl",
"encoded_video_chunk_init.idl", "encoded_video_chunk_init.idl",
"encoded_audio_config.idl",
"encoded_audio_chunk_init.idl", "encoded_audio_chunk_init.idl",
"image_decoder_init.idl", "image_decoder_init.idl",
"image_frame.idl", "image_frame.idl",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment