Index: media/gpu/h264_dpb.h |
diff --git a/content/common/gpu/media/h264_dpb.h b/media/gpu/h264_dpb.h |
similarity index 94% |
rename from content/common/gpu/media/h264_dpb.h |
rename to media/gpu/h264_dpb.h |
index 9c6753878c91eb9152940b4d76e8b78b04a90de6..7e473de0de0e457c6afc98c02513ea600c5cc496 100644 |
--- a/content/common/gpu/media/h264_dpb.h |
+++ b/media/gpu/h264_dpb.h |
@@ -5,8 +5,8 @@ |
// This file contains an implementation of an H.264 Decoded Picture Buffer |
// used in H264 decoders. |
-#ifndef CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_ |
-#define CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_ |
+#ifndef MEDIA_GPU_H264_DPB_H_ |
+#define MEDIA_GPU_H264_DPB_H_ |
#include <stddef.h> |
@@ -16,7 +16,7 @@ |
#include "base/memory/ref_counted.h" |
#include "media/filters/h264_parser.h" |
-namespace content { |
+namespace media { |
class V4L2H264Picture; |
class VaapiH264Picture; |
@@ -60,9 +60,9 @@ class H264Picture : public base::RefCounted<H264Picture> { |
media::H264SliceHeader::Type type; |
int nal_ref_idc; |
- bool idr; // IDR picture? |
+ bool idr; // IDR picture? |
int idr_pic_id; // Valid only if idr == true. |
- bool ref; // reference picture? |
+ bool ref; // reference picture? |
bool long_term; // long term reference picture? |
bool outputted; |
// Does memory management op 5 needs to be executed after this |
@@ -160,7 +160,9 @@ class H264DPB { |
bool IsFull() const { return pics_.size() == max_num_pics_; } |
// Per H264 spec, increase to 32 if interlaced video is supported. |
- enum { kDPBMaxSize = 16, }; |
+ enum { |
+ kDPBMaxSize = 16, |
+ }; |
private: |
void UpdatePicPositions(); |
@@ -171,6 +173,6 @@ class H264DPB { |
DISALLOW_COPY_AND_ASSIGN(H264DPB); |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_ |
+#endif // MEDIA_GPU_H264_DPB_H_ |