Index: media/formats/webm/webm_tracks_parser.h |
diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h |
index 3569907274c6475dfb64b024f780c6c97d5e764e..b6dfff80805a1606ef1cb8a83a269225bbfd0ea9 100644 |
--- a/media/formats/webm/webm_tracks_parser.h |
+++ b/media/formats/webm/webm_tracks_parser.h |
@@ -18,6 +18,7 @@ |
#include "base/time/time.h" |
#include "media/base/audio_decoder_config.h" |
#include "media/base/media_log.h" |
+#include "media/base/media_tracks.h" |
#include "media/base/text_track_config.h" |
#include "media/base/video_decoder_config.h" |
#include "media/formats/webm/webm_audio_client.h" |
@@ -77,6 +78,8 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { |
return text_tracks_; |
} |
+ scoped_ptr<MediaTracks> media_tracks() { return std::move(media_tracks_); } |
wolenetz
2016/03/05 03:26:21
nit: Using std::move here may have unintended cons
servolk
2016/03/07 23:45:02
Well, I agree that it's not super pretty solution,
wolenetz
2016/03/10 19:53:29
I understand. Please then document in the .h for t
servolk
2016/03/10 22:25:38
Done.
Note that this method is in the WebMTracksPa
|
+ |
private: |
// WebMParserClient implementation. |
WebMParserClient* OnListStart(int id) override; |
@@ -114,6 +117,8 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { |
WebMVideoClient video_client_; |
VideoDecoderConfig video_decoder_config_; |
+ scoped_ptr<MediaTracks> media_tracks_; |
+ |
DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); |
}; |