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

Side by Side Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h

Issue 2533273002: media: Cleanup class/struct forward declarations (Closed)
Patch Set: Rebase + address comment Created 4 years 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
« no previous file with comments | « media/cast/test/utility/in_process_receiver.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" 16 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
17 #include "media/ffmpeg/ffmpeg_deleters.h" 17 #include "media/ffmpeg/ffmpeg_deleters.h"
18 18
19 struct AVCodecContext; 19 struct AVCodecContext;
20 struct AVFrame; 20 struct AVFrame;
21 21
22 namespace media { 22 namespace media {
23 class AudioBus;
24 class AudioTimestampHelper; 23 class AudioTimestampHelper;
25 } 24 }
26 25
27 namespace media { 26 namespace media {
28 // TODO(xhwang): This class is partially cloned from FFmpegAudioDecoder. When 27 // TODO(xhwang): This class is partially cloned from FFmpegAudioDecoder. When
29 // FFmpegAudioDecoder is updated, it's a pain to keep this class in sync with 28 // FFmpegAudioDecoder is updated, it's a pain to keep this class in sync with
30 // FFmpegAudioDecoder. We need a long term sustainable solution for this. See 29 // FFmpegAudioDecoder. We need a long term sustainable solution for this. See
31 // http://crbug.com/169203 30 // http://crbug.com/169203
32 class FFmpegCdmAudioDecoder { 31 class FFmpegCdmAudioDecoder {
33 public: 32 public:
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 86
88 typedef std::vector<uint8_t> SerializedAudioFrames; 87 typedef std::vector<uint8_t> SerializedAudioFrames;
89 SerializedAudioFrames serialized_audio_frames_; 88 SerializedAudioFrames serialized_audio_frames_;
90 89
91 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder); 90 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder);
92 }; 91 };
93 92
94 } // namespace media 93 } // namespace media
95 94
96 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_ 95 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/cast/test/utility/in_process_receiver.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698