Add media::StreamParser::StreamParameter struct.

media/base/stream_parser.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 28 matching lines @@
   // audio, max 1 video, and N text tracks in a map keyed by
   // bytestream-specific-ranged track numbers. See http://crbug.com/341581.
   typedef int TrackId;
 
   // Map of text track ID to the track configuration.
   typedef std::map<TrackId, TextTrackConfig> TextTrackConfigMap;
 
   // Map of text track ID to decode-timestamp-ordered buffers for the track.
   typedef std::map<TrackId, const BufferQueue> TextBufferQueueMap;
 
-  StreamParser();
-  virtual ~StreamParser();
+  // Stream parameters passed in InitCB
+  struct StreamParameters {

[acolwell GONE FROM CHROMIUM, 2014/04/24 21:00:55]

nit: s/Stream// or s/Stream/Init/ so we don't have double the "Stream" at most
use sites. :)?

[Sergey Ulanov, 2014/04/24 22:13:43]

Done.

+    StreamParameters();

[acolwell GONE FROM CHROMIUM, 2014/04/24 21:00:55]

nit: I think we should at least force duration to be passed here.

[Sergey Ulanov, 2014/04/24 22:13:43]

Done.

+
+    // Stream duration.
+    base::TimeDelta duration;
+
+    // Indicates the source time associated with presentation timestamp 0. A
+    // null Time is returned if no mapping to Time exists.
+    base::Time timeline_offset;
+
+    // Indicates that timestampOffset should be updated based on the earliest
+    // end timestamp (audio or video) provided during each NewBuffersCB.
+    bool auto_update_timestamp_offset;
+  };
 
   // Indicates completion of parser initialization.
-  // First parameter - Indicates initialization success. Set to true if
-  //                   initialization was successful. False if an error
-  //                   occurred.
-  // Second parameter - Indicates the stream duration. Only contains a valid
-  //                    value if the first parameter is true.
-  // Third parameter - Indicates the Time associated with
-  //                   presentation timestamp 0 if such a mapping exists in
-  //                   the bytestream. If no mapping exists this parameter
-  //                   contains null Time object. Only contains a valid
-  //                   value if the first parameter is true.
-  // Fourth parameters - Indicates that timestampOffset should be updated based
-  //                    on the earliest end timestamp (audio or video) provided
-  //                    during each NewBuffersCB.
-  typedef base::Callback<void(bool, base::TimeDelta, base::Time, bool)> InitCB;
+  //   success - True if initialization was successful.
+  //   params - Stream parameters, in case of successful initialization.
+  typedef base::Callback<void(bool success,
+                              const StreamParameters& params)> InitCB;
 
   // Indicates when new stream configurations have been parsed.
   // First parameter - The new audio configuration. If the config is not valid
   //                   then it means that there isn't an audio stream.
   // Second parameter - The new video configuration. If the config is not valid
   //                    then it means that there isn't an audio stream.
   // Third parameter - The new text tracks configuration.  If the map is empty,
   //                   then no text tracks were parsed from the stream.
   // Return value - True if the new configurations are accepted.
   //                False if the new configurations are not supported
@@ skipping 19 matching lines @@
   // Signals the beginning of a new media segment.
   typedef base::Callback<void()> NewMediaSegmentCB;
 
   // A new potentially encrypted stream has been parsed.
   // First parameter - The type of the initialization data associated with the
   //                   stream.
   // Second parameter - The initialization data associated with the stream.
   typedef base::Callback<void(const std::string&,
                               const std::vector<uint8>&)> NeedKeyCB;
 
+  StreamParser();

[acolwell GONE FROM CHROMIUM, 2014/04/24 21:00:55]

Why is this needed? Should we be using a differend DISALLOW_ below instead?

[Sergey Ulanov, 2014/04/24 22:13:43]

I just moved them here from line 49. Style guide says types should defined
before constructor.

+  virtual ~StreamParser();
+
   // Initializes the parser with necessary callbacks. Must be called before any
   // data is passed to Parse(). |init_cb| will be called once enough data has
   // been parsed to determine the initial stream configurations, presentation
   // start time, and duration. If |ignore_text_track| is true, then no text
   // buffers should be passed later by the parser to |new_buffers_cb|.
   virtual void Init(const InitCB& init_cb,
                     const NewConfigCB& config_cb,
                     const NewBuffersCB& new_buffers_cb,
                     bool ignore_text_track,
                     const NeedKeyCB& need_key_cb,
@@ skipping 28 matching lines @@
 // subtle issues with tie-breaking. See http://crbug.com/338484.
 MEDIA_EXPORT bool MergeBufferQueues(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_buffers,
     StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_