generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change MaxLumaSampleRate to be based on frame resolution.

Browse Source 
MaxLumaSampleRate generation code now takes into account the frame
resolution of every frame.

BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1203

Change-Id: I666fa2f21971ff4fb80219ef29dee3254cbb370c
This commit is contained in:
Frank Galligan 2016-04-27 11:39:29 -07:00
parent 26d673e737
commit 196708a95f
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/vp9_level_stats.cc
View File

@ -64,12 +64,6 @@ void Vp9LevelStats::AddFrame(const Vp9HeaderParser& parser, int64_t time_ns) {
max_luma_end_ns_ = luma_window_.back().first; max_luma_end_ns_ = luma_window_.back().first;
} }
// Max luma sample rate does not take frame resizing into account. So
// I'm doing max number of frames in one second times max width times max
// height to generate Max luma sample rate.
if (luma_window_.size() > max_frames_in_one_second_)
max_frames_in_one_second_ = luma_window_.size();
// Record CPB stats. // Record CPB stats.
// Remove all frames that are less than window size. // Remove all frames that are less than window size.
while (cpb_window_.size() > 3) { while (cpb_window_.size() > 3) {
@ -210,9 +204,7 @@ Vp9Level Vp9LevelStats::GetLevel() const {
return max_level; return max_level;
} }
int64_t Vp9LevelStats::GetMaxLumaSampleRate() const { int64_t Vp9LevelStats::GetMaxLumaSampleRate() const { return max_luma_size_; }
return max_luma_picture_size_ * max_frames_in_one_second_;
}
int64_t Vp9LevelStats::GetMaxLumaPictureSize() const { int64_t Vp9LevelStats::GetMaxLumaPictureSize() const {
return max_luma_picture_size_; return max_luma_picture_size_;

2
common/vp9_level_stats.h
View File

@ -73,7 +73,6 @@ class Vp9LevelStats {
current_luma_size_(0), current_luma_size_(0),
max_luma_size_(0), max_luma_size_(0),
max_luma_end_ns_(0), max_luma_end_ns_(0),
max_frames_in_one_second_(0),
first_altref(true), first_altref(true),
frames_since_last_altref(0), frames_since_last_altref(0),
minimum_altref_distance(std::numeric_limits<int>::max()), minimum_altref_distance(std::numeric_limits<int>::max()),
@ -153,7 +152,6 @@ class Vp9LevelStats {
int64_t current_luma_size_; int64_t current_luma_size_;
int64_t max_luma_size_; int64_t max_luma_size_;
int64_t max_luma_end_ns_; int64_t max_luma_end_ns_;
size_t max_frames_in_one_second_;
bool first_altref; bool first_altref;
int frames_since_last_altref; int frames_since_last_altref;

2
webm_info.cc
View File

@ -35,7 +35,7 @@ using libwebm::Indent;
using libwebm::kNanosecondsPerSecond; using libwebm::kNanosecondsPerSecond;
using libwebm::kNanosecondsPerSecondi; using libwebm::kNanosecondsPerSecondi;
const char VERSION_STRING[] = "1.0.4.1"; const char VERSION_STRING[] = "1.0.4.2";
struct Options { struct Options {
Options(); Options();