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

Unified Diff: media/gpu/vp9_decoder.cc

Issue 2061823003: media: Drop "media::" in media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: work around clang format by adding an empty line Created 4 years, 6 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/gpu/vp9_decoder.h ('k') | media/gpu/vp9_picture.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/vp9_decoder.cc
diff --git a/media/gpu/vp9_decoder.cc b/media/gpu/vp9_decoder.cc
index 58b42ca63b25c80e1756e54ed4682428ee09de4f..ec10b768b3753d5b36bd71a888f6418f1a0437d8 100644
--- a/media/gpu/vp9_decoder.cc
+++ b/media/gpu/vp9_decoder.cc
@@ -19,7 +19,7 @@ VP9Decoder::VP9Accelerator::~VP9Accelerator() {}
VP9Decoder::VP9Decoder(VP9Accelerator* accelerator)
: state_(kNeedStreamMetadata), accelerator_(accelerator) {
DCHECK(accelerator_);
- ref_frames_.resize(media::kVp9NumRefFrames);
+ ref_frames_.resize(kVp9NumRefFrames);
}
VP9Decoder::~VP9Decoder() {}
@@ -53,17 +53,17 @@ VP9Decoder::DecodeResult VP9Decoder::Decode() {
while (1) {
// Read a new frame header if one is not awaiting decoding already.
if (!curr_frame_hdr_) {
- std::unique_ptr<media::Vp9FrameHeader> hdr(new media::Vp9FrameHeader());
- media::Vp9Parser::Result res = parser_.ParseNextFrame(hdr.get());
+ std::unique_ptr<Vp9FrameHeader> hdr(new Vp9FrameHeader());
+ Vp9Parser::Result res = parser_.ParseNextFrame(hdr.get());
switch (res) {
- case media::Vp9Parser::kOk:
+ case Vp9Parser::kOk:
curr_frame_hdr_.reset(hdr.release());
break;
- case media::Vp9Parser::kEOStream:
+ case Vp9Parser::kEOStream:
return kRanOutOfStreamData;
- case media::Vp9Parser::kInvalidStream:
+ case Vp9Parser::kInvalidStream:
DVLOG(1) << "Error parsing stream";
SetError();
return kDecodeError;
@@ -141,7 +141,7 @@ VP9Decoder::DecodeResult VP9Decoder::Decode() {
}
void VP9Decoder::RefreshReferenceFrames(const scoped_refptr<VP9Picture>& pic) {
- for (size_t i = 0; i < media::kVp9NumRefFrames; ++i) {
+ for (size_t i = 0; i < kVp9NumRefFrames; ++i) {
DCHECK(!pic->frame_hdr->IsKeyframe() || pic->frame_hdr->RefreshFlag(i));
if (pic->frame_hdr->RefreshFlag(i))
ref_frames_[i] = pic;
@@ -177,7 +177,7 @@ gfx::Size VP9Decoder::GetPicSize() const {
size_t VP9Decoder::GetRequiredNumOfPictures() const {
// kMaxVideoFrames to keep higher level media pipeline populated, +2 for the
// pictures being parsed and decoded currently.
- return media::limits::kMaxVideoFrames + media::kVp9NumRefFrames + 2;
+ return limits::kMaxVideoFrames + kVp9NumRefFrames + 2;
}
} // namespace media
« no previous file with comments | « media/gpu/vp9_decoder.h ('k') | media/gpu/vp9_picture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698