From 99f31604136d66ae10e20669fb6b5716f342bde0 Mon Sep 17 00:00:00 2001
From: Chris Watkins <watk@google.com>
Date: Fri, 20 Mar 2015 13:06:33 -0700
Subject: Unhide the android.media.[Media]DataSource interface.

This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
 * IDataSource:        The binder interface for DataSource.
 * JMediaDataSource:   The native counterpart to the java interface. It
                       implements IDataSource.
 * CallbackDataSource: A stagefright DataSource that wraps an
                       IDataSource.

Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
---
 media/libmediaplayerservice/nuplayer/GenericSource.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h
index 862ee5f..2f6e78e 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.h
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.h
@@ -32,6 +32,7 @@ class DrmManagerClient;
 struct AnotherPacketSource;
 struct ARTSPController;
 struct DataSource;
+struct IDataSource;
 struct IMediaHTTPService;
 struct MediaSource;
 class MediaBuffer;
@@ -48,6 +49,8 @@ struct NuPlayer::GenericSource : public NuPlayer::Source {
 
     status_t setDataSource(int fd, int64_t offset, int64_t length);
 
+    status_t setDataSource(const sp<DataSource>& dataSource);
+
     virtual void prepareAsync();
 
     virtual void start();
-- 
cgit v1.1