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

Side by Side Diff: media/base/demuxer.h

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (9/28) Created 7 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_DEMUXER_H_ 5 #ifndef MEDIA_BASE_DEMUXER_H_
6 #define MEDIA_BASE_DEMUXER_H_ 6 #define MEDIA_BASE_DEMUXER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "media/base/data_source.h" 11 #include "media/base/data_source.h"
12 #include "media/base/demuxer_stream.h" 12 #include "media/base/demuxer_stream.h"
13 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
14 #include "media/base/pipeline_status.h" 14 #include "media/base/pipeline_status.h"
15 #include "media/base/text_track.h"
15 16
16 namespace media { 17 namespace media {
17 18
18 class MEDIA_EXPORT DemuxerHost : public DataSourceHost { 19 class MEDIA_EXPORT DemuxerHost : public DataSourceHost {
19 public: 20 public:
20 // Sets the duration of the media in microseconds. 21 // Sets the duration of the media in microseconds.
21 // Duration may be kInfiniteDuration() if the duration is not known. 22 // Duration may be kInfiniteDuration() if the duration is not known.
22 virtual void SetDuration(base::TimeDelta duration) = 0; 23 virtual void SetDuration(base::TimeDelta duration) = 0;
23 24
24 // Stops execution of the pipeline due to a fatal error. Do not call this 25 // Stops execution of the pipeline due to a fatal error. Do not call this
25 // method with PIPELINE_OK. 26 // method with PIPELINE_OK.
26 virtual void OnDemuxerError(PipelineStatus error) = 0; 27 virtual void OnDemuxerError(PipelineStatus error) = 0;
27 28
29 // Add |text_stream| to the collection managed by the text renderer.
30 virtual void AddTextStream(DemuxerStream* text_stream,
31 TextKind kind,
32 const std::string& label,
33 const std::string& language) = 0;
34
28 protected: 35 protected:
29 virtual ~DemuxerHost(); 36 virtual ~DemuxerHost();
30 }; 37 };
31 38
32 class MEDIA_EXPORT Demuxer { 39 class MEDIA_EXPORT Demuxer {
33 public: 40 public:
34 // A new potentially encrypted stream has been parsed. 41 // A new potentially encrypted stream has been parsed.
35 // First parameter - The type of initialization data. 42 // First parameter - The type of initialization data.
36 // Second parameter - The initialization data associated with the stream. 43 // Second parameter - The initialization data associated with the stream.
37 typedef base::Callback<void(const std::string& type, 44 typedef base::Callback<void(const std::string& type,
(...skipping 24 matching lines...) Expand all
62 virtual void Stop(const base::Closure& callback); 69 virtual void Stop(const base::Closure& callback);
63 70
64 // This method is called from the pipeline when the audio renderer 71 // This method is called from the pipeline when the audio renderer
65 // is disabled. Demuxers can ignore the notification if they do not 72 // is disabled. Demuxers can ignore the notification if they do not
66 // need to react to this event. 73 // need to react to this event.
67 // 74 //
68 // TODO(acolwell): Change to generic DisableStream(DemuxerStream::Type). 75 // TODO(acolwell): Change to generic DisableStream(DemuxerStream::Type).
69 // TODO(scherkus): this might not be needed http://crbug.com/234708 76 // TODO(scherkus): this might not be needed http://crbug.com/234708
70 virtual void OnAudioRendererDisabled(); 77 virtual void OnAudioRendererDisabled();
71 78
72 // Returns the given stream type, or NULL if that type is not present. 79 // Returns the first stream of the given stream type, or NULL if that type
80 // of stream is not present.
73 virtual DemuxerStream* GetStream(DemuxerStream::Type type) = 0; 81 virtual DemuxerStream* GetStream(DemuxerStream::Type type) = 0;
74 82
75 // Returns the starting time for the media file. 83 // Returns the starting time for the media file.
76 virtual base::TimeDelta GetStartTime() const = 0; 84 virtual base::TimeDelta GetStartTime() const = 0;
77 85
78 private: 86 private:
79 DISALLOW_COPY_AND_ASSIGN(Demuxer); 87 DISALLOW_COPY_AND_ASSIGN(Demuxer);
80 }; 88 };
81 89
82 } // namespace media 90 } // namespace media
83 91
84 #endif // MEDIA_BASE_DEMUXER_H_ 92 #endif // MEDIA_BASE_DEMUXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698