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

Side by Side Diff: media/webm/chromeos/webm_encoder.h

Issue 11791006: Roll speex, flac, libvpx DEPS to get shim header changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « content/browser/speech/audio_encoder.cc ('k') | remoting/codec/audio_decoder_speex.cc » ('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 (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_WEBM_CHROMEOS_WEBM_ENCODER_H_ 5 #ifndef MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
6 #define MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_ 6 #define MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
7 7
8 #include <stack> 8 #include <stack>
9 #include <stdio.h> 9 #include <stdio.h>
10 10
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 #include "media/webm/chromeos/ebml_writer.h" 13 #include "media/webm/chromeos/ebml_writer.h"
14 14
15 extern "C" { 15 extern "C" {
16 #define VPX_CODEC_DISABLE_COMPAT 1 16 #define VPX_CODEC_DISABLE_COMPAT 1
17 #include "third_party/libvpx/libvpx.h" 17 #include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
18 #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
18 } 19 }
19 20
20 class FilePath; 21 class FilePath;
21 class SkBitmap; 22 class SkBitmap;
22 23
23 namespace media { 24 namespace media {
24 25
25 namespace chromeos { 26 namespace chromeos {
26 27
27 // WebM encoder using libvpx. Currently only supports one-pass, constant bitrate 28 // WebM encoder using libvpx. Currently only supports one-pass, constant bitrate
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool has_errors_; 94 bool has_errors_;
94 95
95 DISALLOW_COPY_AND_ASSIGN(WebmEncoder); 96 DISALLOW_COPY_AND_ASSIGN(WebmEncoder);
96 }; 97 };
97 98
98 } // namespace chromeos 99 } // namespace chromeos
99 100
100 } // namespace media 101 } // namespace media
101 102
102 #endif // MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_ 103 #endif // MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
OLDNEW
« no previous file with comments | « content/browser/speech/audio_encoder.cc ('k') | remoting/codec/audio_decoder_speex.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698