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

Side by Side Diff: media/filters/ffmpeg_video_decoder.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
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/ffmpeg_video_decoder.h" 5 #include "media/filters/ffmpeg_video_decoder.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 RoundUp(std::max(size.width(), codec_context->coded_width), 2), 120 RoundUp(std::max(size.width(), codec_context->coded_width), 2),
121 RoundUp(std::max(size.height(), codec_context->coded_height), 2)); 121 RoundUp(std::max(size.height(), codec_context->coded_height), 2));
122 122
123 if (!VideoFrame::IsValidConfig(format, VideoFrame::STORAGE_UNKNOWN, 123 if (!VideoFrame::IsValidConfig(format, VideoFrame::STORAGE_UNKNOWN,
124 coded_size, gfx::Rect(size), natural_size)) { 124 coded_size, gfx::Rect(size), natural_size)) {
125 return AVERROR(EINVAL); 125 return AVERROR(EINVAL);
126 } 126 }
127 127
128 scoped_refptr<VideoFrame> video_frame = frame_pool_.CreateFrame( 128 scoped_refptr<VideoFrame> video_frame = frame_pool_.CreateFrame(
129 format, coded_size, gfx::Rect(size), natural_size, kNoTimestamp()); 129 format, coded_size, gfx::Rect(size), natural_size, kNoTimestamp());
130 if (codec_context->colorspace == AVCOL_SPC_BT709) { 130
131 video_frame->metadata()->SetInteger(VideoFrameMetadata::COLOR_SPACE, 131 // Prefer the color space from the codec context. If it's not specified (or is
132 COLOR_SPACE_HD_REC709); 132 // set to an unsupported value), fall back on the value from the config.
133 } 133 ColorSpace color_space = AVColorSpaceToColorSpace(codec_context->colorspace);
134 if (color_space == COLOR_SPACE_UNSPECIFIED)
135 color_space = config_.color_space();
136 video_frame->metadata()->SetInteger(VideoFrameMetadata::COLOR_SPACE,
137 color_space);
134 138
135 for (int i = 0; i < 3; i++) { 139 for (int i = 0; i < 3; i++) {
136 frame->data[i] = video_frame->data(i); 140 frame->data[i] = video_frame->data(i);
137 frame->linesize[i] = video_frame->stride(i); 141 frame->linesize[i] = video_frame->stride(i);
138 } 142 }
139 143
140 frame->width = coded_size.width(); 144 frame->width = coded_size.width();
141 frame->height = coded_size.height(); 145 frame->height = coded_size.height();
142 frame->format = codec_context->pix_fmt; 146 frame->format = codec_context->pix_fmt;
143 frame->reordered_opaque = codec_context->reordered_opaque; 147 frame->reordered_opaque = codec_context->reordered_opaque;
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) { 357 if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
354 ReleaseFFmpegResources(); 358 ReleaseFFmpegResources();
355 return false; 359 return false;
356 } 360 }
357 361
358 av_frame_.reset(av_frame_alloc()); 362 av_frame_.reset(av_frame_alloc());
359 return true; 363 return true;
360 } 364 }
361 365
362 } // namespace media 366 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698