Merge "stagefright: stop audio encoding before releasing writer thread"

5 years ago · 9ffb82eb80
parent cd201da8ec 9e6b038ead
commit 9ffb82eb80
2 changed files with 2 additions and 2 deletions
--- a/media/libstagefright/AACWriter.cpp
+++ b/media/libstagefright/AACWriter.cpp
@ -154,11 +154,11 @@ status_t AACWriter::reset() {
    mDone = true;

    void *dummy;
+    status_t status = mSource->stop();
    pthread_join(mThread, &dummy);

    status_t err = static_cast<status_t>(reinterpret_cast<uintptr_t>(dummy));
    {
-        status_t status = mSource->stop();
        if (err == OK &&
            (status != OK && status != ERROR_END_OF_STREAM)) {
            err = status;
--- a/media/libstagefright/AMRWriter.cpp
+++ b/media/libstagefright/AMRWriter.cpp
@ -149,11 +149,11 @@ status_t AMRWriter::reset() {
    mDone = true;

    void *dummy;
+    status_t status = mSource->stop();
    pthread_join(mThread, &dummy);

    status_t err = static_cast<status_t>(reinterpret_cast<uintptr_t>(dummy));
    {
-        status_t status = mSource->stop();
        if (err == OK &&
            (status != OK && status != ERROR_END_OF_STREAM)) {
            err = status;