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

Unified Diff: media/mojo/services/mojo_audio_decoder_service.cc

Issue 1823443002: Use data pipe for encoded buffers in MojoAudioDecoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@spitzer-audio-service-impl
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: media/mojo/services/mojo_audio_decoder_service.cc
diff --git a/media/mojo/services/mojo_audio_decoder_service.cc b/media/mojo/services/mojo_audio_decoder_service.cc
index 51fdef58f71149a6e9c2497386bc79f7344e6080..1f8adf3c111ca080107efb0a7f64d21822651432 100644
--- a/media/mojo/services/mojo_audio_decoder_service.cc
+++ b/media/mojo/services/mojo_audio_decoder_service.cc
@@ -50,6 +50,12 @@ void MojoAudioDecoderService::Initialize(
base::Bind(&MojoAudioDecoderService::OnAudioBufferReady, weak_this_));
}
+void MojoAudioDecoderService::SetDataSource(
+ mojo::ScopedDataPipeConsumerHandle receive_pipe) {
+ DVLOG(1) << __FUNCTION__;
+ consumer_handle_ = std::move(receive_pipe);
+}
+
void MojoAudioDecoderService::Decode(interfaces::DecoderBufferPtr buffer,
const DecodeCallback& callback) {
DVLOG(3) << __FUNCTION__;
@@ -107,7 +113,26 @@ scoped_refptr<DecoderBuffer> MojoAudioDecoderService::ReadDecoderBuffer(
scoped_refptr<DecoderBuffer> media_buffer(
buffer.To<scoped_refptr<DecoderBuffer>>());
- NOTIMPLEMENTED();
+ if (media_buffer->end_of_stream())
+ return media_buffer;
+
+ // Wait for the data to become available in the DataPipe.
+ MojoHandleSignalsState state;
+ CHECK_EQ(MOJO_RESULT_OK,
+ MojoWait(consumer_handle_.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
+ MOJO_DEADLINE_INDEFINITE, &state));
+ CHECK_EQ(MOJO_HANDLE_SIGNAL_READABLE, state.satisfied_signals);
+
+ // Read the inner data for the DecoderBuffer from our DataPipe.
+ uint32_t bytes_to_read =
+ base::checked_cast<uint32_t>(media_buffer->data_size());
+ DCHECK_GT(bytes_to_read, 0u);
+ uint32_t bytes_read = bytes_to_read;
+ CHECK_EQ(ReadDataRaw(consumer_handle_.get(), media_buffer->writable_data(),
+ &bytes_read, MOJO_READ_DATA_FLAG_ALL_OR_NONE),
+ MOJO_RESULT_OK);
+ CHECK_EQ(bytes_to_read, bytes_read);
+
return media_buffer;
}
« media/mojo/services/mojo_audio_decoder.cc ('K') | « media/mojo/services/mojo_audio_decoder_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698