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

Unified Diff: media/mojo/common/mojo_decoder_buffer_converter.cc

Issue 2484763005: media: Support transporting 0-byte DecoderBuffer over mojo (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: media/mojo/common/mojo_decoder_buffer_converter.cc
diff --git a/media/mojo/common/mojo_decoder_buffer_converter.cc b/media/mojo/common/mojo_decoder_buffer_converter.cc
index 0afbefc309feeafdc0ab44d62e0cd60516d51f2c..a7832bafda9827885c7bb2bfa79d33efee1bcd14 100644
--- a/media/mojo/common/mojo_decoder_buffer_converter.cc
+++ b/media/mojo/common/mojo_decoder_buffer_converter.cc
@@ -103,7 +103,8 @@ void MojoDecoderBufferReader::ReadDecoderBuffer(
mojo_buffer.To<scoped_refptr<DecoderBuffer>>());
DCHECK(media_buffer);
- if (media_buffer->end_of_stream()) {
+ // A non-EOS buffer can have zero size. See http://crbug.com/663438
+ if (media_buffer->end_of_stream() || media_buffer->data_size() == 0) {
chcunningham 2016/11/08 22:00:38 Could these be simplified to simply if (!media_buf
xhwang 2016/11/08 22:13:51 We can't call anything (including data_size()) if
std::move(read_cb).Run(media_buffer);
return;
}
@@ -219,7 +220,8 @@ mojom::DecoderBufferPtr MojoDecoderBufferWriter::WriteDecoderBuffer(
mojom::DecoderBufferPtr mojo_buffer =
mojom::DecoderBuffer::From(media_buffer);
- if (media_buffer->end_of_stream())
+ // A non-EOS buffer can have zero size. See http://crbug.com/663438
+ if (media_buffer->end_of_stream() || media_buffer->data_size() == 0)
return mojo_buffer;
// Serialize the data section of the DecoderBuffer into our pipe.

Powered by Google App Engine
This is Rietveld 408576698