diff options
| author | Phil Burk <philburk@google.com> | 2015-06-20 00:48:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-20 00:48:08 +0000 |
| commit | ecf7bdb0c5a9914564f8a8c91ffc4bd24ebfb0ac (patch) | |
| tree | 11ba02303a494f8346b85b2db21549102422e2a1 /services/audioflinger | |
| parent | 9a92255484adef1ae82f4c77d654ad47997c0439 (diff) | |
| parent | 48e6ea95dc23e1c84911f1f907403ac1729c6b78 (diff) | |
| download | frameworks_av-ecf7bdb0c5a9914564f8a8c91ffc4bd24ebfb0ac.zip frameworks_av-ecf7bdb0c5a9914564f8a8c91ffc4bd24ebfb0ac.tar.gz frameworks_av-ecf7bdb0c5a9914564f8a8c91ffc4bd24ebfb0ac.tar.bz2 | |
Merge "AudioFlinger: reset SPDIF encoder on flush" into mnc-dev
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/SpdifStreamOut.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/SpdifStreamOut.cpp b/services/audioflinger/SpdifStreamOut.cpp index 45b541a..ac637ef 100644 --- a/services/audioflinger/SpdifStreamOut.cpp +++ b/services/audioflinger/SpdifStreamOut.cpp @@ -128,7 +128,7 @@ status_t SpdifStreamOut::getRenderPosition(uint32_t *frames) int SpdifStreamOut::flush() { - // FIXME Is there an issue here with flush being asynchronous? + mSpdifEncoder.reset(); mRenderPositionHal = 0; mPreviousHalPosition32 = 0; return AudioStreamOut::flush(); @@ -136,6 +136,7 @@ int SpdifStreamOut::flush() int SpdifStreamOut::standby() { + mSpdifEncoder.reset(); mRenderPositionHal = 0; mPreviousHalPosition32 = 0; return AudioStreamOut::standby(); |