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

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

Issue 12263013: media: Add support for playback of VP8 Alpha video streams (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments on patchset 2 Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_FFMPEG_FFMPEG_COMMON_H_ 5 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
6 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_ 6 #define MEDIA_FFMPEG_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 11 matching lines...) Expand all
22 // TODO(scherkus): fix and upstream the compiler warnings. 22 // TODO(scherkus): fix and upstream the compiler warnings.
23 MSVC_PUSH_DISABLE_WARNING(4244); 23 MSVC_PUSH_DISABLE_WARNING(4244);
24 #include <libavcodec/avcodec.h> 24 #include <libavcodec/avcodec.h>
25 #include <libavformat/avformat.h> 25 #include <libavformat/avformat.h>
26 #include <libavformat/avio.h> 26 #include <libavformat/avio.h>
27 #include <libavutil/audioconvert.h> 27 #include <libavutil/audioconvert.h>
28 #include <libavutil/avutil.h> 28 #include <libavutil/avutil.h>
29 #include <libavutil/mathematics.h> 29 #include <libavutil/mathematics.h>
30 #include <libavutil/log.h> 30 #include <libavutil/log.h>
31 #include <libavutil/imgutils.h> 31 #include <libavutil/imgutils.h>
32 #include <libavcodec/avcodec.h>
Tom Finegan 2013/02/25 22:56:06 You already have this on line 24, remove.
vignesh 2013/02/25 23:33:14 Done.
32 MSVC_POP_WARNING(); 33 MSVC_POP_WARNING();
33 } // extern "C" 34 } // extern "C"
34 35
35 namespace media { 36 namespace media {
36 37
37 class AudioDecoderConfig; 38 class AudioDecoderConfig;
38 class VideoDecoderConfig; 39 class VideoDecoderConfig;
39 40
40 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument 41 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument
41 // to scoped_ptr_malloc. 42 // to scoped_ptr_malloc.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 101
101 // Converts an FFmpeg video codec ID into its corresponding supported codec id. 102 // Converts an FFmpeg video codec ID into its corresponding supported codec id.
102 VideoCodec CodecIDToVideoCodec(CodecID codec_id); 103 VideoCodec CodecIDToVideoCodec(CodecID codec_id);
103 104
104 // Converts an FFmpeg audio codec ID into its corresponding supported codec id. 105 // Converts an FFmpeg audio codec ID into its corresponding supported codec id.
105 AudioCodec CodecIDToAudioCodec(CodecID codec_id); 106 AudioCodec CodecIDToAudioCodec(CodecID codec_id);
106 107
107 } // namespace media 108 } // namespace media
108 109
109 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 110 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698