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

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

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/video_decoder_config.h ('k') | media/ffmpeg/ffmpeg_common.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 #include "media/base/video_decoder_config.h" 5 #include "media/base/video_decoder_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec, 11 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
12 int width, 12 int width,
13 int height, 13 int height,
14 int surface_width, 14 int surface_width,
15 int surface_height, 15 int surface_height,
16 int frame_rate_numerator, 16 int frame_rate_numerator,
17 int frame_rate_denominator, 17 int frame_rate_denominator,
18 uint8* extra_data, 18 const uint8* extra_data,
19 size_t extra_data_size) 19 size_t extra_data_size)
20 : codec_(codec), 20 : codec_(codec),
21 width_(width), 21 width_(width),
22 height_(height), 22 height_(height),
23 surface_width_(surface_width), 23 surface_width_(surface_width),
24 surface_height_(surface_height), 24 surface_height_(surface_height),
25 frame_rate_numerator_(frame_rate_numerator), 25 frame_rate_numerator_(frame_rate_numerator),
26 frame_rate_denominator_(frame_rate_denominator), 26 frame_rate_denominator_(frame_rate_denominator),
27 extra_data_size_(extra_data_size) { 27 extra_data_size_(extra_data_size) {
28 CHECK(extra_data_size_ == 0 || extra_data); 28 CHECK(extra_data_size_ == 0 || extra_data);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 uint8* VideoDecoderConfig::extra_data() const { 65 uint8* VideoDecoderConfig::extra_data() const {
66 return extra_data_.get(); 66 return extra_data_.get();
67 } 67 }
68 68
69 size_t VideoDecoderConfig::extra_data_size() const { 69 size_t VideoDecoderConfig::extra_data_size() const {
70 return extra_data_size_; 70 return extra_data_size_;
71 } 71 }
72 72
73 } // namespace media 73 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698