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

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

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.cc
diff --git a/content/common/gpu/media/v4l2_video_device.cc b/content/common/gpu/media/v4l2_video_device.cc
index 801932d1753eb9ba7ef2ad60c2be54592bb5f3dc..a13169353ee103843c6d34604cee857433e2ef51 100644
--- a/content/common/gpu/media/v4l2_video_device.cc
+++ b/content/common/gpu/media/v4l2_video_device.cc
@@ -2,16 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <libdrm/drm_fourcc.h>
#include <linux/videodev2.h>
#include "base/numerics/safe_conversions.h"
#include "content/common/gpu/media/generic_v4l2_video_device.h"
#include "content/common/gpu/media/tegra_v4l2_video_device.h"
-// TODO(posciak): remove this once V4L2 headers are updated.
-#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')
-
namespace content {
V4L2Device::~V4L2Device() {}
@@ -44,9 +40,6 @@ media::VideoFrame::Format V4L2Device::V4L2PixFmtToVideoFrameFormat(
case V4L2_PIX_FMT_YUV420M:
return media::VideoFrame::I420;
- case V4L2_PIX_FMT_RGB32:
- return media::VideoFrame::ARGB;
-
default:
LOG(FATAL) << "Add more cases as needed";
return media::VideoFrame::UNKNOWN;
@@ -78,9 +71,6 @@ uint32 V4L2Device::VideoCodecProfileToV4L2PixFmt(
} else if (profile >= media::VP8PROFILE_MIN &&
profile <= media::VP8PROFILE_MAX) {
return V4L2_PIX_FMT_VP8;
- } else if (profile >= media::VP9PROFILE_MIN &&
- profile <= media::VP9PROFILE_MAX) {
- return V4L2_PIX_FMT_VP9;
} else {
LOG(FATAL) << "Add more cases as needed";
return 0;
@@ -88,26 +78,6 @@ uint32 V4L2Device::VideoCodecProfileToV4L2PixFmt(
}
// static
-uint32_t V4L2Device::V4L2PixFmtToDrmFormat(uint32_t format) {
- switch (format) {
- case V4L2_PIX_FMT_NV12:
- case V4L2_PIX_FMT_NV12M:
- return DRM_FORMAT_NV12;
-
- case V4L2_PIX_FMT_YUV420:
- case V4L2_PIX_FMT_YUV420M:
- return DRM_FORMAT_YUV420;
-
- case V4L2_PIX_FMT_RGB32:
- return DRM_FORMAT_ARGB8888;
-
- default:
- LOG(FATAL) << "Add more cases as needed";
- return 0;
- }
-}
-
-// static
gfx::Size V4L2Device::CodedSizeFromV4L2Format(struct v4l2_format format) {
gfx::Size coded_size;
gfx::Size visible_size;
« no previous file with comments | « content/common/gpu/media/v4l2_video_device.h ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698