69b8d69aad
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700
suspend() and resume() methods on VideoView are back but don't do anything.
They need to be back because they were public before.
Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425
commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700
Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."
This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.
Conflicts:
api/current.xml
Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5
commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700
Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.
commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700
Revert "Release MediaPlayer if suspend() returns false."
This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.
commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700
manually.
Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87
Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
99 lines
3.9 KiB
C++
99 lines
3.9 KiB
C++
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_IMEDIAPLAYER_H
|
|
#define ANDROID_IMEDIAPLAYER_H
|
|
|
|
#include <utils/RefBase.h>
|
|
#include <binder/IInterface.h>
|
|
#include <binder/Parcel.h>
|
|
|
|
namespace android {
|
|
|
|
class Parcel;
|
|
class ISurface;
|
|
class Surface;
|
|
|
|
class IMediaPlayer: public IInterface
|
|
{
|
|
public:
|
|
DECLARE_META_INTERFACE(MediaPlayer);
|
|
|
|
virtual void disconnect() = 0;
|
|
|
|
virtual status_t setVideoISurface(const sp<ISurface>& surface) = 0;
|
|
virtual status_t setVideoSurface(const sp<Surface>& surface) = 0;
|
|
virtual status_t prepareAsync() = 0;
|
|
virtual status_t start() = 0;
|
|
virtual status_t stop() = 0;
|
|
virtual status_t pause() = 0;
|
|
virtual status_t isPlaying(bool* state) = 0;
|
|
virtual status_t seekTo(int msec) = 0;
|
|
virtual status_t getCurrentPosition(int* msec) = 0;
|
|
virtual status_t getDuration(int* msec) = 0;
|
|
virtual status_t reset() = 0;
|
|
virtual status_t setAudioStreamType(int type) = 0;
|
|
virtual status_t setLooping(int loop) = 0;
|
|
virtual status_t setVolume(float leftVolume, float rightVolume) = 0;
|
|
virtual status_t setAuxEffectSendLevel(float level) = 0;
|
|
virtual status_t attachAuxEffect(int effectId) = 0;
|
|
|
|
// Invoke a generic method on the player by using opaque parcels
|
|
// for the request and reply.
|
|
// @param request Parcel that must start with the media player
|
|
// interface token.
|
|
// @param[out] reply Parcel to hold the reply data. Cannot be null.
|
|
// @return OK if the invocation was made successfully.
|
|
virtual status_t invoke(const Parcel& request, Parcel *reply) = 0;
|
|
|
|
// Set a new metadata filter.
|
|
// @param filter A set of allow and drop rules serialized in a Parcel.
|
|
// @return OK if the invocation was made successfully.
|
|
virtual status_t setMetadataFilter(const Parcel& filter) = 0;
|
|
|
|
// Retrieve a set of metadata.
|
|
// @param update_only Include only the metadata that have changed
|
|
// since the last invocation of getMetadata.
|
|
// The set is built using the unfiltered
|
|
// notifications the native player sent to the
|
|
// MediaPlayerService during that period of
|
|
// time. If false, all the metadatas are considered.
|
|
// @param apply_filter If true, once the metadata set has been built based
|
|
// on the value update_only, the current filter is
|
|
// applied.
|
|
// @param[out] metadata On exit contains a set (possibly empty) of metadata.
|
|
// Valid only if the call returned OK.
|
|
// @return OK if the invocation was made successfully.
|
|
virtual status_t getMetadata(bool update_only,
|
|
bool apply_filter,
|
|
Parcel *metadata) = 0;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class BnMediaPlayer: public BnInterface<IMediaPlayer>
|
|
{
|
|
public:
|
|
virtual status_t onTransact( uint32_t code,
|
|
const Parcel& data,
|
|
Parcel* reply,
|
|
uint32_t flags = 0);
|
|
};
|
|
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_IMEDIAPLAYER_H
|