commit 182b06a0c4733501e9187a6095ff5be76f1a8908
author Chong Zhang <chz@google.com> Thu Apr 09 14:38:05 2020 -0700
committer Chong Zhang <chz@google.com> Wed Apr 15 13:22:06 2020 -0700
tree d63cb7e9c72ebfc5f6bd13777e5dd660a05cc46e
parent 6d58e4b1ae638222e6f228ab07f9709199778476

transcoding: instantiate job scheduler with dummy hooks

Instantiate job scheduler with dummy hooks for transcoder
and procInfo to allow more unit testing.

bug: 145233472
test: mediatranscodingservice_tests
Change-Id: I99754d724164c453623fb00affddefca5c84c26c

services/mediatranscoding/MediaTranscodingService.h

diff --git a/services/mediatranscoding/MediaTranscodingService.h b/services/mediatranscoding/MediaTranscodingService.h
index 785bc4d..36db9b3 100644
--- a/services/mediatranscoding/MediaTranscodingService.h
+++ b/services/mediatranscoding/MediaTranscodingService.h
@@ -19,16 +19,19 @@
 
 #include <aidl/android/media/BnMediaTranscodingService.h>
 #include <binder/IServiceManager.h>
-#include <media/TranscodingClientManager.h>
 
 namespace android {
 
 using Status = ::ndk::ScopedAStatus;
 using ::aidl::android::media::BnMediaTranscodingService;
 using ::aidl::android::media::ITranscodingClient;
-using ::aidl::android::media::ITranscodingClientListener;
+using ::aidl::android::media::ITranscodingClientCallback;
 using ::aidl::android::media::TranscodingJobParcel;
 using ::aidl::android::media::TranscodingRequestParcel;
+class TranscodingClientManager;
+class TranscodingJobScheduler;
+class TranscoderInterface;
+class ProcessInfoInterface;
 
 class MediaTranscodingService : public BnMediaTranscodingService {
 public:
@@ -36,30 +39,30 @@
     static constexpr int32_t kInvalidClientId = -1;
 
     MediaTranscodingService();
+    MediaTranscodingService(const std::shared_ptr<TranscoderInterface>& transcoder,
+                            const std::shared_ptr<ProcessInfoInterface>& procInfo);
     virtual ~MediaTranscodingService();
 
     static void instantiate();
 
     static const char* getServiceName() { return "media.transcoding"; }
 
-    Status registerClient(
-            const std::shared_ptr<ITranscodingClientListener>& in_listener,
-            const std::string& in_clientName,
-            const std::string& in_opPackageName,
-            int32_t in_clientUid, int32_t in_clientPid,
-            std::shared_ptr<ITranscodingClient>* _aidl_return) override;
+    Status registerClient(const std::shared_ptr<ITranscodingClientCallback>& in_callback,
+                          const std::string& in_clientName, const std::string& in_opPackageName,
+                          int32_t in_clientUid, int32_t in_clientPid,
+                          std::shared_ptr<ITranscodingClient>* _aidl_return) override;
 
     Status getNumOfClients(int32_t* _aidl_return) override;
 
-    virtual inline binder_status_t dump(
-            int /*fd*/, const char** /*args*/, uint32_t /*numArgs*/);
+    virtual inline binder_status_t dump(int /*fd*/, const char** /*args*/, uint32_t /*numArgs*/);
 
 private:
     friend class MediaTranscodingServiceTest;
 
     mutable std::mutex mServiceLock;
 
-    TranscodingClientManager& mTranscodingClientManager;
+    std::shared_ptr<TranscodingJobScheduler> mJobScheduler;
+    std::shared_ptr<TranscodingClientManager> mClientManager;
 };
 
 }  // namespace android