| 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 "media/mojo/services/mojo_demuxer_stream_adapter.h" | 5 #include "media/mojo/services/mojo_demuxer_stream_adapter.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 void MojoDemuxerStreamAdapter::OnBufferReady( | 89 void MojoDemuxerStreamAdapter::OnBufferReady( |
| 90 interfaces::DemuxerStream::Status status, | 90 interfaces::DemuxerStream::Status status, |
| 91 interfaces::DecoderBufferPtr buffer, | 91 interfaces::DecoderBufferPtr buffer, |
| 92 interfaces::AudioDecoderConfigPtr audio_config, | 92 interfaces::AudioDecoderConfigPtr audio_config, |
| 93 interfaces::VideoDecoderConfigPtr video_config) { | 93 interfaces::VideoDecoderConfigPtr video_config) { |
| 94 DVLOG(3) << __FUNCTION__; | 94 DVLOG(3) << __FUNCTION__; |
| 95 DCHECK(!read_cb_.is_null()); | 95 DCHECK(!read_cb_.is_null()); |
| 96 DCHECK_NE(type_, DemuxerStream::UNKNOWN); | 96 DCHECK_NE(type_, DemuxerStream::UNKNOWN); |
| 97 DCHECK(stream_pipe_.is_valid()); | 97 DCHECK(stream_pipe_.is_valid()); |
| 98 | 98 |
| 99 if (status == interfaces::DemuxerStream::STATUS_CONFIG_CHANGED) { | 99 if (status == interfaces::DemuxerStream::Status::CONFIG_CHANGED) { |
| 100 UpdateConfig(std::move(audio_config), std::move(video_config)); | 100 UpdateConfig(std::move(audio_config), std::move(video_config)); |
| 101 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kConfigChanged, nullptr); | 101 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kConfigChanged, nullptr); |
| 102 return; | 102 return; |
| 103 } | 103 } |
| 104 | 104 |
| 105 if (status == interfaces::DemuxerStream::STATUS_ABORTED) { | 105 if (status == interfaces::DemuxerStream::Status::ABORTED) { |
| 106 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kAborted, nullptr); | 106 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kAborted, nullptr); |
| 107 return; | 107 return; |
| 108 } | 108 } |
| 109 | 109 |
| 110 DCHECK_EQ(status, interfaces::DemuxerStream::STATUS_OK); | 110 DCHECK_EQ(status, interfaces::DemuxerStream::Status::OK); |
| 111 scoped_refptr<DecoderBuffer> media_buffer( | 111 scoped_refptr<DecoderBuffer> media_buffer( |
| 112 buffer.To<scoped_refptr<DecoderBuffer>>()); | 112 buffer.To<scoped_refptr<DecoderBuffer>>()); |
| 113 | 113 |
| 114 if (!media_buffer->end_of_stream()) { | 114 if (!media_buffer->end_of_stream()) { |
| 115 DCHECK_GT(media_buffer->data_size(), 0); | 115 DCHECK_GT(media_buffer->data_size(), 0); |
| 116 | 116 |
| 117 // Read the inner data for the DecoderBuffer from our DataPipe. | 117 // Read the inner data for the DecoderBuffer from our DataPipe. |
| 118 uint32_t num_bytes = media_buffer->data_size(); | 118 uint32_t num_bytes = media_buffer->data_size(); |
| 119 CHECK_EQ(ReadDataRaw(stream_pipe_.get(), media_buffer->writable_data(), | 119 CHECK_EQ(ReadDataRaw(stream_pipe_.get(), media_buffer->writable_data(), |
| 120 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE), | 120 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE), |
| (...skipping 17 matching lines...) Expand all Loading... |
| 138 case DemuxerStream::VIDEO: | 138 case DemuxerStream::VIDEO: |
| 139 DCHECK(video_config && !audio_config); | 139 DCHECK(video_config && !audio_config); |
| 140 video_config_ = video_config.To<VideoDecoderConfig>(); | 140 video_config_ = video_config.To<VideoDecoderConfig>(); |
| 141 break; | 141 break; |
| 142 default: | 142 default: |
| 143 NOTREACHED(); | 143 NOTREACHED(); |
| 144 } | 144 } |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace media | 147 } // namespace media |
| OLD | NEW |