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

Side by Side Diff: media/base/video_decoder_config.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable DecodeFrame_LargerXXX tests to make Valgrind happy. Created 9 years, 4 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 | « media/base/test_data_util.cc ('k') | media/base/video_decoder_config.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BASE_VIDEO_DECODER_CONFIG_H_ 5 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 10
(...skipping 12 matching lines...) Expand all
23 // 23 //
24 // The only acceptable time to add a new codec is if there is production code 24 // The only acceptable time to add a new codec is if there is production code
25 // that uses said codec in the same CL. 25 // that uses said codec in the same CL.
26 }; 26 };
27 27
28 class VideoDecoderConfig { 28 class VideoDecoderConfig {
29 public: 29 public:
30 VideoDecoderConfig(VideoCodec codec, int width, int height, 30 VideoDecoderConfig(VideoCodec codec, int width, int height,
31 int surface_width, int surface_height, 31 int surface_width, int surface_height,
32 int frame_rate_numerator, int frame_rate_denominator, 32 int frame_rate_numerator, int frame_rate_denominator,
33 uint8* extra_data, size_t extra_data_size); 33 const uint8* extra_data, size_t extra_data_size);
34 ~VideoDecoderConfig(); 34 ~VideoDecoderConfig();
35 35
36 VideoCodec codec() const; 36 VideoCodec codec() const;
37 int width() const; 37 int width() const;
38 int height() const; 38 int height() const;
39 int surface_width() const; 39 int surface_width() const;
40 int surface_height() const; 40 int surface_height() const;
41 int frame_rate_numerator() const; 41 int frame_rate_numerator() const;
42 int frame_rate_denominator() const; 42 int frame_rate_denominator() const;
43 uint8* extra_data() const; 43 uint8* extra_data() const;
(...skipping 18 matching lines...) Expand all
62 // Optional byte data required to initialize video decoders. 62 // Optional byte data required to initialize video decoders.
63 scoped_array<uint8> extra_data_; 63 scoped_array<uint8> extra_data_;
64 size_t extra_data_size_; 64 size_t extra_data_size_;
65 65
66 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); 66 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig);
67 }; 67 };
68 68
69 } // namespace media 69 } // namespace media
70 70
71 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 71 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/test_data_util.cc ('k') | media/base/video_decoder_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698