media/base/decoder_buffer.cc - Issue 16274005: Separate DemuxerStream and VideoDecoder.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/base/decoder_buffer.cc

Issue 16274005: Separate DemuxerStream and VideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: GVD: return drained frames before starting over Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/base/decoder_buffer.h"	5 #include "media/base/decoder_buffer.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "media/base/decrypt_config.h"	8 #include "media/base/decrypt_config.h"

	9 #include "media/base/video_decoder_config.h"
	scherkus (not reviewing) 2013/07/09 01:18:39 remove? remove? xhwang 2013/07/09 20:00:04 Done. Show quoted text On 2013/07/09 01:18:39, scherkus wrote: > remove? Done.
9	10

10 namespace media {	11 namespace media {

11	12

12 DecoderBuffer::DecoderBuffer(int size)	13 DecoderBuffer::DecoderBuffer(int size)

13 : size_(size),	14 : size_(size),

14 side_data_size_(0) {	15 side_data_size_(0) {

15 Initialize();	16 Initialize();

16 }	17 }

17	18

18 DecoderBuffer::DecoderBuffer(const uint8* data, int size,	19 DecoderBuffer::DecoderBuffer(const uint8* data, int size,

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 std::ostringstream s;	138 std::ostringstream s;

138 s << "timestamp: " << timestamp_.InMicroseconds()	139 s << "timestamp: " << timestamp_.InMicroseconds()

139 << " duration: " << duration_.InMicroseconds()	140 << " duration: " << duration_.InMicroseconds()

140 << " size: " << size_	141 << " size: " << size_

141 << " side_data_size: " << side_data_size_	142 << " side_data_size: " << side_data_size_

142 << " encrypted: " << (decrypt_config_ != NULL);	143 << " encrypted: " << (decrypt_config_ != NULL);

143 return s.str();	144 return s.str();

144 }	145 }

145	146

146 } // namespace media	147 } // namespace media

OLD	NEW

« media/base/decoder_buffer.h ('K') | « media/base/decoder_buffer.h ('k') | media/base/mock_filters.h » ('j') | media/filters/video_frame_stream.h » ('J')