| Index: ppapi/proxy/audio_buffer_resource.h
|
| diff --git a/ppapi/proxy/audio_frame_resource.h b/ppapi/proxy/audio_buffer_resource.h
|
| similarity index 60%
|
| rename from ppapi/proxy/audio_frame_resource.h
|
| rename to ppapi/proxy/audio_buffer_resource.h
|
| index 8332ec295cfe58612947ca318ad950b03cf87dae..b4ef3eb760cde45e1aa3da2407c7c456d6a8eca4 100644
|
| --- a/ppapi/proxy/audio_frame_resource.h
|
| +++ b/ppapi/proxy/audio_buffer_resource.h
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef PPAPI_PROXY_AUDIO_FRAME_RESOURCE_H_
|
| -#define PPAPI_PROXY_AUDIO_FRAME_RESOURCE_H_
|
| +#ifndef PPAPI_PROXY_AUDIO_BUFFER_RESOURCE_H_
|
| +#define PPAPI_PROXY_AUDIO_BUFFER_RESOURCE_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "ppapi/proxy/ppapi_proxy_export.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| -#include "ppapi/thunk/ppb_audio_frame_api.h"
|
| +#include "ppapi/thunk/ppb_audio_buffer_api.h"
|
|
|
| namespace ppapi {
|
|
|
| @@ -17,23 +17,24 @@ union MediaStreamBuffer;
|
|
|
| namespace proxy {
|
|
|
| -class PPAPI_PROXY_EXPORT AudioFrameResource : public Resource,
|
| - public thunk::PPB_AudioFrame_API {
|
| +class PPAPI_PROXY_EXPORT AudioBufferResource
|
| + : public Resource,
|
| + public thunk::PPB_AudioBuffer_API {
|
| public:
|
| - AudioFrameResource(PP_Instance instance,
|
| + AudioBufferResource(PP_Instance instance,
|
| int32_t index,
|
| MediaStreamBuffer* buffer);
|
|
|
| - virtual ~AudioFrameResource();
|
| + virtual ~AudioBufferResource();
|
|
|
| // PluginResource overrides:
|
| - virtual thunk::PPB_AudioFrame_API* AsPPB_AudioFrame_API() OVERRIDE;
|
| + virtual thunk::PPB_AudioBuffer_API* AsPPB_AudioBuffer_API() OVERRIDE;
|
|
|
| - // PPB_AudioFrame_API overrides:
|
| + // PPB_AudioBuffer_API overrides:
|
| virtual PP_TimeDelta GetTimestamp() OVERRIDE;
|
| virtual void SetTimestamp(PP_TimeDelta timestamp) OVERRIDE;
|
| - virtual PP_AudioFrame_SampleRate GetSampleRate() OVERRIDE;
|
| - virtual PP_AudioFrame_SampleSize GetSampleSize() OVERRIDE;
|
| + virtual PP_AudioBuffer_SampleRate GetSampleRate() OVERRIDE;
|
| + virtual PP_AudioBuffer_SampleSize GetSampleSize() OVERRIDE;
|
| virtual uint32_t GetNumberOfChannels() OVERRIDE;
|
| virtual uint32_t GetNumberOfSamples() OVERRIDE;
|
| virtual void* GetDataBuffer() OVERRIDE;
|
| @@ -42,15 +43,15 @@ class PPAPI_PROXY_EXPORT AudioFrameResource : public Resource,
|
| virtual int32_t GetBufferIndex() OVERRIDE;
|
| virtual void Invalidate() OVERRIDE;
|
|
|
| - // Frame index
|
| + // Buffer index
|
| int32_t index_;
|
|
|
| MediaStreamBuffer* buffer_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AudioFrameResource);
|
| + DISALLOW_COPY_AND_ASSIGN(AudioBufferResource);
|
| };
|
|
|
| } // namespace proxy
|
| } // namespace ppapi
|
|
|
| -#endif // PPAPI_PROXY_AUDIO_FRAME_RESOURCE_H_
|
| +#endif // PPAPI_PROXY_AUDIO_BUFFER_RESOURCE_H_
|
|
|