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

Unified Diff: media/capture/video/fake_video_capture_device.h

Issue 2712123003: Revert of Add MJPEG support to FakeVideoCaptureDevice (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/fake_video_capture_device.h
diff --git a/media/capture/video/fake_video_capture_device.h b/media/capture/video/fake_video_capture_device.h
index 7919e9f666b095f512a185f3fca1e3e65ebc8e85..c853b4dfde712d2cd5752ea597de844305f6695b 100644
--- a/media/capture/video/fake_video_capture_device.h
+++ b/media/capture/video/fake_video_capture_device.h
@@ -18,11 +18,6 @@
// on a given target OutputMode and frame rate.
class CAPTURE_EXPORT FakeVideoCaptureDeviceMaker {
public:
- enum class PixelFormat {
- I420 = media::PIXEL_FORMAT_I420,
- Y16 = media::PIXEL_FORMAT_Y16,
- MJPEG = media::PIXEL_FORMAT_MJPEG
- };
enum class DeliveryMode {
USE_DEVICE_INTERNAL_BUFFERS,
USE_CLIENT_PROVIDED_BUFFERS
@@ -31,7 +26,7 @@
static void GetSupportedSizes(std::vector<gfx::Size>* supported_sizes);
static std::unique_ptr<VideoCaptureDevice> MakeInstance(
- PixelFormat pixel_format,
+ VideoPixelFormat pixel_format,
DeliveryMode delivery_mode,
float frame_rate);
};
« no previous file with comments | « no previous file | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698