Skip to content

Commit

Permalink
リモートデスクトップ使用時に初期化に失敗する問題を修正。
Browse files Browse the repository at this point in the history
  • Loading branch information
rigaya committed Jan 11, 2023
1 parent 6c803e3 commit eceb5c9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
10 changes: 10 additions & 0 deletions QSVEnc/QSVEnc_readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,16 @@ API v1.1


�y�ǂ��ł����������z
2023.01.11 (7.25)
[QSVEncC]
- �����[�g�f�X�N�g�b�v�g�p���ɏ������Ɏ��s��������C���B
- �f�o�b�O���O�������B
- lookahead depth��VBR/CBR�ł��L���ȏꍇ������̂ŁA���O�ɕ\������悤�ɁB
- trellis��H.264�G���R�[�h���̂ݕ\������悤�ύX�B

[QSVEnc.auo]
- �G���[���b�Z�[�W�̕����������C���B

2022.11.12 (7.24)
[QSVEncC]
- �G���R�[�h����t���[�������w�肷��I�v�V����(--frames)��lj��B
Expand Down
5 changes: 5 additions & 0 deletions QSVPipeline/qsv_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ RGY_ERR QSVDevice::init(const QSVDeviceNum dev, const bool enableOpenCL, const b
}
}
}
PrintMes((suppressErrorMessage) ? RGY_LOG_DEBUG : RGY_LOG_ERROR, _T("QSVDevice::init: failed to find OpenCL device for dev #%d.\n"), dev);
return RGY_ERR_NOT_FOUND;
}
return RGY_ERR_NONE;
}
Expand Down Expand Up @@ -185,10 +187,13 @@ std::vector<std::unique_ptr<QSVDevice>> getDeviceList(const QSVDeviceNum deviceN
RGYOpenCL cl(std::make_shared<RGYLog>(nullptr, RGY_LOG_QUIET));
openCLAvail = RGYOpenCL::openCLloaded();
}
log->write(RGY_LOG_DEBUG, RGY_LOGT_DEV, _T("Start Create DeviceList, openCLAvail: %s.\n"), openCLAvail ? _T("yes") : _T("no"));

std::vector<std::unique_ptr<QSVDevice>> devList;
const int idevstart = (deviceNum != QSVDeviceNum::AUTO) ? (int)deviceNum : 1;
const int idevfin = (deviceNum != QSVDeviceNum::AUTO) ? (int)deviceNum : (int)QSVDeviceNum::MAX;
for (int idev = idevstart; idev <= idevfin; idev++) {
log->write(RGY_LOG_DEBUG, RGY_LOGT_DEV, _T("Check device %d...\n"), idev);
auto dev = std::make_unique<QSVDevice>();
if (dev->init((QSVDeviceNum)idev, enableOpenCL && openCLAvail, memType, log, idev != idevstart) != RGY_ERR_NONE) {
break;
Expand Down
6 changes: 3 additions & 3 deletions QSVPipeline/rgy_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#include "rgy_rev.h"

#define VER_FILEVERSION 0,7,24,0
#define VER_STR_FILEVERSION "7.24"
#define VER_STR_FILEVERSION_TCHAR _T("7.24")
#define VER_FILEVERSION 0,7,25,0
#define VER_STR_FILEVERSION "7.25"
#define VER_STR_FILEVERSION_TCHAR _T("7.25")

#ifdef _M_IX86
#define BUILD_ARCH_STR _T("x86")
Expand Down

0 comments on commit eceb5c9

Please sign in to comment.