| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/move.h" | |
| 13 #include "base/time.h" | 12 #include "base/time.h" |
| 14 #include "media/base/audio_decoder_config.h" | 13 #include "media/base/audio_decoder_config.h" |
| 15 #include "media/base/decoder_buffer.h" | 14 #include "media/base/decoder_buffer.h" |
| 16 #include "media/base/stream_parser_buffer.h" | 15 #include "media/base/stream_parser_buffer.h" |
| 17 #include "media/base/test_data_util.h" | 16 #include "media/base/test_data_util.h" |
| 18 #include "media/base/video_decoder_config.h" | 17 #include "media/base/video_decoder_config.h" |
| 19 #include "media/mp4/mp4_stream_parser.h" | 18 #include "media/mp4/mp4_stream_parser.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 21 | 20 |
| 22 using base::TimeDelta; | 21 using base::TimeDelta; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), | 154 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), |
| 156 buffer->GetDataSize(), | 155 buffer->GetDataSize(), |
| 157 512)); | 156 512)); |
| 158 } | 157 } |
| 159 | 158 |
| 160 // TODO(strobe): Create and test media which uses CENC auxiliary info stored | 159 // TODO(strobe): Create and test media which uses CENC auxiliary info stored |
| 161 // inside a private box | 160 // inside a private box |
| 162 | 161 |
| 163 } // namespace mp4 | 162 } // namespace mp4 |
| 164 } // namespace media | 163 } // namespace media |
| OLD | NEW |