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" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 start += append_size; | 51 start += append_size; |
52 } | 52 } |
53 return true; | 53 return true; |
54 } | 54 } |
55 | 55 |
56 void InitF(bool init_ok, base::TimeDelta duration) { | 56 void InitF(bool init_ok, base::TimeDelta duration) { |
57 DVLOG(1) << "InitF: ok=" << init_ok | 57 DVLOG(1) << "InitF: ok=" << init_ok |
58 << ", dur=" << duration.InMilliseconds(); | 58 << ", dur=" << duration.InMilliseconds(); |
59 } | 59 } |
60 | 60 |
61 bool NewConfigF(const AudioDecoderConfig& ac, | 61 bool NewConfigF(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) { |
62 const VideoDecoderConfig& vc) { | |
63 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() | 62 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() |
64 << ", video=" << vc.IsValidConfig(); | 63 << ", video=" << vc.IsValidConfig(); |
65 configs_received_ = true; | 64 configs_received_ = true; |
66 return true; | 65 return true; |
67 } | 66 } |
68 | 67 |
69 bool NewBuffersF(const StreamParser::BufferQueue& bufs) { | 68 bool NewBuffersF(const StreamParser::BufferQueue& bufs) { |
70 DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers"; | 69 DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers"; |
71 for (StreamParser::BufferQueue::const_iterator buf = bufs.begin(); | 70 for (StreamParser::BufferQueue::const_iterator buf = bufs.begin(); |
72 buf != bufs.end(); buf++) { | 71 buf != bufs.end(); buf++) { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), | 155 EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), |
157 buffer->GetDataSize(), | 156 buffer->GetDataSize(), |
158 512)); | 157 512)); |
159 } | 158 } |
160 | 159 |
161 // TODO(strobe): Create and test media which uses CENC auxiliary info stored | 160 // TODO(strobe): Create and test media which uses CENC auxiliary info stored |
162 // inside a private box | 161 // inside a private box |
163 | 162 |
164 } // namespace mp4 | 163 } // namespace mp4 |
165 } // namespace media | 164 } // namespace media |
OLD | NEW |