media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h - Issue 1542013004: Switch to standard integer types in media/, take 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef Created 4 years, 12 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

« no previous file with comments | « media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h ('k') | media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <stdint.h>

	9

8 #include <vector>	10 #include <vector>

9	11

10 #include "base/compiler_specific.h"	12 #include "base/compiler_specific.h"

11 #include "base/macros.h"	13 #include "base/macros.h"

12 #include "base/memory/scoped_ptr.h"	14 #include "base/memory/scoped_ptr.h"

13 #include "base/time/time.h"	15 #include "base/time/time.h"

14 #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"

15 #include "media/ffmpeg/ffmpeg_deleters.h"	17 #include "media/ffmpeg/ffmpeg_deleters.h"

16	18

17 struct AVCodecContext;	19 struct AVCodecContext;

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85	87

86 typedef std::vector<uint8_t> SerializedAudioFrames;	88 typedef std::vector<uint8_t> SerializedAudioFrames;

87 SerializedAudioFrames serialized_audio_frames_;	89 SerializedAudioFrames serialized_audio_frames_;

88	90

89 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder);	91 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder);

90 };	92 };

91	93

92 } // namespace media	94 } // namespace media

93	95

94 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_	96 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_

OLD	NEW