| 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 #ifndef MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ | 5 #ifndef MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ |
| 6 #define MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ | 6 #define MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "media/base/media_export.h" | 13 #include "media/base/media_export.h" |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 | 16 |
| 16 class DecoderBuffer; | 17 class DecoderBuffer; |
| 17 | 18 |
| 18 // Maintains a queue of DecoderBuffers in increasing timestamp order. | 19 // Maintains a queue of DecoderBuffers in increasing timestamp order. |
| 19 // | 20 // |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 68 |
| 68 // Total size in bytes of buffers in the queue. | 69 // Total size in bytes of buffers in the queue. |
| 69 size_t data_size_; | 70 size_t data_size_; |
| 70 | 71 |
| 71 DISALLOW_COPY_AND_ASSIGN(DecoderBufferQueue); | 72 DISALLOW_COPY_AND_ASSIGN(DecoderBufferQueue); |
| 72 }; | 73 }; |
| 73 | 74 |
| 74 } // namespace media | 75 } // namespace media |
| 75 | 76 |
| 76 #endif // MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ | 77 #endif // MEDIA_BASE_DECODER_BUFFER_QUEUE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1535193003:
Add missing macros includes in media/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master