| Index: content/browser/media/android/browser_demuxer_android.h
|
| diff --git a/content/browser/media/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h
|
| deleted file mode 100644
|
| index 5ff37f0a3c3625a37d66751a54f800d1a6b23cf3..0000000000000000000000000000000000000000
|
| --- a/content/browser/media/android/browser_demuxer_android.h
|
| +++ /dev/null
|
| @@ -1,76 +0,0 @@
|
| -// Copyright 2013 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 CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
|
| -#define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
|
| -
|
| -#include <map>
|
| -
|
| -#include "base/id_map.h"
|
| -#include "base/macros.h"
|
| -#include "content/public/browser/browser_message_filter.h"
|
| -#include "media/base/android/demuxer_android.h"
|
| -
|
| -namespace content {
|
| -
|
| -// Represents the browser process half of an IPC-based demuxer proxy.
|
| -// It vends out media::DemuxerAndroid instances that are registered with an
|
| -// end point in the renderer process.
|
| -//
|
| -// Refer to RendererDemuxerAndroid for the renderer process half.
|
| -class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
|
| - public:
|
| - BrowserDemuxerAndroid();
|
| -
|
| - // BrowserMessageFilter overrides.
|
| - base::TaskRunner* OverrideTaskRunnerForMessage(
|
| - const IPC::Message& message) override;
|
| -
|
| - bool OnMessageReceived(const IPC::Message& message) override;
|
| -
|
| - // Returns an uninitialized demuxer implementation associated with
|
| - // |demuxer_client_id|, which can be used to communicate with the real demuxer
|
| - // in the renderer process.
|
| - std::unique_ptr<media::DemuxerAndroid> CreateDemuxer(int demuxer_client_id);
|
| -
|
| - protected:
|
| - friend class base::RefCountedThreadSafe<BrowserDemuxerAndroid>;
|
| - ~BrowserDemuxerAndroid() override;
|
| -
|
| - private:
|
| - class Internal;
|
| -
|
| - // Called by internal demuxer implementations to add/remove a client
|
| - // association.
|
| - void AddDemuxerClient(int demuxer_client_id,
|
| - media::DemuxerAndroidClient* client);
|
| - void RemoveDemuxerClient(int demuxer_client_id);
|
| -
|
| - // IPC message handlers.
|
| - void OnDemuxerReady(int demuxer_client_id,
|
| - const media::DemuxerConfigs& configs);
|
| - void OnReadFromDemuxerAck(int demuxer_client_id,
|
| - const media::DemuxerData& data);
|
| - void OnDemuxerSeekDone(int demuxer_client_id,
|
| - const base::TimeDelta& actual_browser_seek_time);
|
| - void OnDurationChanged(int demuxer_client_id,
|
| - const base::TimeDelta& duration);
|
| -
|
| - IDMap<media::DemuxerAndroidClient> demuxer_clients_;
|
| -
|
| - // When the demuxer client is created on UI thread but demuxer
|
| - // messages arrive on Media thread their relative order is undefined.
|
| - // Use |pending_configs_| map to keep the upcoming configurations
|
| - // until the client is created.
|
| - typedef std::map<int, media::DemuxerConfigs> ConfigsPerClient;
|
| - ConfigsPerClient pending_configs_;
|
| -
|
| - base::SingleThreadTaskRunner* task_runner_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
|
| -};
|
| -
|
| -} // namespace content
|
| -
|
| -#endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
|
|
|