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

Unified Diff: media/base/video_decoder_config.cc

Issue 10832087: Remove VideoDecoderConfig.frame_rate_xxx() & VideoFrame:Get/SetDuration() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address more CR comments. Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/base/video_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_decoder_config.cc
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
index 1e00e34c3f71a7617323673d38955dda48c7d42c..6fa1aec5f78f742e0bd772adc10169073a076c83 100644
--- a/media/base/video_decoder_config.cc
+++ b/media/base/video_decoder_config.cc
@@ -15,8 +15,6 @@ VideoDecoderConfig::VideoDecoderConfig()
: codec_(kUnknownVideoCodec),
profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
format_(VideoFrame::INVALID),
- frame_rate_numerator_(0),
- frame_rate_denominator_(0),
aspect_ratio_numerator_(0),
aspect_ratio_denominator_(0),
extra_data_size_(0) {
@@ -27,14 +25,11 @@ VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
VideoFrame::Format format,
const gfx::Size& coded_size,
const gfx::Rect& visible_rect,
- int frame_rate_numerator,
- int frame_rate_denominator,
int aspect_ratio_numerator,
int aspect_ratio_denominator,
const uint8* extra_data,
size_t extra_data_size) {
Initialize(codec, profile, format, coded_size, visible_rect,
- frame_rate_numerator, frame_rate_denominator,
aspect_ratio_numerator, aspect_ratio_denominator,
extra_data, extra_data_size, true);
}
@@ -68,8 +63,6 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
VideoFrame::Format format,
const gfx::Size& coded_size,
const gfx::Rect& visible_rect,
- int frame_rate_numerator,
- int frame_rate_denominator,
int aspect_ratio_numerator,
int aspect_ratio_denominator,
const uint8* extra_data,
@@ -95,8 +88,6 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
format_ = format;
coded_size_ = coded_size;
visible_rect_ = visible_rect;
- frame_rate_numerator_ = frame_rate_numerator;
- frame_rate_denominator_ = frame_rate_denominator;
aspect_ratio_numerator_ = aspect_ratio_numerator;
aspect_ratio_denominator_ = aspect_ratio_denominator;
extra_data_size_ = extra_data_size;
@@ -131,8 +122,6 @@ void VideoDecoderConfig::CopyFrom(const VideoDecoderConfig& video_config) {
video_config.format(),
video_config.coded_size(),
video_config.visible_rect(),
- video_config.frame_rate_numerator(),
- video_config.frame_rate_denominator(),
video_config.aspect_ratio_numerator(),
video_config.aspect_ratio_denominator(),
video_config.extra_data(),
@@ -142,7 +131,6 @@ void VideoDecoderConfig::CopyFrom(const VideoDecoderConfig& video_config) {
bool VideoDecoderConfig::IsValidConfig() const {
return codec_ != kUnknownVideoCodec &&
- frame_rate_denominator_ > 0 &&
aspect_ratio_numerator_ > 0 &&
aspect_ratio_denominator_ > 0 &&
VideoFrame::IsValidConfig(
@@ -173,8 +161,6 @@ std::string VideoDecoderConfig::AsHumanReadableString() const {
<< "," << visible_rect().height() << "]"
<< " natural size: [" << natural_size().width()
<< "," << natural_size().height() << "]"
- << " frame rate: " << frame_rate_numerator()
- << "/" << frame_rate_denominator()
<< " aspect ratio: " << aspect_ratio_numerator()
<< "/" << aspect_ratio_denominator();
return s.str();
@@ -204,14 +190,6 @@ gfx::Size VideoDecoderConfig::natural_size() const {
return natural_size_;
}
-int VideoDecoderConfig::frame_rate_numerator() const {
- return frame_rate_numerator_;
-}
-
-int VideoDecoderConfig::frame_rate_denominator() const {
- return frame_rate_denominator_;
-}
-
int VideoDecoderConfig::aspect_ratio_numerator() const {
return aspect_ratio_numerator_;
}
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/base/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698