diff options
author | Andreas Huber <andih@google.com> | 2011-11-29 16:33:02 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 16:33:02 -0800 |
commit | c089d02cf2bddf1bba6eaa2b2fcce149dc44633e (patch) | |
tree | b1370ec48d21e9052eb0b040814f91638ebc3a18 /include | |
parent | eca36b5a1759970bc3d0373d72d6fec7c9b7e944 (diff) | |
parent | 6bf045c85526312b198733ac8113cc213c8d79c9 (diff) | |
download | frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.zip frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.tar.gz frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.tar.bz2 |
am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IStreamSource.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/media/IStreamSource.h b/include/media/IStreamSource.h index cc63356..19646b0 100644 --- a/include/media/IStreamSource.h +++ b/include/media/IStreamSource.h @@ -52,15 +52,20 @@ struct IStreamListener : public IInterface { static const char *const kKeyResumeAtPTS; // When signalling a discontinuity you can optionally - // signal that this is a "hard" discontinuity, i.e. the format - // or configuration of subsequent stream data differs from that - // currently active. To do so, include a non-zero int32_t value - // under the key "kKeyFormatChange" when issuing the DISCONTINUITY + // specify the type(s) of discontinuity, i.e. if the + // audio format has changed, the video format has changed, + // time has jumped or any combination thereof. + // To do so, include a non-zero int32_t value + // under the key "kKeyDiscontinuityMask" when issuing the DISCONTINUITY // command. - // The new logical stream must start with proper codec initialization + // If there is a change in audio/video format, The new logical stream + // must start with proper codec initialization // information for playback to continue, i.e. SPS and PPS in the case // of AVC video etc. - static const char *const kKeyFormatChange; + // If this key is not present, only a time discontinuity is assumed. + // The value should be a bitmask of values from + // ATSParser::DiscontinuityType. + static const char *const kKeyDiscontinuityMask; virtual void issueCommand( Command cmd, bool synchronous, const sp<AMessage> &msg = NULL) = 0; |