content/common/gpu/media/video_decode_accelerator_unittest.cc - Issue 11961051: Merge 176816

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/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 11961051: Merge 176816 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 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:

Index: content/common/gpu/media/video_decode_accelerator_unittest.cc

===================================================================

--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 177492)

+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy)

@@ -603,7 +603,9 @@

base::SharedMemoryHandle dup_handle;

CHECK(shm.ShareToProcess(base::Process::Current().handle(), &dup_handle));

media::BitstreamBuffer bitstream_buffer(

- next_bitstream_buffer_id_++, dup_handle, next_fragment_size);

+ next_bitstream_buffer_id_, dup_handle, next_fragment_size);

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

+ next_bitstream_buffer_id_ = (next_bitstream_buffer_id_ + 1) & 0x3FFFFFFF;

decoder_->Decode(bitstream_buffer);

++outstanding_decodes_;

encoded_data_next_pos_to_decode_ = end_pos;