content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc - Issue 1815563004: Remove iOS ifdefs in src/content.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

Issue 1815563004: Remove iOS ifdefs in src/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 9 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 | « content/browser/renderer_host/media/video_capture_device_client.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

index 8e61029a89a45e04a3872149e665ab4960bee1e6..da78f9f0ad961a9a1fab5795018263a37fbb82e7 100644

--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

@@ -120,7 +120,7 @@ void VideoCaptureGpuJpegDecoder::DecodeCapturedData(

// Mask against 30 bits, to avoid (undefined) wraparound on signed integer.

next_bitstream_buffer_id_ = (next_bitstream_buffer_id_ + 1) & 0x3FFFFFFF;

-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

const gfx::Size dimensions = frame_format.frame_size;

base::SharedMemoryHandle out_handle = out_buffer->AsPlatformFile();

scoped_refptr<media::VideoFrame> out_frame =