commit ab1d20824f7919672d5e71e7b95ef0928e11876f
author Marco Nelissen <marcone@google.com> Mon Feb 10 20:54:51 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 10 20:54:51 2020 +0000
tree d88cd4d57d6a5a95d99a7268296d1dd1e1383b92
parent b5a30632e4e563957729210fe1d4b355eea08399
parent 59982857db2f53a41abed6f6977ba607175823a5

Merge "Add meta data extensions to support APE playback"

media/libstagefright/MediaTrack.cpp

diff --git a/media/libstagefright/MediaTrack.cpp b/media/libstagefright/MediaTrack.cpp
index 89c9b25..24ba38a 100644
--- a/media/libstagefright/MediaTrack.cpp
+++ b/media/libstagefright/MediaTrack.cpp
@@ -183,6 +183,11 @@
             meta.setData(kKeyAudioPresentationInfo,
                     MetaDataBase::Type::TYPE_NONE, valbuf->data(), valbuf->size());
         }
+        if (format->mFormat->findBuffer("csd-0", &valbuf)) {
+            meta.setData(kKeyOpaqueCSD0,
+                    MetaDataBase::Type::TYPE_NONE, valbuf->data(), valbuf->size());
+        }
+
     } else {
         *buffer = nullptr;
     }