commit 3512ccef378b41b1256bd83c65e69fd7b980d0b9
author Bart Van Assche <bvanassche@google.com> Tue Aug 06 14:08:49 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 06 14:08:49 2024 +0000
tree 65d4ee38a3c41f26a0cb7f73091cede47240a8e9
parent 82eb7cc396a90ce68307cee5d109b460cc3888f9
parent 8c7e75ebc9c2db43bf6c1a492547e194eb633e5e

Merge "Clean up the JetPlayer class definition" into main am: 8c7e75ebc9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3205856

Change-Id: I012ba440035ab028d54f06e5b7621885d98a9749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/jni/JetPlayer.h

diff --git a/media/jni/JetPlayer.h b/media/jni/JetPlayer.h
index bb569bc..4cc266d 100644
--- a/media/jni/JetPlayer.h
+++ b/media/jni/JetPlayer.h
@@ -40,7 +40,7 @@
     static const int JET_NUMQUEUEDSEGMENT_UPDATE = 3;
     static const int JET_PAUSE_UPDATE            = 4;
 
-    JetPlayer(void *javaJetPlayer,
+    explicit JetPlayer(void *javaJetPlayer,
             int maxTracks = 32,
             int trackBufferSize = 1200);
     ~JetPlayer();
@@ -69,7 +69,6 @@
     void                fireUpdateOnStatusChange();
     void                fireEventsFromJetQueue();
 
-    JetPlayer() {} // no default constructor
     void dump();
     void dumpJetStatus(S_JET_STATUS* pJetStatus);
 
@@ -96,7 +95,7 @@
 
     class JetPlayerThread : public Thread {
     public:
-        JetPlayerThread(JetPlayer *player) : mPlayer(player) {
+        explicit JetPlayerThread(JetPlayer *player) : mPlayer(player) {
         }
 
     protected:
@@ -106,8 +105,7 @@
         JetPlayer *mPlayer;
 
         bool threadLoop() {
-            int result;
-            result = mPlayer->render();
+            mPlayer->render();
             return false;
         }