From 84884f2089c31193cc34128d14d7f99bd31c2856 Mon Sep 17 00:00:00 2001
From: rigaya <rigaya34589@live.jp>
Date: Sat, 2 Dec 2023 13:35:00 +0900
Subject: [PATCH] =?UTF-8?q?--seek=E4=BD=BF=E7=94=A8=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E9=80=B2=E6=8D=97=E8=A1=A8=E7=A4=BA=E3=82=92=E6=94=B9=E5=96=84?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NVEnc/NVEnc_readme.txt          | 4 ++++
 NVEncCore/rgy_input_avcodec.cpp | 4 +++-
 NVEncCore/rgy_version.h         | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/NVEnc/NVEnc_readme.txt b/NVEnc/NVEnc_readme.txt
index 1c4b7a65..11a08e20 100644
--- a/NVEnc/NVEnc_readme.txt
+++ b/NVEnc/NVEnc_readme.txt
@@ -214,6 +214,10 @@ NVIDIA グラフィックドライバ 545.92
 今後の更新で設定ファイルの互換性がなくなるかもしれません。
 
 【メモ】
+2023.12.03 (7.39)
+- --seek使用時の進捗表示を改善。
+- NVMLによるGPUのモニタリングを行わないようにするオプションを追加。(--disable-nvml)
+
 2023.11.27 (7.38)
 [NVEncC]
 - NVEnc 7.34以降、AVX2が使用できない環境で動作しないのを回避。
diff --git a/NVEncCore/rgy_input_avcodec.cpp b/NVEncCore/rgy_input_avcodec.cpp
index 37cdd0e0..46e0daf9 100644
--- a/NVEncCore/rgy_input_avcodec.cpp
+++ b/NVEncCore/rgy_input_avcodec.cpp
@@ -2804,6 +2804,9 @@ double RGYInputAvcodec::GetInputVideoDuration() {
     if (m_seek.second > 0.0f) {
         duration = std::min<double>(duration, m_seek.second);
     }
+    if (m_seek.first > 0.0f) {
+        duration = std::max(0.0, duration - m_seek.first);
+    }
     return duration;
 }
 
@@ -3077,7 +3080,6 @@ RGY_ERR RGYInputAvcodec::LoadNextFrameInternal(RGYFrame *pSurface) {
     if (m_Demux.format.formatCtx->duration) {
         progressPercent = m_Demux.frames.duration() * (m_Demux.video.stream->time_base.num / (double)m_Demux.video.stream->time_base.den);
     }
-    progressPercent += m_seek.first;
     return m_encSatusInfo->UpdateDisplayByCurrentDuration(progressPercent);
 }
 #pragma warning(pop)
diff --git a/NVEncCore/rgy_version.h b/NVEncCore/rgy_version.h
index 7c4ec823..5f2ead12 100644
--- a/NVEncCore/rgy_version.h
+++ b/NVEncCore/rgy_version.h
@@ -29,9 +29,9 @@
 #ifndef __RGY_CONFIG_H__
 #define __RGY_CONFIG_H__
 
-#define VER_FILEVERSION              0,7,38,0
-#define VER_STR_FILEVERSION          "7.38"
-#define VER_STR_FILEVERSION_TCHAR _T("7.38")
+#define VER_FILEVERSION              0,7,39,0
+#define VER_STR_FILEVERSION          "7.39"
+#define VER_STR_FILEVERSION_TCHAR _T("7.39")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")