Merge pull request #18931 from hrydgard/chd-hunk-size-fix

CHD: Fix unnecessary reloads of "hunks" during large reads

Core/FileSystems/BlockDevices.cpp

@@ -644,12 +644,6 @@ CHDFileBlockDevice::CHDFileBlockDevice(FileLoader *fileLoader)
 	impl_->chd = file;
 	impl_->header = chd_get_header(impl_->chd);
 
-	if (impl_->header->hunkbytes != 2048) {
-		badCHD_ = true;
-	} else {
-		badCHD_ = false;
-	}
-
 	readBuffer = new u8[impl_->header->hunkbytes];
 	currentHunk = -1;
 	blocksPerHunk = impl_->header->hunkbytes / impl_->header->unitbytes;
@@ -683,9 +677,9 @@ bool CHDFileBlockDevice::ReadBlock(int blockNumber, u8 *outPtr, bool uncached)
 			ERROR_LOG(LOADER, "CHD read failed: %d %d %s", blockNumber, hunk, chd_error_string(err));
 			NotifyReadError();
 		}
+		currentHunk = hunk;
 	}
 	memcpy(outPtr, readBuffer + blockInHunk * impl_->header->unitbytes, GetBlockSize());
-
 	return true;
 }
 

Core/FileSystems/BlockDevices.h

@@ -50,7 +50,6 @@ class BlockDevice {
 		return (u64)GetNumBlocks() * (u64)GetBlockSize();
 	}
 	virtual bool IsDisc() const = 0;
-	virtual bool IsBadCHD() const { return false; }
 
 	void NotifyReadError();
 
@@ -147,15 +146,13 @@ class CHDFileBlockDevice : public BlockDevice {
 	bool ReadBlocks(u32 minBlock, int count, u8 *outPtr) override;
 	u32 GetNumBlocks() const override { return numBlocks; }
 	bool IsDisc() const override { return true; }
-	bool IsBadCHD() const override { return badCHD_; }
 private:
 	struct ExtendedCoreFile *core_file_ = nullptr;
 	std::unique_ptr<CHDImpl> impl_;
 	u8 *readBuffer = nullptr;
 	u32 currentHunk = 0;
 	u32 blocksPerHunk = 0;
 	u32 numBlocks = 0;
-	bool badCHD_ = false;
 };
 
 BlockDevice *constructBlockDevice(FileLoader *fileLoader);

UI/EmuScreen.cpp

@@ -276,11 +276,6 @@ void EmuScreen::bootGame(const Path &filename) {
 		return;
 	}
 
