Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 EndOfStreamStatusNetworkError, | 51 EndOfStreamStatusNetworkError, |
| 52 EndOfStreamStatusDecodeError, | 52 EndOfStreamStatusDecodeError, |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 enum FrameProcessorChoice { | 55 enum FrameProcessorChoice { |
| 56 UseLegacyFrameProcessor, | 56 UseLegacyFrameProcessor, |
| 57 UseNewFrameProcessor | 57 UseNewFrameProcessor |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 virtual ~WebMediaSource() { } | 60 virtual ~WebMediaSource() { } |
| 61 virtual AddStatus addSourceBuffer(const WebString& type, const WebVector<Web String>& codecs, const FrameProcessorChoice, WebSourceBuffer**) = 0; | 61 |
|
acolwell GONE FROM CHROMIUM
2014/06/13 18:30:40
nit: Remove unnecessary whitespace on this line?
wolenetz
2014/06/16 20:00:24
Done.
| |
| 62 // FIXME: Remove addSourceBuffer() that has FrameProcessorChoice, and remove | |
| 63 // the default implementations for addSourceBuffer() once Chromium | |
| 64 // implementation of the addSourceBuffer() with no FrameProcessorChoice has | |
| 65 // landed. See http://crbug.com/249422. | |
| 66 virtual AddStatus addSourceBuffer(const WebString& type, const WebVector<Web String>& codecs, const FrameProcessorChoice, WebSourceBuffer** webSourceBuffer) | |
| 67 { | |
| 68 // Ignore FrameProcessorChoice. | |
| 69 return addSourceBuffer(type, codecs, webSourceBuffer); | |
|
acolwell GONE FROM CHROMIUM
2014/06/13 18:30:40
I'm assuming you are doing this so you don't have
wolenetz
2014/06/16 20:00:24
That Chromium CL still needs this to land first an
| |
| 70 } | |
| 71 virtual AddStatus addSourceBuffer(const WebString& type, const WebVector<Web String>& codecs, WebSourceBuffer** webSourceBuffer) | |
| 72 { | |
| 73 return addSourceBuffer(type, codecs, WebMediaSource::UseNewFrameProcesso r, webSourceBuffer); | |
| 74 } | |
| 75 | |
| 62 virtual double duration() = 0; | 76 virtual double duration() = 0; |
| 63 virtual void setDuration(double) = 0; | 77 virtual void setDuration(double) = 0; |
| 64 virtual void markEndOfStream(EndOfStreamStatus) = 0; | 78 virtual void markEndOfStream(EndOfStreamStatus) = 0; |
| 65 virtual void unmarkEndOfStream() = 0; | 79 virtual void unmarkEndOfStream() = 0; |
| 66 }; | 80 }; |
| 67 | 81 |
| 68 } // namespace blink | 82 } // namespace blink |
| 69 | 83 |
| 70 #endif | 84 #endif |
| OLD | NEW |