summaryrefslogtreecommitdiffstats
path: root/media/base/decryptor.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 19:50:09 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 19:50:09 +0000
commitb3341733befdca5563123e90b65adbd92b97b2ad (patch)
tree2821621c5dc84f07b3939ede66e7edbb6afaa982 /media/base/decryptor.h
parent48697d8a33d2b98f7401a3b1e657c86cf3dba981 (diff)
downloadchromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.zip
chromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.tar.gz
chromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.tar.bz2
Eliminate media::Buffer as a base class for media::DecoderBuffer and media::DataBuffer.
It was never a good idea in the first place. Our usage is exclusively with DecoderBuffers or DataBuffers. There's never a case where we benefit from using Buffer as a base class aside from hiding GetWriteableData(), however it's not a compelling enough reason to keep Buffer around. BUG=169614 TBR=dmichael Review URL: https://codereview.chromium.org/11880008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/decryptor.h')
-rw-r--r--media/base/decryptor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/decryptor.h b/media/base/decryptor.h
index 4cc05a1..f27a7bf 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -17,7 +17,7 @@
namespace media {
class AudioDecoderConfig;
-class Buffer;
+class DataBuffer;
class DecoderBuffer;
class VideoDecoderConfig;
class VideoFrame;
@@ -146,7 +146,7 @@ class MEDIA_EXPORT Decryptor {
// Helper structure for managing multiple decoded audio buffers per input.
// TODO(xhwang): Rename this to AudioFrames.
- typedef std::list<scoped_refptr<Buffer> > AudioBuffers;
+ typedef std::list<scoped_refptr<DataBuffer> > AudioBuffers;
// Indicates completion of audio/video decrypt-and-decode operation.
//