videoplayer: (hopefully) fix audio seek-near-end issues too

diff --git a/videoplayer/src/audiodec.rs b/videoplayer/src/audiodec.rs
index fac1c0007d855360ab108683dd457a048b04dcdd..ff4bde45b53831fe28d33eed87b17bb917fcaa06 100644 (file)
--- a/videoplayer/src/audiodec.rs
+++ b/videoplayer/src/audiodec.rs
@@ -234,7 +234,9 @@ fn start_audio_decoding(asystem: &AudioSubsystem, ainfo: NAAudioInfo, sbr_hack:
                         qdata.flush();
                         ADEC_STATE.set_state(DecodingState::Waiting);
                     },
-                    Ok(PktSendEvent::End) => break,
+                    Ok(PktSendEvent::End) => {
+                        ADEC_STATE.set_state(DecodingState::End);
+                    },
                     Ok(PktSendEvent::ImmediateEnd) => {
                         let mut qdata = queue.lock().expect("audio queue should be accessible");
                         qdata.flush();

diff --git a/videoplayer/src/main.rs b/videoplayer/src/main.rs
index bcc210b6fb09614ac4bfb3def6eab7a5362507f5..96b453146251f217e19ea738ba2ebe1c7165cf30 100644 (file)
--- a/videoplayer/src/main.rs
+++ b/videoplayer/src/main.rs
@@ -1103,7 +1103,7 @@ impl Player {
                 if self.has_video && !(self.vcontrol.is_video_end() && disp_q.is_empty()) {
                     end = false;
                 }
-                if self.has_audio && !self.acontrol.is_audio_end() {
+                if self.has_audio && !(self.acontrol.is_audio_end() && self.acontrol.get_fill() == 0) {
                     end = false;
                 }
                 if end {