-	if (info->badCHD) {
-		auto e = GetI18NCategory(I18NCat::ERRORS);
-		g_OSD.Show(OSDType::MESSAGE_CENTERED_ERROR, e->T("BadCHD", "Bad CHD file.\nCompress using \"chdman createdvd\" for good performance."), gamePath_.ToVisualString(), 7.0f);
-	}
-
 	auto sc = GetI18NCategory(I18NCat::SCREEN);
 	if (info->fileType == IdentifiedFileType::PSP_DISC_DIRECTORY) {
 		// Check for existence of ppsspp-index.lst - if it exists, the user likely knows what they're doing.

UI/GameInfoCache.cpp

@@ -688,9 +688,6 @@ class GameInfoWorkItem : public Task {
 				if (!bd) {
 					return;
 				}
-				if (bd->IsBadCHD()) {
-					info_->badCHD = true;
-				}
 				ISOFileSystem umd(&handles, bd);
 
 				// Alright, let's fetch the PARAM.SFO.

UI/GameInfoCache.h

@@ -147,7 +147,6 @@ class GameInfo {
 	int disc_total = 0;
 	int disc_number = 0;
 	int region = -1;
-	bool badCHD = false;
 	IdentifiedFileType fileType;
 	ParamSFOData paramSFO;
 	bool hasConfig = false;

UI/GameScreen.cpp

@@ -150,10 +150,6 @@ void GameScreen::CreateViews() {
 		tvVerified_ = infoLayout->Add(new NoticeView(NoticeLevel::INFO, ga->T("Click \"Calculate CRC\" to verify ISO"), "", new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
 		tvVerified_->SetVisibility(UI::V_GONE);
 		tvVerified_->SetSquishy(true);
-		if (info->badCHD) {
-			auto e = GetI18NCategory(I18NCat::ERRORS);
-			infoLayout->Add(new NoticeView(NoticeLevel::ERROR, e->T("BadCHD", "Bad CHD file.\nCompress using \"chdman createdvd\" for good performance."), "", new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)))->SetSquishy(true);
-		}
 	} else {
 		tvTitle_ = nullptr;
 		tvID_ = nullptr;

assets/lang/ar_AE.ini

@@ -460,7 +460,6 @@ Zoom = ‎تقريب
 [Error]
 7z file detected (Require 7-Zip) = ‎الملف مضغوط (7z).\nمن فضلك فك الضغط أولاً (جرب 7-Zip أوWinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = ‎لا يمكن حفظ ملف لقطة الشاشة.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/az_AZ.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/bg_BG.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/ca_ES.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/cz_CZ.ini

@@ -452,7 +452,6 @@ Zoom = Přiblížení
 [Error]
 7z file detected (Require 7-Zip) = Soubor je zabalen (7z).\nNejdříve ho musíte rozbalit (zkuste 7-Zip nebo WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Soubor se snímkem obrazovky nelze uložit.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/da_DK.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = Fil er pakket (7z).\nPak venligst ud først (prøv 7-Zip eller WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Kunne ikke gemme skærmbilledefilen.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/de_DE.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = Datei ist komprimiert (7z).\nBitte entpacken Sie diese zuerst (mit 7-Zip oder WinRAR).
 A PSP game couldn't be found on the disc. = Ein PSP Spiel konnte nicht auf der Disk gefunden werden.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Kann ELF außerhalb von mountRoot nicht booten.
 Could not save screenshot file = Screenshot konnte nicht gespeichert werden.
 D3D9or11 = Direct3D 9? (oder "nein" für Direct3D 11)

assets/lang/dr_ID.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/en_US.ini

@@ -477,7 +477,6 @@ Zoom = Zoom
 7z file detected (Require 7-Zip) = File is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)
 D3D11CompilerMissing = D3DCompiler_47.dll not found. Please install. Or press Yes to try again using Direct3D 9 instead.

assets/lang/es_ES.ini

@@ -452,7 +452,6 @@ Zoom = Acercar
 [Error]
 7z file detected (Require 7-Zip) = Es un archivo comprimido (en 7z).\nPor lo que necesita ser descomprimido (usa 7-Zip o WinRAR).
 A PSP game couldn't be found on the disc. = No se pudo encontrar un juego de PSP en el disco.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = No se pudo inicar el ELF localizado fuera del mountRoot.
 Could not save screenshot file = No se pudo guardar la captura de pantalla.
 D3D9or11 = ¿Direct3D 9? (o "no" para Direct3D 11)

assets/lang/es_LA.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = Es un archivo comprimido (7z).\nPor favor, descomprima primero (usa 7-Zip o WinRAR).
 A PSP game couldn't be found on the disc. = No se detecta el juego de PSP en el disco.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = No puede iniciar ELF localizado fuera de mountRoot.
 Could not save screenshot file = No se pudo guardar la captura de pantalla.
 D3D9or11 = ¿Direct3D 9? (o "no" para Direct3D 11)

assets/lang/fa_IR.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/fi_FI.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/fr_FR.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = Le fichier est compressé (.7z).\nVeuillez d'abord le décompresser (essayez 7-Zip ou WinRAR).
 A PSP game couldn't be found on the disc. = Aucun jeu PSP n'a été trouvé sur le disque.
-BadCHD = Bad CHD-file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Impossible de démarrer le fichier ELF situé en dehors du mountRoot.
 Could not save screenshot file = Impossible d'enregistrer la capture d'écran.
 D3D9or11 = Direct3D 9 ? (ou "non" pour Direct3D 11)

assets/lang/gl_ES.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/gr_EL.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = Το αρχείο είναι συμπισμένο(7z).\nΠαρακαλώ αποσυμπιέστε το πρώτα (δοκιμάστε το 7-Zip ή το WinRAR).
 A PSP game couldn't be found on the disc. = Δεν βρέθηκαν παιχνίδια PSP στο δίσκο.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Δεν μπορεί να φορτωθεί ELF που βρίσκεται εκτός mountRoot.
 Could not save screenshot file = Αδυναμία αποθήκευσης αποτύπωσης οθόνης.
 D3D9or11 = Direct3D 9? (ή "όχι" για Direct3D 11)

assets/lang/he_IL.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/he_IL_invert.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/hr_HR.ini

@@ -452,7 +452,6 @@ Zoom = Zumiraj
 [Error]
 7z file detected (Require 7-Zip) = Datoteka je arhivirana (7z).\nMolimo vas, dearhivirajte datoteku prvo (probajte 7-Zip ili WinRAR).
 A PSP game couldn't be found on the disc. = PSP igra nije mogla biti pronađena na disku.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Nije moguće pokrenuti ELF datoteku lociranu izvan mountRoot.
 Could not save screenshot file = Nije moguće spremiti datoteku slike zaslona.
 D3D9or11 = Direct3D 9? (ili "ne" za Direct3D 11)

assets/lang/hu_HU.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = A fájl tömörített (7z).\nElőbb csomagold ki (használj 7-Zip-et vagy WinRAR-t)!
 A PSP game couldn't be found on the disc. = Nem található PSP játék a lemezen.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Nem indítható mountRoot-on kívül található ELF.
 Could not save screenshot file = Képernyőkép mentése sikertelen.
 D3D9or11 = Direct3D 9? (Nyomj "Nem"-et Direct3D 11 használatához)

assets/lang/id_ID.ini

@@ -452,7 +452,6 @@ Zoom = Perbesar
 [Error]
 7z file detected (Require 7-Zip) = Berkas terkompresi (7z).\nMohon ekstrak dahulu (coba 7-Zip atau WinRAR).
 A PSP game couldn't be found on the disc. = Sebuah permainan PSP tidak dapat ditemukan pada disk.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Tidak dapat mem-boot ELF yang terletak di luar mountRoot.
 Could not save screenshot file = Tidak dapat menyimpan berkas tangkapan layar.
 D3D9or11 = Direct3D 9? (atau "tidak" untuk Direct3D 11)

assets/lang/it_IT.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = il file è compresso (7z).\nPrego, prima decomprimerlo (prova con 7-Zip o WinRAR).
 A PSP game couldn't be found on the disc. = Non è stato trovato nessun gioco PSP su disco.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Impossibile avviare il file ELF fuori dal mountRoot.
 Could not save screenshot file = Impossibile salvare il file screenshot.
 D3D9or11 = Direct3D 9? (oppure "no" per Direct3D 11)

assets/lang/ja_JP.ini

@@ -452,7 +452,6 @@ Zoom = 拡大
 [Error]
 7z file detected (Require 7-Zip) = ファイルが圧縮されています (7z)。\nまず解凍してください (7-ZipかWinRARを使う)。
 A PSP game couldn't be found on the disc. = PSPのゲームがディスクにありません。
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = mountRootの外部にあるELFを起動できません。
 Could not save screenshot file = スクリーンショットファイルを保存できません。
 D3D9or11 = Direct3D 9? (「いいえ」でDirect3D 11)

assets/lang/jv_ID.ini

@@ -452,7 +452,6 @@ Zoom = Gede
 [Error]
 7z file detected (Require 7-Zip) = berkas iki terkompres (7z).\nMohon bongkar dahulu (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Ora dapat nyimpen tangkapan layar.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/ko_KR.ini

@@ -453,7 +453,6 @@ Zoom = 확대/축소
 7z file detected (Require 7-Zip) = 파일은 (7z로) 압축되어 있습니다.\n먼저 압축을 해제하십시오 (7-Zip 또는 WinRAR 시도).
 A PSP game couldn't be found on the disc. = 디스크에서 PSP 게임을 찾을 수 없습니다.
 Cannot boot ELF located outside mountRoot. = mountRoot 외부에 있는 ELF를 부팅할 수 없습니다.
-BadCHD = CHD 파일이 잘못되었습니다.\n좋은 성능을 위해 "chdmancreatedvd"를 사용하여 압축하세요.
 Could not save screenshot file = 스크린샷 파일을 저장할 수 없습니다.
 D3D9or11 = 다이렉트3D 9? (또는 Direct3D 11의 경우 "아니오")
 D3D11CompilerMissing = D3DCompiler_47.dll을 찾을 수 없습니다. 설치하세요. 또는 예를 눌러 대신 Direct3D 9를 사용하여 다시 시도하세요.

assets/lang/lo_LA.ini

@@ -452,7 +452,6 @@ Zoom = ຊູມ
 [Error]
 7z file detected (Require 7-Zip) = ໄຟລ໌ຖືກບີບອັດ (7z).\nກະລຸນາແຕກໄຟລ໌ກ່ອນ (ລອງໃຊ້ 7-Zip ຫຼື WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = ບໍ່ສາມາດບັນທຶກໄຟລ໌ພາບໜ້າຈໍ.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/lt-LT.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)

assets/lang/ms_MY.ini

@@ -452,7 +452,6 @@ Zoom = Zoom
 [Error]
 7z file detected (Require 7-Zip) = file is compressed (7z).\nPlease decompress first (try 7-Zip or WinRAR).
 A PSP game couldn't be found on the disc. = A PSP game couldn't be found on the disc.
-BadCHD = Bad CHD file.\nCompress using "chdman createdvd" for good performance
 Cannot boot ELF located outside mountRoot. = Cannot boot ELF located outside mountRoot.
 Could not save screenshot file = Could not save screenshot file.
 D3D9or11 = Direct3D 9? (or "no" for Direct3D 11)