Commit f8e49fb7 authored by David Staessens's avatar David Staessens Committed by Commit Bot

media/gpu/test: Make error message when loading video fails more verbose.

This CL increases the verbosity of error messages when loading a video or its
metadata failed when running the video_decode_accelerator_tests or the
video_decode_accelerator_perf_tests. This makes debugging failing tests a bit
easier.

TEST=ran new VDA (perf) tests on nocturne

BUG=None

Change-Id: I29a437d9ae95e6cd403be6844a89730e99a22dc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1560873
Commit-Queue: David Staessens <dstaessens@chromium.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649715}
parent ed9fad83
...@@ -46,21 +46,21 @@ bool Video::Load() { ...@@ -46,21 +46,21 @@ bool Video::Load() {
int64_t file_size; int64_t file_size;
if (!base::GetFileSize(file_path_, &file_size) || (file_size < 0)) { if (!base::GetFileSize(file_path_, &file_size) || (file_size < 0)) {
VLOGF(1) << "Failed to read file size: " << file_path_; LOG(ERROR) << "Failed to read file size: " << file_path_;
return false; return false;
} }
std::vector<uint8_t> data(file_size); std::vector<uint8_t> data(file_size);
if (base::ReadFile(file_path_, reinterpret_cast<char*>(data.data()), if (base::ReadFile(file_path_, reinterpret_cast<char*>(data.data()),
base::checked_cast<int>(file_size)) != file_size) { base::checked_cast<int>(file_size)) != file_size) {
VLOGF(1) << "Failed to read file: " << file_path_; LOG(ERROR) << "Failed to read file: " << file_path_;
return false; return false;
} }
data_ = std::move(data); data_ = std::move(data);
if (!LoadMetadata()) { if (!LoadMetadata()) {
VLOGF(1) << "Failed to load metadata"; LOG(ERROR) << "Failed to load metadata";
return false; return false;
} }
...@@ -114,7 +114,7 @@ void Video::SetTestDataPath(const base::FilePath& test_data_path) { ...@@ -114,7 +114,7 @@ void Video::SetTestDataPath(const base::FilePath& test_data_path) {
bool Video::LoadMetadata() { bool Video::LoadMetadata() {
if (IsMetadataLoaded()) { if (IsMetadataLoaded()) {
VLOGF(1) << "Video metadata is already loaded"; LOG(ERROR) << "Video metadata is already loaded";
return false; return false;
} }
...@@ -125,14 +125,14 @@ bool Video::LoadMetadata() { ...@@ -125,14 +125,14 @@ bool Video::LoadMetadata() {
base::Optional<base::FilePath> resolved_path = base::Optional<base::FilePath> resolved_path =
ResolveFilePath(metadata_file_path_); ResolveFilePath(metadata_file_path_);
if (!resolved_path) { if (!resolved_path) {
VLOGF(1) << "Video metadata file not found: " << metadata_file_path_; LOG(ERROR) << "Video metadata file not found: " << metadata_file_path_;
return false; return false;
} }
metadata_file_path_ = resolved_path.value(); metadata_file_path_ = resolved_path.value();
std::string json_data; std::string json_data;
if (!base::ReadFileToString(metadata_file_path_, &json_data)) { if (!base::ReadFileToString(metadata_file_path_, &json_data)) {
VLOGF(1) << "Failed to read video metadata file: " << metadata_file_path_; LOG(ERROR) << "Failed to read video metadata file: " << metadata_file_path_;
return false; return false;
} }
...@@ -140,28 +140,28 @@ bool Video::LoadMetadata() { ...@@ -140,28 +140,28 @@ bool Video::LoadMetadata() {
std::unique_ptr<base::Value> metadata( std::unique_ptr<base::Value> metadata(
reader.ReadToValueDeprecated(json_data)); reader.ReadToValueDeprecated(json_data));
if (!metadata) { if (!metadata) {
VLOGF(1) << "Failed to parse video metadata: " << metadata_file_path_ LOG(ERROR) << "Failed to parse video metadata: " << metadata_file_path_
<< ": " << reader.GetErrorMessage(); << ": " << reader.GetErrorMessage();
return false; return false;
} }
const base::Value* profile = const base::Value* profile =
metadata->FindKeyOfType("profile", base::Value::Type::STRING); metadata->FindKeyOfType("profile", base::Value::Type::STRING);
if (!profile) { if (!profile) {
VLOGF(1) << "Key \"profile\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"profile\" is not found in " << metadata_file_path_;
return false; return false;
} }
profile_ = ConvertStringtoProfile(profile->GetString()); profile_ = ConvertStringtoProfile(profile->GetString());
codec_ = ConvertProfileToCodec(profile_); codec_ = ConvertProfileToCodec(profile_);
if (profile_ == VIDEO_CODEC_PROFILE_UNKNOWN || codec_ == kUnknownVideoCodec) { if (profile_ == VIDEO_CODEC_PROFILE_UNKNOWN || codec_ == kUnknownVideoCodec) {
VLOGF(1) << profile->GetString() << " is not supported"; LOG(ERROR) << profile->GetString() << " is not supported";
return false; return false;
} }
const base::Value* num_frames = const base::Value* num_frames =
metadata->FindKeyOfType("num_frames", base::Value::Type::INTEGER); metadata->FindKeyOfType("num_frames", base::Value::Type::INTEGER);
if (!num_frames) { if (!num_frames) {
VLOGF(1) << "Key \"num_frames\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"num_frames\" is not found in " << metadata_file_path_;
return false; return false;
} }
num_frames_ = static_cast<uint32_t>(num_frames->GetInt()); num_frames_ = static_cast<uint32_t>(num_frames->GetInt());
...@@ -169,7 +169,8 @@ bool Video::LoadMetadata() { ...@@ -169,7 +169,8 @@ bool Video::LoadMetadata() {
const base::Value* num_fragments = const base::Value* num_fragments =
metadata->FindKeyOfType("num_fragments", base::Value::Type::INTEGER); metadata->FindKeyOfType("num_fragments", base::Value::Type::INTEGER);
if (!num_fragments) { if (!num_fragments) {
VLOGF(1) << "Key \"num_fragments\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"num_fragments\" is not found in "
<< metadata_file_path_;
return false; return false;
} }
num_fragments_ = static_cast<uint32_t>(num_fragments->GetInt()); num_fragments_ = static_cast<uint32_t>(num_fragments->GetInt());
...@@ -177,13 +178,13 @@ bool Video::LoadMetadata() { ...@@ -177,13 +178,13 @@ bool Video::LoadMetadata() {
const base::Value* width = const base::Value* width =
metadata->FindKeyOfType("width", base::Value::Type::INTEGER); metadata->FindKeyOfType("width", base::Value::Type::INTEGER);
if (!width) { if (!width) {
VLOGF(1) << "Key \"width\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"width\" is not found in " << metadata_file_path_;
return false; return false;
} }
const base::Value* height = const base::Value* height =
metadata->FindKeyOfType("height", base::Value::Type::INTEGER); metadata->FindKeyOfType("height", base::Value::Type::INTEGER);
if (!height) { if (!height) {
VLOGF(1) << "Key \"height\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"height\" is not found in " << metadata_file_path_;
return false; return false;
} }
resolution_ = gfx::Size(static_cast<uint32_t>(width->GetInt()), resolution_ = gfx::Size(static_cast<uint32_t>(width->GetInt()),
...@@ -192,7 +193,8 @@ bool Video::LoadMetadata() { ...@@ -192,7 +193,8 @@ bool Video::LoadMetadata() {
const base::Value* md5_checksums = const base::Value* md5_checksums =
metadata->FindKeyOfType("md5_checksums", base::Value::Type::LIST); metadata->FindKeyOfType("md5_checksums", base::Value::Type::LIST);
if (!md5_checksums) { if (!md5_checksums) {
VLOGF(1) << "Key \"md5_checksums\" is not found in " << metadata_file_path_; LOG(ERROR) << "Key \"md5_checksums\" is not found in "
<< metadata_file_path_;
return false; return false;
} }
for (const base::Value& checksum : md5_checksums->GetList()) { for (const base::Value& checksum : md5_checksums->GetList()) {
...@@ -202,8 +204,8 @@ bool Video::LoadMetadata() { ...@@ -202,8 +204,8 @@ bool Video::LoadMetadata() {
const base::Value* thumbnail_checksums = const base::Value* thumbnail_checksums =
metadata->FindKeyOfType("thumbnail_checksums", base::Value::Type::LIST); metadata->FindKeyOfType("thumbnail_checksums", base::Value::Type::LIST);
if (!thumbnail_checksums) { if (!thumbnail_checksums) {
VLOGF(1) << "Key \"thumbnail_checksums\" is not found in " LOG(ERROR) << "Key \"thumbnail_checksums\" is not found in "
<< metadata_file_path_; << metadata_file_path_;
return false; return false;
} }
for (const base::Value& checksum : thumbnail_checksums->GetList()) { for (const base::Value& checksum : thumbnail_checksums->GetList()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment