Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <stdio.h> | 5 #include <stdio.h> |
| 6 #include <string.h> | 6 #include <string.h> |
| 7 | 7 |
| 8 #include <iostream> | 8 #include <iostream> |
| 9 #include <queue> | 9 #include <queue> |
| 10 #include <sstream> | 10 #include <sstream> |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 int id, | 221 int id, |
| 222 const pp::Graphics3D& graphics_3d) | 222 const pp::Graphics3D& graphics_3d) |
| 223 : instance_(instance), | 223 : instance_(instance), |
| 224 id_(id), | 224 id_(id), |
| 225 decoder_(new pp::VideoDecoder(instance)), | 225 decoder_(new pp::VideoDecoder(instance)), |
| 226 callback_factory_(this), | 226 callback_factory_(this), |
| 227 encoded_data_next_pos_to_decode_(0), | 227 encoded_data_next_pos_to_decode_(0), |
| 228 next_picture_id_(0), | 228 next_picture_id_(0), |
| 229 flushing_(false), | 229 flushing_(false), |
| 230 resetting_(false) { | 230 resetting_(false) { |
| 231 // TODO(bbudge) Remove this for final patch. | |
|
bbudge
2014/06/16 22:47:59
It turns out the following lines can't be put into
| |
| 232 #if defined USE_VP8_TESTDATA_INSTEAD_OF_H264 | 231 #if defined USE_VP8_TESTDATA_INSTEAD_OF_H264 |
| 233 const PP_VideoProfile kBitstreamProfile = PP_VIDEOPROFILE_VP8MAIN; | 232 const PP_VideoProfile kBitstreamProfile = PP_VIDEOPROFILE_VP8MAIN; |
| 234 #else | 233 #else |
| 235 const PP_VideoProfile kBitstreamProfile = PP_VIDEOPROFILE_H264MAIN; | 234 const PP_VideoProfile kBitstreamProfile = PP_VIDEOPROFILE_H264MAIN; |
| 236 #endif | 235 #endif |
| 237 | 236 |
| 238 assert(!decoder_->is_null()); | 237 assert(!decoder_->is_null()); |
| 239 decoder_->Initialize(graphics_3d, | 238 decoder_->Initialize(graphics_3d, |
| 240 kBitstreamProfile, | 239 kBitstreamProfile, |
| 241 PP_TRUE /* allow_software_fallback */, | 240 PP_TRUE /* allow_software_fallback */, |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 673 }; | 672 }; |
| 674 | 673 |
| 675 } // anonymous namespace | 674 } // anonymous namespace |
| 676 | 675 |
| 677 namespace pp { | 676 namespace pp { |
| 678 // Factory function for your specialization of the Module object. | 677 // Factory function for your specialization of the Module object. |
| 679 Module* CreateModule() { | 678 Module* CreateModule() { |
| 680 return new MyModule(); | 679 return new MyModule(); |
| 681 } | 680 } |
| 682 } // namespace pp | 681 } // namespace pp |
| OLD | NEW |