diff options
| author | Andreas Huber <andih@google.com> | 2013-06-12 10:26:19 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-06-12 11:01:58 -0700 |
| commit | 9fef8d453b15a91a2b748faac2bfaff713bcf1e1 (patch) | |
| tree | 4e5095d5a9dcc55cf4a69b9a68e9fc88620c3700 /media/libstagefright/wifi-display/source/PlaybackSession.cpp | |
| parent | 63e9f73c2db01fec30246adbcfea2880671e2108 (diff) | |
| download | frameworks_av-9fef8d453b15a91a2b748faac2bfaff713bcf1e1.zip frameworks_av-9fef8d453b15a91a2b748faac2bfaff713bcf1e1.tar.gz frameworks_av-9fef8d453b15a91a2b748faac2bfaff713bcf1e1.tar.bz2 | |
Converter now takes the desired _output_ format instead of the
input format, allowing control over the type of encoding.
Change-Id: Iaaa1a825f447ea130e373bbd8e5dc96f2762db18
Diffstat (limited to 'media/libstagefright/wifi-display/source/PlaybackSession.cpp')
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 7f0ba96..a15fbac 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -937,6 +937,7 @@ status_t WifiDisplaySource::PlaybackSession::addSource( CHECK_EQ(err, (status_t)OK); if (isVideo) { + format->setString("mime", MEDIA_MIMETYPE_VIDEO_AVC); format->setInt32("store-metadata-in-buffers", true); format->setInt32("store-metadata-in-buffers-output", (mHDCP != NULL)); format->setInt32( @@ -944,13 +945,17 @@ status_t WifiDisplaySource::PlaybackSession::addSource( format->setInt32("profile-idc", profileIdc); format->setInt32("level-idc", levelIdc); format->setInt32("constraint-set", constraintSet); + } else { + format->setString( + "mime", + usePCMAudio + ? MEDIA_MIMETYPE_AUDIO_RAW : MEDIA_MIMETYPE_AUDIO_AAC); } notify = new AMessage(kWhatConverterNotify, id()); notify->setSize("trackIndex", trackIndex); - sp<Converter> converter = - new Converter(notify, codecLooper, format, usePCMAudio); + sp<Converter> converter = new Converter(notify, codecLooper, format); err = converter->initCheck(); if (err != OK) { |