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

Unified Diff: media/gpu/v4l2_video_decode_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
« no previous file with comments | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/v4l2_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/v4l2_video_decode_accelerator.h
diff --git a/media/gpu/v4l2_video_decode_accelerator.h b/media/gpu/v4l2_video_decode_accelerator.h
index 2a0ae89bab801b6e48ec24681296002d6af6ccc9..a756fb6facc9b8a5b4657bb664029c1acf2caf66 100644
--- a/media/gpu/v4l2_video_decode_accelerator.h
+++ b/media/gpu/v4l2_video_decode_accelerator.h
@@ -46,11 +46,11 @@ class H264Parser;
// is waited on with epoll(). There are three threads involved in this class:
//
// * The child thread, which is the main GPU process thread which calls the
-// media::VideoDecodeAccelerator entry points. Calls from this thread
+// VideoDecodeAccelerator entry points. Calls from this thread
// generally do not block (with the exception of Initialize() and Destroy()).
// They post tasks to the decoder_thread_, which actually services the task
// and calls back when complete through the
-// media::VideoDecodeAccelerator::Client interface.
+// VideoDecodeAccelerator::Client interface.
// * The decoder_thread_, owned by this class. It services API tasks, through
// the *Task() routines, as well as V4L2 device events, through
// ServiceDeviceTask(). Almost all state modification is done on this thread
@@ -85,7 +85,7 @@ class H264Parser;
// buffrers. We cannot drop any frame during resolution change. So V4L2VDA
// should destroy output buffers after image processor returns all the frames.
class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
- : public media::VideoDecodeAccelerator {
+ : public VideoDecodeAccelerator {
public:
V4L2VideoDecodeAccelerator(
EGLDisplay egl_display,
@@ -94,12 +94,11 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
const scoped_refptr<V4L2Device>& device);
~V4L2VideoDecodeAccelerator() override;
- // media::VideoDecodeAccelerator implementation.
+ // VideoDecodeAccelerator implementation.
// Note: Initialize() and Destroy() are synchronous.
bool Initialize(const Config& config, Client* client) override;
- void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
- void AssignPictureBuffers(
- const std::vector<media::PictureBuffer>& buffers) override;
+ void Decode(const BitstreamBuffer& bitstream_buffer) override;
+ void AssignPictureBuffers(const std::vector<PictureBuffer>& buffers) override;
void ReusePictureBuffer(int32_t picture_buffer_id) override;
void Flush() override;
void Reset() override;
@@ -109,8 +108,7 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
override;
- static media::VideoDecodeAccelerator::SupportedProfiles
- GetSupportedProfiles();
+ static VideoDecodeAccelerator::SupportedProfiles GetSupportedProfiles();
private:
// These are rather subjectively tuned.
@@ -124,9 +122,9 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
kInputBufferMaxSizeFor4k = 4 * kInputBufferMaxSizeFor1080p,
// Number of output buffers to use for each VDA stage above what's required
// by the decoder (e.g. DPB size, in H264). We need
- // media::limits::kMaxVideoFrames to fill up the GpuVideoDecode pipeline,
+ // limits::kMaxVideoFrames to fill up the GpuVideoDecode pipeline,
// and +1 for a frame in transit.
- kDpbOutputBufferExtraCount = media::limits::kMaxVideoFrames + 1,
+ kDpbOutputBufferExtraCount = limits::kMaxVideoFrames + 1,
};
// Internal state of the decoder.
@@ -195,7 +193,7 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
// Enqueue a BitstreamBuffer to decode. This will enqueue a buffer to the
// decoder_input_queue_, then queue a DecodeBufferTask() to actually decode
// the buffer.
- void DecodeTask(const media::BitstreamBuffer& bitstream_buffer);
+ void DecodeTask(const BitstreamBuffer& bitstream_buffer);
// Decode from the buffers queued in decoder_input_queue_. Calls
// DecodeBufferInitial() or DecodeBufferContinue() as appropriate.
@@ -403,7 +401,7 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
std::queue<linked_ptr<BitstreamBufferRef>> decoder_input_queue_;
// For H264 decode, hardware requires that we send it frame-sized chunks.
// We'll need to parse the stream.
- std::unique_ptr<media::H264Parser> decoder_h264_parser_;
+ std::unique_ptr<H264Parser> decoder_h264_parser_;
// Set if the decoder has a pending incomplete frame in an input buffer.
bool decoder_partial_frame_pending_;
@@ -479,7 +477,7 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator
MakeGLContextCurrentCallback make_context_current_cb_;
// The codec we'll be decoding for.
- media::VideoCodecProfile video_profile_;
+ VideoCodecProfile video_profile_;
// Chosen output format.
uint32_t output_format_fourcc_;
« no previous file with comments | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/v4l2_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698