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

Side by Side Diff: media/base/video_decoder_config.cc

Issue 2448763002: FFmpegDemuxer: Clear |extra_data| when enabling bitstream conversion. (Closed)
Patch Set: Restore variant used by fuzzertest. Created 4 years, 1 month 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/base/video_decoder_config.h ('k') | media/filters/ffmpeg_demuxer.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/base/video_decoder_config.h" 5 #include "media/base/video_decoder_config.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 << coded_size().width() << "," << coded_size().height() << "]" 145 << coded_size().width() << "," << coded_size().height() << "]"
146 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y() 146 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y()
147 << "," << visible_rect().width() << "," << visible_rect().height() << "]" 147 << "," << visible_rect().width() << "," << visible_rect().height() << "]"
148 << " natural size: [" << natural_size().width() << "," 148 << " natural size: [" << natural_size().width() << ","
149 << natural_size().height() << "]" 149 << natural_size().height() << "]"
150 << " has extra data? " << (extra_data().empty() ? "false" : "true") 150 << " has extra data? " << (extra_data().empty() ? "false" : "true")
151 << " encrypted? " << (is_encrypted() ? "true" : "false"); 151 << " encrypted? " << (is_encrypted() ? "true" : "false");
152 return s.str(); 152 return s.str();
153 } 153 }
154 154
155 void VideoDecoderConfig::SetExtraData(const std::vector<uint8_t>& extra_data) {
156 extra_data_ = extra_data;
157 }
158
155 } // namespace media 159 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698