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

Unified Diff: content/common/gpu/media/v4l2_video_device.h

Issue 809883004: Revert hardware decoder changes causing ChromeOS HW test crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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: content/common/gpu/media/v4l2_video_device.h
diff --git a/content/common/gpu/media/v4l2_video_device.h b/content/common/gpu/media/v4l2_video_device.h
index 7bab5366f48bd9ecb0275fa1597392b677bea93d..346dff1a497155823b5039ce2cd8c0777761eab2 100644
--- a/content/common/gpu/media/v4l2_video_device.h
+++ b/content/common/gpu/media/v4l2_video_device.h
@@ -22,7 +22,6 @@ class V4L2Device {
static media::VideoFrame::Format V4L2PixFmtToVideoFrameFormat(uint32 format);
static uint32 VideoFrameFormatToV4L2PixFmt(media::VideoFrame::Format format);
static uint32 VideoCodecProfileToV4L2PixFmt(media::VideoCodecProfile profile);
- static uint32_t V4L2PixFmtToDrmFormat(uint32_t format);
// Convert format requirements requested by a V4L2 device to gfx::Size.
static gfx::Size CodedSizeFromV4L2Format(struct v4l2_format format);
@@ -72,10 +71,6 @@ class V4L2Device {
// Returns true on success.
virtual bool Initialize() = 0;
- // Return true if the given V4L2 pixfmt can be used in CreateEGLImage()
- // for the current platform.
- virtual bool CanCreateEGLImageFrom(uint32_t v4l2_pixfmt) = 0;
-
// Creates an EGLImageKHR since each V4L2Device may use a different method of
// acquiring one and associating it to the given texture. The texture_id is
// used to bind the texture to the returned EGLImageKHR. buffer_index can be
@@ -86,8 +81,7 @@ class V4L2Device {
GLuint texture_id,
gfx::Size frame_buffer_size,
unsigned int buffer_index,
- uint32_t v4l2_pixfmt,
- size_t num_v4l2_planes) = 0;
+ size_t planes_count) = 0;
// Destroys the EGLImageKHR.
virtual EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
@@ -98,6 +92,9 @@ class V4L2Device {
// Returns the preferred V4L2 input format or 0 if don't care.
virtual uint32 PreferredInputFormat() = 0;
+
+ // Returns the preferred V4L2 output format or 0 if don't care.
+ virtual uint32 PreferredOutputFormat() = 0;
};
} // namespace content
« no previous file with comments | « content/common/gpu/media/v4l2_video_decode_accelerator.cc ('k') | content/common/gpu/media/v4l2_video_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698