| 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_WEBM_WEBM_CLUSTER_PARSER_H_ | 5 #ifndef MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ |
| 6 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ | 6 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "media/base/buffers.h" | 12 #include "media/base/stream_parser_buffer.h" |
| 13 #include "media/webm/webm_parser.h" | 13 #include "media/webm/webm_parser.h" |
| 14 | 14 |
| 15 namespace media { | 15 namespace media { |
| 16 | 16 |
| 17 class WebMClusterParser : public WebMParserClient { | 17 class WebMClusterParser : public WebMParserClient { |
| 18 public: | 18 public: |
| 19 typedef std::deque<scoped_refptr<Buffer> > BufferQueue; | 19 typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue; |
| 20 | 20 |
| 21 WebMClusterParser(int64 timecode_scale, | 21 WebMClusterParser(int64 timecode_scale, |
| 22 int audio_track_num, | 22 int audio_track_num, |
| 23 base::TimeDelta audio_default_duration, | 23 base::TimeDelta audio_default_duration, |
| 24 int video_track_num, | 24 int video_track_num, |
| 25 base::TimeDelta video_default_duration, | 25 base::TimeDelta video_default_duration, |
| 26 const uint8* video_encryption_key_id, | 26 const uint8* video_encryption_key_id, |
| 27 int video_encryption_key_id_size); | 27 int video_encryption_key_id_size); |
| 28 virtual ~WebMClusterParser(); | 28 virtual ~WebMClusterParser(); |
| 29 | 29 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 int64 cluster_timecode_; | 64 int64 cluster_timecode_; |
| 65 BufferQueue audio_buffers_; | 65 BufferQueue audio_buffers_; |
| 66 BufferQueue video_buffers_; | 66 BufferQueue video_buffers_; |
| 67 | 67 |
| 68 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); | 68 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace media | 71 } // namespace media |
| 72 | 72 |
| 73 #endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ | 73 #endif // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_ |
| OLD | NEW |