Assign correct track ids to buffers emitted from StreamParsers

media/formats/mp2t/es_parser_mpeg1audio.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mp2t/es_parser_mpeg1audio.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 61 matching lines @@
     base::TimeDelta frame_duration =
         audio_timestamp_helper_->GetFrameDuration(
             mpeg1audio_frame.sample_count);
 
     // Emit an audio frame.
     bool is_key_frame = true;
 
     // TODO(wolenetz/acolwell): Validate and use a common cross-parser TrackId
     // type and allow multiple audio tracks. See https://crbug.com/341581.
     scoped_refptr<StreamParserBuffer> stream_parser_buffer =
-        StreamParserBuffer::CopyFrom(
-            mpeg1audio_frame.data,
-            mpeg1audio_frame.size,
-            is_key_frame,
-            DemuxerStream::AUDIO, 0);
+        StreamParserBuffer::CopyFrom(mpeg1audio_frame.data,
+                                     mpeg1audio_frame.size, is_key_frame,
+                                     DemuxerStream::AUDIO, kMp2tAudioTrackId);
     stream_parser_buffer->set_timestamp(current_pts);
     stream_parser_buffer->set_duration(frame_duration);
     emit_buffer_cb_.Run(stream_parser_buffer);
 
     // Update the PTS of the next frame.
     audio_timestamp_helper_->AddFrames(mpeg1audio_frame.sample_count);
 
     // Skip the current frame.
     SkipMpeg1AudioFrame(mpeg1audio_frame);
   }
@@ skipping 100 matching lines @@
 }
 
 void EsParserMpeg1Audio::SkipMpeg1AudioFrame(
     const Mpeg1AudioFrame& mpeg1audio_frame) {
   DCHECK_EQ(mpeg1audio_frame.queue_offset, es_queue_->head());
   es_queue_->Pop(mpeg1audio_frame.size);
 }
 
 }  // namespace mp2t
 }  // namespace media