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

Unified Diff: media/gpu/h264_dpb.cc

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues Created 4 years, 8 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
Index: media/gpu/h264_dpb.cc
diff --git a/content/common/gpu/media/h264_dpb.cc b/media/gpu/h264_dpb.cc
similarity index 94%
rename from content/common/gpu/media/h264_dpb.cc
rename to media/gpu/h264_dpb.cc
index 56bdd8d14d4a758577acbcfae42918baddd77cb8..ea1c4db8ae3dcf6a7712575558b1a8ad19240c3d 100644
--- a/content/common/gpu/media/h264_dpb.cc
+++ b/media/gpu/h264_dpb.cc
@@ -8,9 +8,9 @@
#include "base/logging.h"
#include "base/stl_util.h"
-#include "content/common/gpu/media/h264_dpb.h"
+#include "media/gpu/h264_dpb.h"
-namespace content {
+namespace media {
H264Picture::H264Picture()
: pic_order_cnt_type(0),
@@ -44,8 +44,7 @@ H264Picture::H264Picture()
memset(&ref_pic_marking, 0, sizeof(ref_pic_marking));
}
-H264Picture::~H264Picture() {
-}
+H264Picture::~H264Picture() {}
V4L2H264Picture* H264Picture::AsV4L2H264Picture() {
return nullptr;
@@ -78,8 +77,8 @@ void H264DPB::UpdatePicPositions() {
}
void H264DPB::DeleteByPOC(int poc) {
- for (H264Picture::Vector::iterator it = pics_.begin();
- it != pics_.end(); ++it) {
+ for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end();
+ ++it) {
if ((*it)->pic_order_cnt == poc) {
pics_.erase(it);
UpdatePicPositions();
@@ -90,7 +89,7 @@ void H264DPB::DeleteByPOC(int poc) {
}
void H264DPB::DeleteUnused() {
- for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end(); ) {
+ for (H264Picture::Vector::iterator it = pics_.begin(); it != pics_.end();) {
if ((*it)->outputted && !(*it)->ref)
it = pics_.erase(it);
else
@@ -172,4 +171,4 @@ void H264DPB::GetLongTermRefPicsAppending(H264Picture::Vector* out) {
}
}
-} // namespace content
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698