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

Side by Side Diff: chromecast/media/cma/test/demuxer_stream_for_test.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/threading/thread.h" 5 #include "base/threading/thread.h"
6 #include "chromecast/media/cma/test/demuxer_stream_for_test.h" 6 #include "chromecast/media/cma/test/demuxer_stream_for_test.h"
7 7
8 namespace chromecast { 8 namespace chromecast {
9 namespace media { 9 namespace media {
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 NOTREACHED() << "DemuxerStreamForTest is a video DemuxerStream"; 47 NOTREACHED() << "DemuxerStreamForTest is a video DemuxerStream";
48 return ::media::AudioDecoderConfig(); 48 return ::media::AudioDecoderConfig();
49 } 49 }
50 50
51 ::media::VideoDecoderConfig DemuxerStreamForTest::video_decoder_config() { 51 ::media::VideoDecoderConfig DemuxerStreamForTest::video_decoder_config() {
52 gfx::Size coded_size(640, 480); 52 gfx::Size coded_size(640, 480);
53 gfx::Rect visible_rect(640, 480); 53 gfx::Rect visible_rect(640, 480);
54 gfx::Size natural_size(640, 480); 54 gfx::Size natural_size(640, 480);
55 return ::media::VideoDecoderConfig( 55 return ::media::VideoDecoderConfig(
56 ::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN, 56 ::media::kCodecH264, ::media::VIDEO_CODEC_PROFILE_UNKNOWN,
57 ::media::VideoFrame::YV12, ::media::VideoFrame::COLOR_SPACE_UNSPECIFIED, 57 ::media::VideoFrame::YV12, coded_size, visible_rect, natural_size, NULL,
58 coded_size, visible_rect, natural_size, NULL, 0, false); 58 0, false);
59 } 59 }
60 60
61 ::media::DemuxerStream::Type DemuxerStreamForTest::type() const { 61 ::media::DemuxerStream::Type DemuxerStreamForTest::type() const {
62 return VIDEO; 62 return VIDEO;
63 } 63 }
64 64
65 bool DemuxerStreamForTest::SupportsConfigChanges() { 65 bool DemuxerStreamForTest::SupportsConfigChanges() {
66 return true; 66 return true;
67 } 67 }
68 68
(...skipping 12 matching lines...) Expand all
81 81
82 scoped_refptr<::media::DecoderBuffer> buffer(new ::media::DecoderBuffer(16)); 82 scoped_refptr<::media::DecoderBuffer> buffer(new ::media::DecoderBuffer(16));
83 buffer->set_timestamp(frame_count_ * base::TimeDelta::FromMilliseconds( 83 buffer->set_timestamp(frame_count_ * base::TimeDelta::FromMilliseconds(
84 kDemuxerStreamForTestFrameDuration)); 84 kDemuxerStreamForTestFrameDuration));
85 frame_count_++; 85 frame_count_++;
86 read_cb.Run(kOk, buffer); 86 read_cb.Run(kOk, buffer);
87 } 87 }
88 88
89 } // namespace media 89 } // namespace media
90 } // namespace chromecast 90 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc ('k') | chromecast/media/cma/test/mock_frame_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698