| commit | 20492274762c7359cf4b7ffe54d3fa8c67a00ab6 | [log] [tgz] |
|---|---|---|
| author | Andrew Lewis <andrewlewis@google.com> | Thu Feb 16 21:29:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 16 21:29:50 2023 +0000 |
| tree | a4a981bbf9e281d9c00fb6d3e0f3608aa71d7614 | |
| parent | e1f813ca77b5352f583fc4b1f22b6f116307658c [diff] | |
| parent | c98000a6b6af012b87461ea04ac8c40a7a6eecc9 [diff] |
Merge "WebmFrameThread: Don't set mDone in WebmFrameSinkThread::stop" am: ae14fcc603 am: 5a16ca2a8b am: c98000a6b6 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2439314 Change-Id: Ib919b8c1471e86415ee9095d167d505865841da7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/webm/WebmFrameThread.cpp b/media/libstagefright/webm/WebmFrameThread.cpp index 59ce8db..cdbd745 100644 --- a/media/libstagefright/webm/WebmFrameThread.cpp +++ b/media/libstagefright/webm/WebmFrameThread.cpp
@@ -197,7 +197,6 @@ } status_t WebmFrameSinkThread::stop() { - mDone = true; mVideoFrames.push(WebmFrame::EOS); mAudioFrames.push(WebmFrame::EOS); return WebmFrameThread::stop();