| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chromecast/media/cma/filters/demuxer_stream_adapter.h" | 5 #include "chromecast/renderer/media/demuxer_stream_adapter.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/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" | 10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" |
| 11 #include "chromecast/media/cma/base/cma_logging.h" | 11 #include "chromecast/media/cma/base/cma_logging.h" |
| 12 #include "chromecast/media/cma/base/decoder_buffer_adapter.h" | 12 #include "chromecast/media/cma/base/decoder_buffer_adapter.h" |
| 13 #include "chromecast/media/cma/base/simple_media_task_runner.h" | 13 #include "chromecast/media/cma/base/simple_media_task_runner.h" |
| 14 #include "media/base/bind_to_current_loop.h" | 14 #include "media/base/bind_to_current_loop.h" |
| 15 #include "media/base/decoder_buffer.h" | 15 #include "media/base/decoder_buffer.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 // Back to the default audio/video config: | 167 // Back to the default audio/video config: |
| 168 // an invalid audio/video config means there is no config update. | 168 // an invalid audio/video config means there is no config update. |
| 169 if (audio_config_.IsValidConfig()) | 169 if (audio_config_.IsValidConfig()) |
| 170 audio_config_ = ::media::AudioDecoderConfig(); | 170 audio_config_ = ::media::AudioDecoderConfig(); |
| 171 if (video_config_.IsValidConfig()) | 171 if (video_config_.IsValidConfig()) |
| 172 video_config_ = ::media::VideoDecoderConfig(); | 172 video_config_ = ::media::VideoDecoderConfig(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 } // namespace media | 175 } // namespace media |
| 176 } // namespace chromecast | 176 } // namespace chromecast |
| OLD | NEW |