| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/mp4/track_run_iterator.h" | 5 #include "media/mp4/track_run_iterator.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "media/base/stream_parser_buffer.h" | 9 #include "media/base/stream_parser_buffer.h" |
| 10 #include "media/mp4/rcheck.h" | 10 #include "media/mp4/rcheck.h" |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 static_cast<size_t>(sample_size()))) { | 432 static_cast<size_t>(sample_size()))) { |
| 433 DVLOG(1) << "Incorrect CENC subsample size."; | 433 DVLOG(1) << "Incorrect CENC subsample size."; |
| 434 return scoped_ptr<DecryptConfig>(); | 434 return scoped_ptr<DecryptConfig>(); |
| 435 } | 435 } |
| 436 | 436 |
| 437 const std::vector<uint8>& kid = track_encryption().default_kid; | 437 const std::vector<uint8>& kid = track_encryption().default_kid; |
| 438 return scoped_ptr<DecryptConfig>(new DecryptConfig( | 438 return scoped_ptr<DecryptConfig>(new DecryptConfig( |
| 439 std::string(reinterpret_cast<const char*>(&kid[0]), kid.size()), | 439 std::string(reinterpret_cast<const char*>(&kid[0]), kid.size()), |
| 440 std::string(reinterpret_cast<const char*>(cenc_info.iv), | 440 std::string(reinterpret_cast<const char*>(cenc_info.iv), |
| 441 arraysize(cenc_info.iv)), | 441 arraysize(cenc_info.iv)), |
| 442 std::string(), // No checksum in MP4 using CENC. | |
| 443 0, // No offset to start of media data in MP4 using CENC. | 442 0, // No offset to start of media data in MP4 using CENC. |
| 444 cenc_info.subsamples)); | 443 cenc_info.subsamples)); |
| 445 } | 444 } |
| 446 | 445 |
| 447 } // namespace mp4 | 446 } // namespace mp4 |
| 448 } // namespace media | 447 } // namespace media |
| OLD | NEW |