summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-03-10 10:55:35 -0800
committerAndreas Huber <andih@google.com>2010-03-10 10:55:35 -0800
commit2e39c1ca101e01ff13b03129a87939e7982b25bf (patch)
tree358a6b713ba8244901ebc16860e9983c00bb53d2 /include/media
parentb699c595d78e8cd7f60c2c5102d40db07b18926b (diff)
downloadframeworks_av-2e39c1ca101e01ff13b03129a87939e7982b25bf.zip
frameworks_av-2e39c1ca101e01ff13b03129a87939e7982b25bf.tar.gz
frameworks_av-2e39c1ca101e01ff13b03129a87939e7982b25bf.tar.bz2
Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files.
Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384 related-to-bug: 2074137
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/StagefrightMediaScanner.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/StagefrightMediaScanner.h b/include/media/stagefright/StagefrightMediaScanner.h
index af125dc..4437eee 100644
--- a/include/media/stagefright/StagefrightMediaScanner.h
+++ b/include/media/stagefright/StagefrightMediaScanner.h
@@ -22,7 +22,7 @@
namespace android {
-struct StagefrightMetadataRetriever;
+struct MediaMetadataRetriever;
struct StagefrightMediaScanner : public MediaScanner {
StagefrightMediaScanner();
@@ -35,7 +35,7 @@ struct StagefrightMediaScanner : public MediaScanner {
virtual char *extractAlbumArt(int fd);
private:
- sp<StagefrightMetadataRetriever> mRetriever;
+ sp<MediaMetadataRetriever> mRetriever;
StagefrightMediaScanner(const StagefrightMediaScanner &);
StagefrightMediaScanner &operator=(const StagefrightMediaScanner &);