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

Side by Side Diff: chromecast/media/cma/test/mock_frame_provider.cc

Issue 1228843003: Revert of Change the video color space default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ::media::AudioDecoderConfig audio_config; 74 ::media::AudioDecoderConfig audio_config;
75 ::media::VideoDecoderConfig video_config; 75 ::media::VideoDecoderConfig video_config;
76 if (has_config) { 76 if (has_config) {
77 gfx::Size coded_size(640, 480); 77 gfx::Size coded_size(640, 480);
78 gfx::Rect visible_rect(640, 480); 78 gfx::Rect visible_rect(640, 480);
79 gfx::Size natural_size(640, 480); 79 gfx::Size natural_size(640, 480);
80 video_config = ::media::VideoDecoderConfig( 80 video_config = ::media::VideoDecoderConfig(
81 ::media::kCodecH264, 81 ::media::kCodecH264,
82 ::media::VIDEO_CODEC_PROFILE_UNKNOWN, 82 ::media::VIDEO_CODEC_PROFILE_UNKNOWN,
83 ::media::VideoFrame::YV12, 83 ::media::VideoFrame::YV12,
84 ::media::VideoFrame::COLOR_SPACE_UNSPECIFIED,
85 coded_size, 84 coded_size,
86 visible_rect, 85 visible_rect,
87 natural_size, 86 natural_size,
88 NULL, 0, 87 NULL, 0,
89 false); 88 false);
90 89
91 audio_config = ::media::AudioDecoderConfig( 90 audio_config = ::media::AudioDecoderConfig(
92 ::media::kCodecAAC, 91 ::media::kCodecAAC,
93 ::media::kSampleFormatS16, 92 ::media::kSampleFormatS16,
94 ::media::CHANNEL_LAYOUT_STEREO, 93 ::media::CHANNEL_LAYOUT_STEREO,
95 44100, 94 44100,
96 NULL, 0, 95 NULL, 0,
97 false); 96 false);
98 } 97 }
99 98
100 read_cb.Run(buffer, audio_config, video_config); 99 read_cb.Run(buffer, audio_config, video_config);
101 } 100 }
102 101
103 } // namespace media 102 } // namespace media
104 } // namespace chromecast 103 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/test/demuxer_stream_for_test.cc ('k') | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698