Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Side by Side Diff: media/base/decoder_buffer.h

Issue 16274005: Separate DemuxerStream and VideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GVD: return drained frames before starting over Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/decoder_buffer.cc » ('j') | media/base/decoder_buffer.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_H_ 5 #ifndef MEDIA_BASE_DECODER_BUFFER_H_
6 #define MEDIA_BASE_DECODER_BUFFER_H_ 6 #define MEDIA_BASE_DECODER_BUFFER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/aligned_memory.h" 10 #include "base/memory/aligned_memory.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 class DecryptConfig; 19 class DecryptConfig;
20 class VideoDecoderConfig;
scherkus (not reviewing) 2013/07/09 01:18:39 remove?
xhwang 2013/07/09 20:00:04 Done.
20 21
21 // A specialized buffer for interfacing with audio / video decoders. 22 // A specialized buffer for interfacing with audio / video decoders.
22 // 23 //
23 // Specifically ensures that data is aligned and padded as necessary by the 24 // Specifically ensures that data is aligned and padded as necessary by the
24 // underlying decoding framework. On desktop platforms this means memory is 25 // underlying decoding framework. On desktop platforms this means memory is
25 // allocated using FFmpeg with particular alignment and padding requirements. 26 // allocated using FFmpeg with particular alignment and padding requirements.
26 // 27 //
27 // Also includes decoder specific functionality for decryption. 28 // Also includes decoder specific functionality for decryption.
28 // 29 //
29 // NOTE: It is illegal to call any method when IsEndOfStream() is true. 30 // NOTE: It is illegal to call any method when IsEndOfStream() is true.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 106
106 // Constructor helper method for memory allocations. 107 // Constructor helper method for memory allocations.
107 void Initialize(); 108 void Initialize();
108 109
109 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer); 110 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
110 }; 111 };
111 112
112 } // namespace media 113 } // namespace media
113 114
114 #endif // MEDIA_BASE_DECODER_BUFFER_H_ 115 #endif // MEDIA_BASE_DECODER_BUFFER_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/decoder_buffer.cc » ('j') | media/base/decoder_buffer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698