| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2  * Copyright (C) 2011 Ericsson AB. All rights reserved. | 
| 3  * Copyright (C) 2012 Google Inc. All rights reserved. | 3  * Copyright (C) 2012 Google Inc. All rights reserved. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions | 6  * modification, are permitted provided that the following conditions | 
| 7  * are met: | 7  * are met: | 
| 8  * | 8  * | 
| 9  * 1. Redistributions of source code must retain the above copyright | 9  * 1. Redistributions of source code must retain the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer. | 10  *    notice, this list of conditions and the following disclaimer. | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 53 public: | 53 public: | 
| 54     class ExtraData : public RefCounted<ExtraData> { | 54     class ExtraData : public RefCounted<ExtraData> { | 
| 55     public: | 55     public: | 
| 56         virtual ~ExtraData() { } | 56         virtual ~ExtraData() { } | 
| 57     }; | 57     }; | 
| 58 | 58 | 
| 59     static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVecto
     r& audioSources, const MediaStreamSourceVector& videoSources); | 59     static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVecto
     r& audioSources, const MediaStreamSourceVector& videoSources); | 
| 60 | 60 | 
| 61     static PassRefPtr<MediaStreamDescriptor> create(const String& id, const Medi
     aStreamComponentVector& audioComponents, const MediaStreamComponentVector& video
     Components); | 61     static PassRefPtr<MediaStreamDescriptor> create(const String& id, const Medi
     aStreamComponentVector& audioComponents, const MediaStreamComponentVector& video
     Components); | 
| 62 | 62 | 
| 63     virtual ~MediaStreamDescriptor(); | 63     ~MediaStreamDescriptor(); | 
| 64 | 64 | 
| 65     MediaStreamDescriptorClient* client() const { return m_client; } | 65     MediaStreamDescriptorClient* client() const { return m_client; } | 
| 66     void setClient(MediaStreamDescriptorClient* client) { m_client = client; } | 66     void setClient(MediaStreamDescriptorClient* client) { m_client = client; } | 
| 67 | 67 | 
| 68     String id() const { return m_id; } | 68     String id() const { return m_id; } | 
| 69 | 69 | 
| 70     unsigned numberOfAudioComponents() const { return m_audioComponents.size(); 
     } | 70     unsigned numberOfAudioComponents() const { return m_audioComponents.size(); 
     } | 
| 71     MediaStreamComponent* audioComponent(unsigned index) const { return m_audioC
     omponents[index].get(); } | 71     MediaStreamComponent* audioComponent(unsigned index) const { return m_audioC
     omponents[index].get(); } | 
| 72 | 72 | 
| 73     unsigned numberOfVideoComponents() const { return m_videoComponents.size(); 
     } | 73     unsigned numberOfVideoComponents() const { return m_videoComponents.size(); 
     } | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 96     bool m_ended; | 96     bool m_ended; | 
| 97 | 97 | 
| 98     RefPtr<ExtraData> m_extraData; | 98     RefPtr<ExtraData> m_extraData; | 
| 99 }; | 99 }; | 
| 100 | 100 | 
| 101 typedef Vector<RefPtr<MediaStreamDescriptor> > MediaStreamDescriptorVector; | 101 typedef Vector<RefPtr<MediaStreamDescriptor> > MediaStreamDescriptorVector; | 
| 102 | 102 | 
| 103 } // namespace WebCore | 103 } // namespace WebCore | 
| 104 | 104 | 
| 105 #endif // MediaStreamDescriptor_h | 105 #endif // MediaStreamDescriptor_h | 
| OLD | NEW | 
|---|