chromecast/media/cma/test/mock_frame_provider.cc - Issue 1490613005: media config: expand is_encrypted to a struct.

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: chromecast/media/cma/test/mock_frame_provider.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: one more tweak in chromecast/common Created 5 years 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

« chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc ('K') | « chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc ('k') | chromecast/media/media.gyp » ('j') | chromecast/public/media/decoder_config.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "chromecast/media/cma/test/mock_frame_provider.h"	5 #include "chromecast/media/cma/test/mock_frame_provider.h"

6	6

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

8 #include "base/location.h"	8 #include "base/location.h"

9 #include "base/single_thread_task_runner.h"	9 #include "base/single_thread_task_runner.h"

10 #include "base/thread_task_runner_handle.h"	10 #include "base/thread_task_runner_handle.h"

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 ::media::AudioDecoderConfig audio_config;	75 ::media::AudioDecoderConfig audio_config;

76 ::media::VideoDecoderConfig video_config;	76 ::media::VideoDecoderConfig video_config;

77 if (has_config) {	77 if (has_config) {

78 gfx::Size coded_size(640, 480);	78 gfx::Size coded_size(640, 480);

79 gfx::Rect visible_rect(640, 480);	79 gfx::Rect visible_rect(640, 480);

80 gfx::Size natural_size(640, 480);	80 gfx::Size natural_size(640, 480);

81 video_config = ::media::VideoDecoderConfig(	81 video_config = ::media::VideoDecoderConfig(

82 ::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN,	82 ::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN,

83 ::media::PIXEL_FORMAT_YV12, ::media::COLOR_SPACE_UNSPECIFIED,	83 ::media::PIXEL_FORMAT_YV12, ::media::COLOR_SPACE_UNSPECIFIED,

84 coded_size, visible_rect, natural_size, ::media::EmptyExtraData(),	84 coded_size, visible_rect, natural_size, ::media::EmptyExtraData(),

85 false);	85 ::media::EncryptionScheme(false));
	halliwell 2016/01/13 03:29:41 ditto ditto dougsteed 2016/02/09 22:58:53 Done. Show quoted text On 2016/01/13 03:29:41, halliwell wrote: > ditto Done.
86	86

87 audio_config = ::media::AudioDecoderConfig(	87 audio_config = ::media::AudioDecoderConfig(

88 ::media::kCodecAAC,	88 ::media::kCodecAAC,

89 ::media::kSampleFormatS16,	89 ::media::kSampleFormatS16,

90 ::media::CHANNEL_LAYOUT_STEREO,	90 ::media::CHANNEL_LAYOUT_STEREO,

91 44100,	91 44100,

92 ::media::EmptyExtraData(),	92 ::media::EmptyExtraData(),

93 false);	93 ::media::EncryptionScheme(false));
	halliwell 2016/01/13 03:29:41 ditto ditto dougsteed 2016/02/09 22:58:53 Done. Show quoted text On 2016/01/13 03:29:41, halliwell wrote: > ditto Done.
94 }	94 }

95	95

96 read_cb.Run(buffer, audio_config, video_config);	96 read_cb.Run(buffer, audio_config, video_config);

97 }	97 }

98	98

99 } // namespace media	99 } // namespace media

100 } // namespace chromecast	100 } // namespace chromecast

OLD	NEW