Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1195)

Unified Diff: media/cdm/cenc_utils.cc

Issue 1163713007: Use 'pssh' data to determine key_id properly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cdm/cenc_utils.cc
diff --git a/media/cdm/cenc_utils.cc b/media/cdm/cenc_utils.cc
index 86779b2174092ce5d0e3b5f5dca6a9c2f965c912..2e08c79d05dbbff8a8b59079bd8e031d86cf4844 100644
--- a/media/cdm/cenc_utils.cc
+++ b/media/cdm/cenc_utils.cc
@@ -170,11 +170,7 @@ bool GetKeyIdsForCommonSystemId(const std::vector<uint8_t>& input,
}
key_ids->swap(result);
-
- // TODO(jrummell): This should return true only if there was at least one
- // key ID present. However, numerous test files don't contain the 'pssh' box
- // for Common Format, so no keys are found. http://crbug.com/460308
- return true;
+ return key_ids->size() > 0;
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698