commit c2b10b3dbe7f72bd6e212db0cf92f2d88f922b79
author Marco Nelissen <marcone@google.com> Mon Sep 24 13:19:43 2018 -0700
committer Marco Nelissen <marcone@google.com> Mon Sep 24 13:22:04 2018 -0700
tree daf51eee33140f2bc17fce5f29eb1030d2cf58e9
parent 5a855fee64e7b6996618a4f9288fd06be77456c1

Fix and simplify cached datasource handling.

This fixes random CTS failures due to bad frees.

Bug: 111407253
Test: CTS

Change-Id: If8bdb92b735f83aa3b4d54035fdb0729a9c4ba61

include/media/MediaExtractorPluginHelper.h

diff --git a/include/media/MediaExtractorPluginHelper.h b/include/media/MediaExtractorPluginHelper.h
index c817b30..a659660 100644
--- a/include/media/MediaExtractorPluginHelper.h
+++ b/include/media/MediaExtractorPluginHelper.h
@@ -129,11 +129,13 @@
         mSource = source->mSource;
     }
 
-    ssize_t readAt(off64_t offset, void *data, size_t size) {
+    virtual ~DataSourceHelper() {}
+
+    virtual ssize_t readAt(off64_t offset, void *data, size_t size) {
         return mSource->readAt(mSource->handle, offset, data, size);
     }
 
-    status_t getSize(off64_t *size) {
+    virtual status_t getSize(off64_t *size) {
         return mSource->getSize(mSource->handle, size);
     }
 
@@ -141,7 +143,7 @@
         return mSource->getUri(mSource->handle, uriString, bufferSize);
     }
 
-    uint32_t flags() {
+    virtual uint32_t flags() {
         return mSource->flags(mSource->handle);
     }