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

Side by Side Diff: media/filters/decrypting_demuxer_stream.cc

Issue 1230593005: Reland: Change the video color space default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: big rebase 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/filters/decrypting_demuxer_stream.h" 5 #include "media/filters/decrypting_demuxer_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 input_audio_config.seek_preroll(), 391 input_audio_config.seek_preroll(),
392 input_audio_config.codec_delay()); 392 input_audio_config.codec_delay());
393 break; 393 break;
394 } 394 }
395 395
396 case VIDEO: { 396 case VIDEO: {
397 VideoDecoderConfig input_video_config = 397 VideoDecoderConfig input_video_config =
398 demuxer_stream_->video_decoder_config(); 398 demuxer_stream_->video_decoder_config();
399 video_config_.Initialize( 399 video_config_.Initialize(
400 input_video_config.codec(), input_video_config.profile(), 400 input_video_config.codec(), input_video_config.profile(),
401 input_video_config.format(), COLOR_SPACE_UNSPECIFIED, 401 input_video_config.format(), input_video_config.color_space(),
402 input_video_config.coded_size(), input_video_config.visible_rect(), 402 input_video_config.coded_size(), input_video_config.visible_rect(),
403 input_video_config.natural_size(), input_video_config.extra_data(), 403 input_video_config.natural_size(), input_video_config.extra_data(),
404 input_video_config.extra_data_size(), 404 input_video_config.extra_data_size(),
405 false, // Output video is not encrypted. 405 false, // Output video is not encrypted.
406 false); 406 false);
407 break; 407 break;
408 } 408 }
409 409
410 default: 410 default:
411 NOTREACHED(); 411 NOTREACHED();
412 return; 412 return;
413 } 413 }
414 } 414 }
415 415
416 } // namespace media 416 } // namespace media
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698