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

Unified Diff: mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart

Issue 1694963002: Change who allocated the MediaPipe's shared buffer. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix android trybots Created 4 years, 10 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: mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart
index 127421dfe9d96ee3d275f01833d9bfed35341382..41216043a6b72e53dc56c59e8af9ea242034c4de 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/media/audio_track.mojom.dart
@@ -109,10 +109,9 @@ class AudioTrackDescriptor extends bindings.Struct {
class AudioTrackConfiguration extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
- const bindings.StructDataHeader(32, 0)
+ const bindings.StructDataHeader(24, 0)
];
media_types_mojom.MediaType mediaType = null;
- int maxFrames = 0;
int audioFrameRatio = 1;
int mediaTimeRatio = 1;
@@ -158,15 +157,11 @@ class AudioTrackConfiguration extends bindings.Struct {
}
if (mainDataHeader.version >= 0) {
- result.maxFrames = decoder0.decodeUint64(16);
+ result.audioFrameRatio = decoder0.decodeUint32(16);
}
if (mainDataHeader.version >= 0) {
- result.audioFrameRatio = decoder0.decodeUint32(24);
- }
- if (mainDataHeader.version >= 0) {
-
- result.mediaTimeRatio = decoder0.decodeUint32(28);
+ result.mediaTimeRatio = decoder0.decodeUint32(20);
}
return result;
}
@@ -181,21 +176,14 @@ class AudioTrackConfiguration extends bindings.Struct {
rethrow;
}
try {
- encoder0.encodeUint64(maxFrames, 16);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "maxFrames of struct AudioTrackConfiguration: $e";
- rethrow;
- }
- try {
- encoder0.encodeUint32(audioFrameRatio, 24);
+ encoder0.encodeUint32(audioFrameRatio, 16);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
"audioFrameRatio of struct AudioTrackConfiguration: $e";
rethrow;
}
try {
- encoder0.encodeUint32(mediaTimeRatio, 28);
+ encoder0.encodeUint32(mediaTimeRatio, 20);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
"mediaTimeRatio of struct AudioTrackConfiguration: $e";
@@ -206,7 +194,6 @@ class AudioTrackConfiguration extends bindings.Struct {
String toString() {
return "AudioTrackConfiguration("
"mediaType: $mediaType" ", "
- "maxFrames: $maxFrames" ", "
"audioFrameRatio: $audioFrameRatio" ", "
"mediaTimeRatio: $mediaTimeRatio" ")";
}
@@ -214,7 +201,6 @@ class AudioTrackConfiguration extends bindings.Struct {
Map toJson() {
Map map = new Map();
map["mediaType"] = mediaType;
- map["maxFrames"] = maxFrames;
map["audioFrameRatio"] = audioFrameRatio;
map["mediaTimeRatio"] = mediaTimeRatio;
return map;
« no previous file with comments | « examples/audio_play_test/play_wav.cc ('k') | mojo/dart/packages/mojo_services/lib/mojo/media/media_pipe.mojom.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698