| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ | 5 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ |
| 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ | 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | |
| 11 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 12 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 14 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" | 13 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" |
| 15 #include "media/ffmpeg/ffmpeg_deleters.h" | 14 #include "media/ffmpeg/ffmpeg_deleters.h" |
| 16 | 15 |
| 17 struct AVCodecContext; | 16 struct AVCodecContext; |
| 18 struct AVFrame; | 17 struct AVFrame; |
| 19 | 18 |
| 20 namespace media { | 19 namespace media { |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 84 |
| 86 typedef std::vector<uint8_t> SerializedAudioFrames; | 85 typedef std::vector<uint8_t> SerializedAudioFrames; |
| 87 SerializedAudioFrames serialized_audio_frames_; | 86 SerializedAudioFrames serialized_audio_frames_; |
| 88 | 87 |
| 89 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder); | 88 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder); |
| 90 }; | 89 }; |
| 91 | 90 |
| 92 } // namespace media | 91 } // namespace media |
| 93 | 92 |
| 94 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ | 93 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ |
| OLD | NEW |