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

Unified Diff: media/gpu/android_video_encode_accelerator.h

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
Index: media/gpu/android_video_encode_accelerator.h
diff --git a/media/gpu/android_video_encode_accelerator.h b/media/gpu/android_video_encode_accelerator.h
index 28b787bd5a9d6ecd1cf8268d4469a1d83e839626..ce0fb704ec7ec7aa3a712eaa88690c3f82153aff 100644
--- a/media/gpu/android_video_encode_accelerator.h
+++ b/media/gpu/android_video_encode_accelerator.h
@@ -23,33 +23,30 @@
#include "media/video/video_encode_accelerator.h"
namespace media {
-class BitstreamBuffer;
-} // namespace media
-namespace media {
+class BitstreamBuffer;
-// Android-specific implementation of media::VideoEncodeAccelerator, enabling
+// Android-specific implementation of VideoEncodeAccelerator, enabling
// hardware-acceleration of video encoding, based on Android's MediaCodec class
// (http://developer.android.com/reference/android/media/MediaCodec.html). This
// class expects to live and be called on a single thread (the GPU process'
// ChildThread).
class MEDIA_GPU_EXPORT AndroidVideoEncodeAccelerator
- : public media::VideoEncodeAccelerator {
+ : public VideoEncodeAccelerator {
public:
AndroidVideoEncodeAccelerator();
~AndroidVideoEncodeAccelerator() override;
- // media::VideoEncodeAccelerator implementation.
- media::VideoEncodeAccelerator::SupportedProfiles GetSupportedProfiles()
- override;
- bool Initialize(media::VideoPixelFormat format,
+ // VideoEncodeAccelerator implementation.
+ VideoEncodeAccelerator::SupportedProfiles GetSupportedProfiles() override;
+ bool Initialize(VideoPixelFormat format,
const gfx::Size& input_visible_size,
- media::VideoCodecProfile output_profile,
+ VideoCodecProfile output_profile,
uint32_t initial_bitrate,
Client* client) override;
- void Encode(const scoped_refptr<media::VideoFrame>& frame,
+ void Encode(const scoped_refptr<VideoFrame>& frame,
bool force_keyframe) override;
- void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override;
+ void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) override;
void RequestEncodingParametersChange(uint32_t bitrate,
uint32_t framerate) override;
void Destroy() override;
@@ -79,15 +76,14 @@ class MEDIA_GPU_EXPORT AndroidVideoEncodeAccelerator
// error triggers.
std::unique_ptr<base::WeakPtrFactory<Client>> client_ptr_factory_;
- std::unique_ptr<media::VideoCodecBridge> media_codec_;
+ std::unique_ptr<VideoCodecBridge> media_codec_;
// Bitstream buffers waiting to be populated & returned to the client.
- std::vector<media::BitstreamBuffer> available_bitstream_buffers_;
+ std::vector<BitstreamBuffer> available_bitstream_buffers_;
// Frames waiting to be passed to the codec, queued until an input buffer is
// available. Each element is a tuple of <Frame, key_frame, enqueue_time>.
- typedef std::queue<
- std::tuple<scoped_refptr<media::VideoFrame>, bool, base::Time>>
+ typedef std::queue<std::tuple<scoped_refptr<VideoFrame>, bool, base::Time>>
PendingFrames;
PendingFrames pending_frames_;
« no previous file with comments | « media/gpu/android_video_decode_accelerator_unittest.cc ('k') | media/gpu/android_video_encode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698