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

Side by Side Diff: media/filters/ffmpeg_common.h

Issue 99160: Clean up FFmpeg media formats and switch to using av_get_bits_per_sample_format(). (Closed)
Patch Set: Created 11 years, 7 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_FILTERS_FFMPEG_COMMON_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_COMMON_H_
6 #define MEDIA_FILTERS_FFMPEG_COMMON_H_ 6 #define MEDIA_FILTERS_FFMPEG_COMMON_H_
7 7
8 // Used for FFmpeg error codes. 8 // Used for FFmpeg error codes.
9 #include <cerrno> 9 #include <cerrno>
10 10
(...skipping 13 matching lines...) Expand all
24 24
25 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument 25 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument
26 // to scoped_ptr_malloc. 26 // to scoped_ptr_malloc.
27 class ScopedPtrAVFree { 27 class ScopedPtrAVFree {
28 public: 28 public:
29 inline void operator()(void* x) const { 29 inline void operator()(void* x) const {
30 av_free(x); 30 av_free(x);
31 } 31 }
32 }; 32 };
33 33
34 // MediaFormat key identifying the CodecID.
35 extern const char kFFmpegCodecID[];
36
37 // FFmpeg MIME types. 34 // FFmpeg MIME types.
38 namespace mime_type { 35 namespace mime_type {
39 36
40 extern const char kFFmpegAudio[]; 37 extern const char kFFmpegAudio[];
41 extern const char kFFmpegVideo[]; 38 extern const char kFFmpegVideo[];
42 39
43 } // namespace mime_type 40 } // namespace mime_type
44 41
45 namespace interface_id { 42 namespace interface_id {
46 43
47 extern const char kFFmpegDemuxerStream[]; 44 extern const char kFFmpegDemuxerStream[];
48 45
49 } // namespace interface_id 46 } // namespace interface_id
50 47
51 48
52 } // namespace media 49 } // namespace media
53 50
54 #endif // MEDIA_FILTERS_FFMPEG_COMMON_H_ 51 #endif // MEDIA_FILTERS_FFMPEG_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698