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

Unified Diff: media/formats/mp4/mp4_stream_parser.cc

Issue 2239013002: Assign correct track ids to buffers emitted from StreamParsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser_unittest.cc ('k') | media/formats/mp4/mp4_stream_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/mp4_stream_parser.cc
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
index ffc49a104e8b49354bc89d16f70b631fefed8142..af8485b17f9e3f564f32e3619da882e62c9760ef 100644
--- a/media/formats/mp4/mp4_stream_parser.cc
+++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -605,10 +605,9 @@ bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,
// TODO(wolenetz/acolwell): Validate and use a common cross-parser TrackId
// type and allow multiple tracks for same media type, if applicable. See
// https://crbug.com/341581.
- scoped_refptr<StreamParserBuffer> stream_buf =
- StreamParserBuffer::CopyFrom(&frame_buf[0], frame_buf.size(),
- runs_->is_keyframe(),
- buffer_type, 0);
+ scoped_refptr<StreamParserBuffer> stream_buf = StreamParserBuffer::CopyFrom(
+ &frame_buf[0], frame_buf.size(), runs_->is_keyframe(), buffer_type,
+ runs_->track_id());
if (decrypt_config)
stream_buf->set_decrypt_config(std::move(decrypt_config));
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser_unittest.cc ('k') | media/formats/mp4/mp4_stream_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698