| Index: ppapi/proxy/media_stream_audio_track_resource.h
|
| diff --git a/ppapi/proxy/media_stream_video_track_resource.h b/ppapi/proxy/media_stream_audio_track_resource.h
|
| similarity index 55%
|
| copy from ppapi/proxy/media_stream_video_track_resource.h
|
| copy to ppapi/proxy/media_stream_audio_track_resource.h
|
| index e402b0c68effbe1ee260132ba661a28989442cd7..71fd9ca15d1535b2011ef80b4a0da01d7e45dbf3 100644
|
| --- a/ppapi/proxy/media_stream_video_track_resource.h
|
| +++ b/ppapi/proxy/media_stream_audio_track_resource.h
|
| @@ -1,41 +1,42 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
|
| -#define PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
|
| +#ifndef PPAPI_PROXY_MEDIA_STREAM_AUDIO_TRACK_RESOURCE_H_
|
| +#define PPAPI_PROXY_MEDIA_STREAM_AUDIO_TRACK_RESOURCE_H_
|
|
|
| #include <map>
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "ppapi/proxy/media_stream_track_resource_base.h"
|
| #include "ppapi/proxy/ppapi_proxy_export.h"
|
| -#include "ppapi/thunk/ppb_media_stream_video_track_api.h"
|
| +#include "ppapi/thunk/ppb_media_stream_audio_track_api.h"
|
|
|
| namespace ppapi {
|
| namespace proxy {
|
|
|
| -class VideoFrameResource;
|
| +class AudioFrameResource;
|
|
|
| -class PPAPI_PROXY_EXPORT MediaStreamVideoTrackResource
|
| +class PPAPI_PROXY_EXPORT MediaStreamAudioTrackResource
|
| : public MediaStreamTrackResourceBase,
|
| - public thunk::PPB_MediaStreamVideoTrack_API {
|
| + public thunk::PPB_MediaStreamAudioTrack_API {
|
| public:
|
| - MediaStreamVideoTrackResource(Connection connection,
|
| + MediaStreamAudioTrackResource(Connection connection,
|
| PP_Instance instance,
|
| int pending_renderer_id,
|
| const std::string& id);
|
|
|
| - virtual ~MediaStreamVideoTrackResource();
|
| + virtual ~MediaStreamAudioTrackResource();
|
|
|
| // Resource overrides:
|
| - virtual thunk::PPB_MediaStreamVideoTrack_API*
|
| - AsPPB_MediaStreamVideoTrack_API() OVERRIDE;
|
| + virtual thunk::PPB_MediaStreamAudioTrack_API*
|
| + AsPPB_MediaStreamAudioTrack_API() OVERRIDE;
|
|
|
| - // PPB_MediaStreamVideoTrack_API overrides:
|
| + // PPB_MediaStreamAudioTrack_API overrides:
|
| virtual PP_Var GetId() OVERRIDE;
|
| virtual PP_Bool HasEnded() OVERRIDE;
|
| - virtual int32_t Configure(uint32_t max_buffered_frames) OVERRIDE;
|
| + virtual int32_t Configure(uint32_t samples_per_frame,
|
| + uint32_t max_buffered_frames) OVERRIDE;
|
| virtual int32_t GetFrame(
|
| PP_Resource* frame,
|
| scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| @@ -46,22 +47,22 @@ class PPAPI_PROXY_EXPORT MediaStreamVideoTrackResource
|
| virtual void OnNewFrameEnqueued() OVERRIDE;
|
|
|
| private:
|
| - PP_Resource GetVideoFrame();
|
| + PP_Resource GetAudioFrame();
|
|
|
| void ReleaseFrames();
|
|
|
| // Allocated frame resources by |GetFrame()|.
|
| - typedef std::map<PP_Resource, scoped_refptr<VideoFrameResource> > FrameMap;
|
| + typedef std::map<PP_Resource, scoped_refptr<AudioFrameResource> > FrameMap;
|
| FrameMap frames_;
|
|
|
| PP_Resource* get_frame_output_;
|
|
|
| scoped_refptr<TrackedCallback> get_frame_callback_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrackResource);
|
| + DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioTrackResource);
|
| };
|
|
|
| } // namespace proxy
|
| } // namespace ppapi
|
|
|
| -#endif // PPAPI_PROXY_MEDIA_STREAM_VIDEO_TRACK_RESOURCE_H_
|
| +#endif // PPAPI_PROXY_MEDIA_STREAM_AUDIO_TRACK_RESOURCE_H_
|
|
|