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

Unified Diff: content/common/gpu/media/v4l2_video_decode_accelerator.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_decode_accelerator.h
diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h
index c6da742fc5491e9bdcbdfd9a965bd26c9dd4d84f..01714791442601555ef92bb99d66346b5ad89240 100644
--- a/content/common/gpu/media/v4l2_video_decode_accelerator.h
+++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h
@@ -275,9 +275,6 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator
bool CreateInputBuffers();
bool CreateOutputBuffers();
- // Set input and output formats before starting decode.
- bool SetupFormats();
-
//
// Methods run on child thread.
//
@@ -401,8 +398,7 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator
std::vector<OutputRecord> output_buffer_map_;
// Required size of DPB for decoding.
int output_dpb_size_;
-
- // Number of planes (i.e. separate memory buffers) for output.
+ // Stores the number of planes (i.e. separate memory buffers) for output.
size_t output_planes_count_;
// Pictures that are ready but not sent to PictureReady yet.
@@ -438,8 +434,6 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator
// The codec we'll be decoding for.
media::VideoCodecProfile video_profile_;
- // Chosen output format.
- uint32_t output_format_fourcc_;
// The WeakPtrFactory for |weak_this_|.
base::WeakPtrFactory<V4L2VideoDecodeAccelerator> weak_this_factory_;
« no previous file with comments | « content/common/gpu/media/tegra_v4l2_video_device.cc ('k') | content/common/gpu/media/v4l2_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698