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

Side by Side 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, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cdm/cenc_utils.h" 5 #include "media/cdm/cenc_utils.h"
6 6
7 #include "media/base/bit_reader.h" 7 #include "media/base/bit_reader.h"
8 8
9 namespace media { 9 namespace media {
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 key.push_back(ReadBits(&reader, 8)); 163 key.push_back(ReadBits(&reader, 8));
164 } 164 }
165 result.push_back(key); 165 result.push_back(key);
166 --count; 166 --count;
167 } 167 }
168 168
169 // Don't bother checking DataSize and Data. 169 // Don't bother checking DataSize and Data.
170 } 170 }
171 171
172 key_ids->swap(result); 172 key_ids->swap(result);
173 173 return key_ids->size() > 0;
174 // TODO(jrummell): This should return true only if there was at least one
175 // key ID present. However, numerous test files don't contain the 'pssh' box
176 // for Common Format, so no keys are found. http://crbug.com/460308
177 return true;
178 } 174 }
179 175
180 } // namespace media 176 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698