commit 8ffa530d9c1e0179dc9389e683e022c4ca26bc38
author Gopalakrishnan Nallasamy <gokrishnan@google.com> Thu Jun 18 22:44:13 2020 -0700
committer Gopalakrishnan Nallasamy <gokrishnan@google.com> Thu Jun 18 22:52:46 2020 -0700
tree a229d0dbb0cc4eab3b2dd5f4343abe75b8e0df09
parent b24d7e5515c9e85e013f959bf60ac9c588692b81

MediaMuxer:Limit scope of lock in writeSampleData

mState is the only variable that is shared in other functions. Hence
limiting the scope of autolock for checking mState only.

Bug: 157373376

Test: atest android.media.cts.MediaMuxerTest \
            android.mediav2.cts.MuxerTest \
            android.mediav2.cts.MuxerUnitTest
Change-Id: Ic5fd2205679c806a800e5e6f97579092942f204f

media/libstagefright/MediaMuxer.cpp

diff --git a/media/libstagefright/MediaMuxer.cpp b/media/libstagefright/MediaMuxer.cpp
index 6ab65c9..8bbffd4 100644
--- a/media/libstagefright/MediaMuxer.cpp
+++ b/media/libstagefright/MediaMuxer.cpp
@@ -192,11 +192,11 @@
             ALOGE("WriteSampleData() is called in invalid state %d", mState);
             return INVALID_OPERATION;
         }
+    }
 
-        if (trackIndex >= mTrackList.size()) {
-            ALOGE("WriteSampleData() get an invalid index %zu", trackIndex);
-            return -EINVAL;
-        }
+    if (trackIndex >= mTrackList.size()) {
+        ALOGE("WriteSampleData() get an invalid index %zu", trackIndex);
+        return -EINVAL;
     }
 
     MediaBuffer* mediaBuffer = new MediaBuffer(buffer);