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

Unified Diff: media/base/decoder_buffer.h

Issue 11887011: Tighten up media::DecoderBuffer data requirements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/base/decoder_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decoder_buffer.h
diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h
index dca877634c25b5ead1da7c34387f5b51bb32493a..7cb496b119b1158ec58a481170b95365f5ab7300 100644
--- a/media/base/decoder_buffer.h
+++ b/media/base/decoder_buffer.h
@@ -35,9 +35,9 @@ class MEDIA_EXPORT DecoderBuffer
#endif
};
- // Allocates buffer of size |buffer_size| >= 0. Buffer will be padded and
- // aligned as necessary.
- explicit DecoderBuffer(int buffer_size);
+ // Allocates buffer with |size| >= 0. Buffer will be padded and aligned
+ // as necessary.
+ explicit DecoderBuffer(int size);
// Create a DecoderBuffer whose |data_| is copied from |data|. Buffer will be
// padded and aligned as necessary. |data| must not be NULL and |size| >= 0.
@@ -62,9 +62,6 @@ class MEDIA_EXPORT DecoderBuffer
void SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config);
// If there's no data in this buffer, it represents end of stream.
- //
- // TODO(scherkus): Change to be an actual settable flag as opposed to being
- // based on the value of |data_|, see http://crbug.com/169133
bool IsEndOfStream() const;
protected:
@@ -80,7 +77,7 @@ class MEDIA_EXPORT DecoderBuffer
base::TimeDelta timestamp_;
base::TimeDelta duration_;
- int buffer_size_;
+ int size_;
scoped_ptr<uint8, base::ScopedPtrAlignedFree> data_;
scoped_ptr<DecryptConfig> decrypt_config_;
« no previous file with comments | « no previous file | media/base/decoder_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698